diff --git a/libs/auth/src/authorities/__tests__/authorities.schema.cycles.spec.ts b/libs/auth/src/authorities/__tests__/authorities.schema.cycles.spec.ts
new file mode 100644
index 000000000..61859ce0f
--- /dev/null
+++ b/libs/auth/src/authorities/__tests__/authorities.schema.cycles.spec.ts
@@ -0,0 +1,14 @@
+import { authoritiesPolicySchema } from '../authorities.schema';
+
+describe('authoritiesPolicySchema with a reference cycle', () => {
+  it('accepts a policy that refers to itself, keeping the cycle in the result', () => {
+    const policy: Record<string, unknown> = { roles: { any: ['admin'] } };
+    policy['anyOf'] = [policy];
+
+    const result = authoritiesPolicySchema.safeParse(policy);
+
+    expect(result.success).toBe(true);
+    const parsed = result.data as Record<string, unknown[]>;
+    expect(parsed['anyOf'][0]).toBe(parsed);
+  });
+});
diff --git a/libs/auth/src/authorization/authorization.types.ts b/libs/auth/src/authorization/authorization.types.ts
index 29a8293f3..dc7567f76 100644
--- a/libs/auth/src/authorization/authorization.types.ts
+++ b/libs/auth/src/authorization/authorization.types.ts
@@ -5,7 +5,7 @@
  * These types are portable and can be used across different implementations.
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { ProviderSnapshot } from '../session/session.types';
 import type { TransportProtocol, TransportSession } from '../session/transport-session.types';
diff --git a/libs/auth/src/cimd/cimd.types.ts b/libs/auth/src/cimd/cimd.types.ts
index 0d02fdb33..f5c8643bb 100644
--- a/libs/auth/src/cimd/cimd.types.ts
+++ b/libs/auth/src/cimd/cimd.types.ts
@@ -6,7 +6,7 @@
  *
  * @see https://datatracker.ietf.org/doc/html/draft-ietf-oauth-client-id-metadata-document-00
  */
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 // ============================================
 // CLIENT METADATA DOCUMENT SCHEMA
diff --git a/libs/auth/src/common/jwt.types.ts b/libs/auth/src/common/jwt.types.ts
index bb2e6ace6..08896a728 100644
--- a/libs/auth/src/common/jwt.types.ts
+++ b/libs/auth/src/common/jwt.types.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { type RawZodShape } from './zod-utils';
 
diff --git a/libs/auth/src/common/session.types.ts b/libs/auth/src/common/session.types.ts
index e2a5da0de..86bef727e 100644
--- a/libs/auth/src/common/session.types.ts
+++ b/libs/auth/src/common/session.types.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { type RawZodShape } from './zod-utils';
 
diff --git a/libs/auth/src/consent/consent.types.ts b/libs/auth/src/consent/consent.types.ts
index 603f10735..811f925d8 100644
--- a/libs/auth/src/consent/consent.types.ts
+++ b/libs/auth/src/consent/consent.types.ts
@@ -4,7 +4,7 @@
  * Defines types for the tool consent flow that allows users to select
  * which MCP tools they want to expose to the LLM.
  */
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { consentConfigSchema } from '../options/shared.schemas';
 
diff --git a/libs/auth/src/detection/auth-provider-detection.ts b/libs/auth/src/detection/auth-provider-detection.ts
index e667c79ca..5f14c062b 100644
--- a/libs/auth/src/detection/auth-provider-detection.ts
+++ b/libs/auth/src/detection/auth-provider-detection.ts
@@ -4,7 +4,7 @@
  * Detects unique auth providers across nested apps and determines
  * if orchestrated mode is required at the parent scope level.
  */
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { AuthOptions } from '../options/schema';
 import { staticAuthOptionsSchema } from '../options/static.schema';
diff --git a/libs/auth/src/options/app-auth.schema.ts b/libs/auth/src/options/app-auth.schema.ts
index 81842eaf0..485700503 100644
--- a/libs/auth/src/options/app-auth.schema.ts
+++ b/libs/auth/src/options/app-auth.schema.ts
@@ -1,7 +1,7 @@
 // options/app-auth.schema.ts
 // App-level auth options with standalone option
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { type RawZodShape } from '../common/zod-utils';
 import { localAuthSchema, remoteAuthSchema } from './orchestrated.schema';
diff --git a/libs/auth/src/options/orchestrated.schema.ts b/libs/auth/src/options/orchestrated.schema.ts
index 4872f09f9..de55c4fb4 100644
--- a/libs/auth/src/options/orchestrated.schema.ts
+++ b/libs/auth/src/options/orchestrated.schema.ts
@@ -1,7 +1,7 @@
 // options/orchestrated.schema.ts
 // Local and Remote auth modes (formerly orchestrated local/remote)
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { RawZodShape } from '../common/zod-utils';
 import type {
diff --git a/libs/auth/src/options/public.schema.ts b/libs/auth/src/options/public.schema.ts
index 78705d856..1862df597 100644
--- a/libs/auth/src/options/public.schema.ts
+++ b/libs/auth/src/options/public.schema.ts
@@ -1,7 +1,7 @@
 // options/public.schema.ts
 // Public mode - No authentication required
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { jsonWebKeySetSchema, jwkSchema } from '../common/jwt.types';
 import type { RawZodShape } from '../common/zod-utils';
diff --git a/libs/auth/src/options/schema.ts b/libs/auth/src/options/schema.ts
index 7cb33ac57..5a9e81e7f 100644
--- a/libs/auth/src/options/schema.ts
+++ b/libs/auth/src/options/schema.ts
@@ -1,7 +1,7 @@
 // options/schema.ts
 // Unified auth options schema combining all modes
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { AuthOptionsInterface } from './interfaces';
 import { localAuthSchema, remoteAuthSchema } from './orchestrated.schema';
diff --git a/libs/auth/src/options/shared.schemas.ts b/libs/auth/src/options/shared.schemas.ts
index d46f70a97..2d85dd1b1 100644
--- a/libs/auth/src/options/shared.schemas.ts
+++ b/libs/auth/src/options/shared.schemas.ts
@@ -1,7 +1,7 @@
 // options/shared.schemas.ts
 // Shared configuration schemas used across auth modes
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { jsonWebKeySetSchema, jwkSchema } from '../common/jwt.types';
 import { redisConfigSchema, type RedisConfig } from '../session/transport-session.types';
diff --git a/libs/auth/src/options/static.schema.ts b/libs/auth/src/options/static.schema.ts
index 7c0009cb8..5ffcb3af4 100644
--- a/libs/auth/src/options/static.schema.ts
+++ b/libs/auth/src/options/static.schema.ts
@@ -1,7 +1,7 @@
 // options/static.schema.ts
 // Static mode — a fixed shared secret presented on every request.
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { RawZodShape } from '../common/zod-utils';
 import type { StaticAuthOptionsInterface } from './interfaces';
diff --git a/libs/auth/src/options/transparent.schema.ts b/libs/auth/src/options/transparent.schema.ts
index ffdc5191f..06b7542b6 100644
--- a/libs/auth/src/options/transparent.schema.ts
+++ b/libs/auth/src/options/transparent.schema.ts
@@ -1,7 +1,7 @@
 // options/transparent.schema.ts
 // Transparent mode - Pass-through OAuth tokens from remote provider
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { RawZodShape } from '../common/zod-utils';
 import type { TransparentAuthOptionsInterface } from './interfaces';
diff --git a/libs/auth/src/session/authorization-vault.ts b/libs/auth/src/session/authorization-vault.ts
index 45bf615cd..d57a9eaa9 100644
--- a/libs/auth/src/session/authorization-vault.ts
+++ b/libs/auth/src/session/authorization-vault.ts
@@ -21,7 +21,7 @@
  * - No incremental authorization support
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 // randomUUID can be imported from @frontmcp/utils if needed
 
diff --git a/libs/auth/src/session/authorization.store.ts b/libs/auth/src/session/authorization.store.ts
index f35c87c09..abecc34ff 100644
--- a/libs/auth/src/session/authorization.store.ts
+++ b/libs/auth/src/session/authorization.store.ts
@@ -6,7 +6,7 @@
  * Supports both in-memory (dev/test) and Redis (production) backends.
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { randomUUID, sha256Base64url } from '@frontmcp/utils';
 
 /**
diff --git a/libs/auth/src/session/encrypted-authorization-vault.ts b/libs/auth/src/session/encrypted-authorization-vault.ts
index c4ff9c00f..abb622ffe 100644
--- a/libs/auth/src/session/encrypted-authorization-vault.ts
+++ b/libs/auth/src/session/encrypted-authorization-vault.ts
@@ -23,7 +23,7 @@
  * ```
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { AsyncLocalStorage, randomUUID } from '@frontmcp/utils';
 
 import { EncryptionContextNotSetError, VaultLoadError, VaultNotFoundError } from '../errors/auth-internal.errors';
diff --git a/libs/auth/src/session/transport-session.types.ts b/libs/auth/src/session/transport-session.types.ts
index 7fae19942..21b1d65bf 100644
--- a/libs/auth/src/session/transport-session.types.ts
+++ b/libs/auth/src/session/transport-session.types.ts
@@ -1,6 +1,6 @@
 // session/transport-session.types.ts
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 /**
  * Transport protocol types supported by MCP
diff --git a/libs/auth/src/vault/auth-providers.types.ts b/libs/auth/src/vault/auth-providers.types.ts
index c7c4bcb91..e9efce614 100644
--- a/libs/auth/src/vault/auth-providers.types.ts
+++ b/libs/auth/src/vault/auth-providers.types.ts
@@ -5,7 +5,7 @@
  * These are portable types that can be used across different implementations.
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { AuthorizationVault, Credential } from '../session';
 
diff --git a/libs/sdk/src/__tests__/internal-z-schema-parity.spec.ts b/libs/sdk/src/__tests__/internal-z-schema-parity.spec.ts
new file mode 100644
index 000000000..4bcb5fd3c
--- /dev/null
+++ b/libs/sdk/src/__tests__/internal-z-schema-parity.spec.ts
@@ -0,0 +1,305 @@
+/**
+ * Every schema exported by `@frontmcp/utils`, `@frontmcp/auth` and `@frontmcp/sdk` validates the same inputs, with
+ * the same issues and messages, whether its module builds it with `internalZ` or with the public `z`.
+ */
+import 'reflect-metadata';
+
+import { eagerZ, isLazy, toJSONSchema, z, ZodType } from '@frontmcp/lazy-zod';
+
+type Exports = Record<string, unknown>;
+type Def = Record<string, unknown> & { type: string };
+type ParseResult = { success: boolean; data?: unknown; error?: { issues: unknown[]; message: string } };
+type Parser = {
+  safeParse(input: unknown): ParseResult;
+  safeParseAsync(input: unknown): Promise<ParseResult>;
+  _zod: { def: Def; innerType?: unknown };
+  format?: string | null;
+  minLength?: number | null;
+};
+
+const ENTRY_POINTS = ['@frontmcp/utils', '@frontmcp/auth', '../index'];
+
+function loadEntryPoints(): Record<string, Exports> {
+  return Object.fromEntries(ENTRY_POINTS.map((entry) => [entry, require(entry) as Exports]));
+}
+
+let current: Record<string, Exports> = {};
+jest.isolateModules(() => {
+  current = loadEntryPoints();
+});
+
+let previous: Record<string, Exports> = {};
+jest.isolateModules(() => {
+  jest.doMock('@frontmcp/lazy-zod', () => {
+    const actual = jest.requireActual('@frontmcp/lazy-zod');
+    return { ...actual, internalZ: actual.z };
+  });
+  previous = loadEntryPoints();
+});
+
+function isSchema(value: unknown): value is Parser {
+  return isLazy(value) || (value !== null && typeof value === 'object' && '_zod' in value);
+}
+
+const STRING_FORMATS: Record<string, string> = {
+  url: 'https://example.com/path',
+  email: 'user@example.com',
+  uuid: '123e4567-e89b-42d3-a456-426614174000',
+  datetime: '2020-01-01T00:00:00Z',
+};
+
+/** The objects a sample is still filling in, so a recursive schema's sample can refer back to one: a cyclic input. */
+type Cycles = { open: Map<unknown, Record<string, unknown>>; closed: number };
+
+function sample(schema: unknown, depth: number, cycles?: Cycles): unknown {
+  if (depth > 10 || !isSchema(schema)) return undefined;
+  const parser = schema as Parser;
+  const def = parser._zod.def;
+  const child = (key: string): unknown => sample(def[key], depth + 1, cycles);
+  switch (def.type) {
+    case 'string':
+      return STRING_FORMATS[parser.format ?? ''] ?? 'sample'.padEnd(parser.minLength ?? 0, 'x');
+    case 'number':
+    case 'int':
+      return 1;
+    case 'boolean':
+      return true;
+    case 'bigint':
+      return 1n;
+    case 'date':
+      return new Date(0);
+    case 'null':
+      return null;
+    case 'any':
+    case 'unknown':
+      return 'value';
+    case 'literal':
+      return (def['values'] as unknown[])[0];
+    case 'enum':
+      return Object.values(def['entries'] as object)[0];
+    case 'array':
+      return [child('element')];
+    case 'object':
+      return sampleObject(parser, depth, cycles);
+    case 'record':
+      return { key: child('valueType') };
+    case 'tuple':
+      return (def['items'] as unknown[]).map((item) => sample(item, depth + 1, cycles));
+    case 'union':
+      return sampleUnion(def['options'] as unknown[], depth, cycles);
+    case 'intersection':
+      return { ...(child('left') as object), ...(child('right') as object) };
+    case 'optional':
+    case 'nullable':
+    case 'default':
+    case 'prefault':
+    case 'catch':
+    case 'readonly':
+    case 'nonoptional':
+      return child('innerType');
+    case 'pipe':
+      return child('in');
+    case 'lazy':
+      return sample(parser._zod.innerType, depth + 1, cycles);
+    case 'function':
+      return () => undefined;
+    default:
+      return undefined;
+  }
+}
+
+function sampleObject(parser: Parser, depth: number, cycles: Cycles | undefined): Record<string, unknown> {
+  const open = cycles?.open.get(parser._zod);
+  if (cycles && open) {
+    cycles.closed++;
+    return open;
+  }
+  const value: Record<string, unknown> = {};
+  cycles?.open.set(parser._zod, value);
+  for (const [key, field] of Object.entries(parser._zod.def['shape'] as Record<string, unknown>)) {
+    value[key] = sample(field, depth + 1, cycles);
+  }
+  cycles?.open.delete(parser._zod);
+  return value;
+}
+
+function sampleUnion(options: unknown[], depth: number, cycles: Cycles | undefined): unknown {
+  for (const option of cycles ? options : []) {
+    const closedBefore = cycles?.closed ?? 0;
+    const value = sample(option, depth + 1, cycles);
+    if ((cycles?.closed ?? 0) > closedBefore) return value;
+  }
+  return sample(options[0], depth + 1, cycles);
+}
+
+/** A sample of a recursive schema that refers back to itself, or `undefined` for a schema with no cycle to close. */
+function cyclicSample(schema: Parser): unknown {
+  const cycles: Cycles = { open: new Map(), closed: 0 };
+  const value = sample(schema, 0, cycles);
+  return cycles.closed > 0 ? value : undefined;
+}
+
+function inputsFor(schema: Parser): unknown[] {
+  const base = sample(schema, 0);
+  const inputs: unknown[] = [base, undefined, null, 'text', 42, true, {}, []];
+  if (base !== null && typeof base === 'object' && !Array.isArray(base)) {
+    for (const [key, value] of Object.entries(base)) {
+      const { [key]: _removed, ...rest } = base as Record<string, unknown>;
+      inputs.push(rest, { ...base, [key]: typeof value === 'string' ? 42 : 'wrong' });
+    }
+  }
+  const cyclic = cyclicSample(schema);
+  if (cyclic !== undefined) inputs.push(cyclic);
+  return inputs;
+}
+
+function comparable(value: unknown, seen = new WeakSet<object>()): unknown {
+  if (typeof value === 'function') return '[function]';
+  if (value === null || typeof value !== 'object' || seen.has(value)) return value;
+  seen.add(value);
+  if (Array.isArray(value)) return value.map((item) => comparable(item, seen));
+  if (Object.getPrototypeOf(value) !== Object.prototype) return value;
+  return Object.fromEntries(Object.entries(value).map(([key, item]) => [key, comparable(item, seen)]));
+}
+
+function describeResult(result: ParseResult): unknown {
+  if (result.success) return { success: true, data: comparable(result.data) };
+  return { success: false, issues: comparable(result.error?.issues), message: result.error?.message };
+}
+
+async function outcome(schema: Parser, input: unknown): Promise<unknown> {
+  try {
+    return describeResult(schema.safeParse(input));
+  } catch (error) {
+    if ((error as Error).message.includes('parseAsync')) return describeResult(await schema.safeParseAsync(input));
+    return { threw: (error as Error).message };
+  }
+}
+
+function attempt(read: () => unknown): unknown {
+  try {
+    return { value: comparable(read()) };
+  } catch (error) {
+    return { threw: (error as Error).message };
+  }
+}
+
+type Derived = Record<string, () => Parser>;
+
+/** What a consumer builds from an exported schema: the derived schemas must validate like the ones `main` derives. */
+function derivedFrom(schema: Parser): Derived {
+  const derived: Derived = {
+    'optional()': () => (schema as unknown as eagerZ.ZodType).optional() as unknown as Parser,
+    'array()': () => (schema as unknown as eagerZ.ZodType).array() as unknown as Parser,
+    'or()': () => (schema as unknown as eagerZ.ZodType).or(z.null()) as unknown as Parser,
+    'z.object({ field })': () => z.object({ field: schema as unknown as eagerZ.ZodType }) as unknown as Parser,
+  };
+  if (schema._zod.def.type !== 'object') return derived;
+  const object = schema as unknown as eagerZ.ZodObject<eagerZ.ZodRawShape>;
+  const [firstKey] = Object.keys(object.shape);
+  const extra = { extra: z.string().optional() };
+  const objectDerived: Derived = {
+    'extend()': () => object.extend(extra) as unknown as Parser,
+    'merge()': () => object.merge(z.object(extra)) as unknown as Parser,
+    'partial()': () => object.partial() as unknown as Parser,
+    'strict()': () => object.strict() as unknown as Parser,
+    'z.object({ ...shape })': () => z.object({ ...object.shape, ...extra }) as unknown as Parser,
+  };
+  if (firstKey !== undefined) {
+    objectDerived['pick()'] = () => object.pick({ [firstKey]: true }) as unknown as Parser;
+    objectDerived['omit()'] = () => object.omit({ [firstKey]: true }) as unknown as Parser;
+  }
+  const discriminator = Object.keys(object.shape).find((key) => object.shape[key]._zod.def.type === 'literal');
+  if (discriminator !== undefined) {
+    objectDerived['z.discriminatedUnion()'] = () =>
+      z.discriminatedUnion(discriminator, [
+        object,
+        z.object({ [discriminator]: z.literal('another option') }),
+      ]) as unknown as Parser;
+  }
+  return { ...derived, ...objectDerived };
+}
+
+/** What a consumer reads from an exported schema without parsing with it. */
+function introspection(schema: Parser): Record<string, unknown> {
+  const zodSchema = schema as unknown as eagerZ.ZodType;
+  const shape = schema._zod.def.type === 'object' ? (schema as unknown as eagerZ.ZodObject).shape : undefined;
+  return {
+    type: attempt(() => schema._zod.def.type),
+    className: attempt(() => zodSchema.constructor.name),
+    isZodType: attempt(() => schema instanceof ZodType),
+    description: attempt(() => zodSchema.description),
+    meta: attempt(() => zodSchema.meta()),
+    isOptional: attempt(() => zodSchema.isOptional()),
+    isNullable: attempt(() => zodSchema.isNullable()),
+    shape: attempt(() => shape && Object.entries(shape).map(([key, field]) => [key, field._zod.def.type])),
+    jsonSchema: attempt(() => toJSONSchema(zodSchema)),
+    inputJsonSchema: attempt(() => toJSONSchema(zodSchema, { io: 'input' })),
+  };
+}
+
+const cases = ENTRY_POINTS.flatMap((entry) =>
+  Object.keys(previous[entry])
+    .filter((name) => isSchema(previous[entry][name]))
+    .map((name) => ({ entry, name })),
+);
+
+describe('exported schemas built with internalZ', () => {
+  it('finds the exported schemas of every entry point', () => {
+    for (const entry of ENTRY_POINTS) expect(cases.some((c) => c.entry === entry)).toBe(true);
+  });
+
+  it('compares the schemas internalZ builds with the ones the public z builds', () => {
+    const deferred = (loaded: Record<string, Exports>) =>
+      cases.filter(({ entry, name }) => isLazy(loaded[entry][name])).length;
+    expect(deferred(current)).toBeGreaterThan(deferred(previous));
+  });
+
+  it.each(cases)('$entry $name validates the same inputs as before', async ({ entry, name }) => {
+    const before = previous[entry][name] as Parser;
+    const after = current[entry][name] as Parser;
+    expect(isSchema(after)).toBe(true);
+    for (const input of inputsFor(before)) {
+      expect(await outcome(after, input)).toEqual(await outcome(before, input));
+    }
+  });
+
+  it('also gives each recursive schema a cyclic input, which only Zod’s memoizer parses', () => {
+    const recursive = cases.filter(({ entry, name }) => cyclicSample(previous[entry][name] as Parser) !== undefined);
+    expect(recursive.map(({ name }) => name)).toContain('authoritiesPolicySchema');
+  });
+
+  it.each(cases)('$entry $name composes and converts like before', async ({ entry, name }) => {
+    const before = previous[entry][name] as Parser;
+    const after = current[entry][name] as Parser;
+    expect(introspection(after)).toEqual(introspection(before));
+
+    const zodJsonSchema = (schema: Parser) => attempt(() => eagerZ.toJSONSchema(schema as unknown as eagerZ.ZodType));
+    const zodBefore = zodJsonSchema(before);
+    if (!('threw' in (zodBefore as object))) expect(zodJsonSchema(after)).toEqual(zodBefore);
+
+    const derivedBefore = derivedFrom(before);
+    const derivedAfter = derivedFrom(after);
+    expect(Object.keys(derivedAfter)).toEqual(Object.keys(derivedBefore));
+    const inputs = inputsFor(before);
+    for (const [label, derive] of Object.entries(derivedBefore)) {
+      const derivedOutcome = async (make: () => Parser, input: unknown) => {
+        try {
+          return await outcome(make(), input);
+        } catch (error) {
+          return { threw: (error as Error).message };
+        }
+      };
+      for (const input of [...inputs, [inputs[0]], { field: inputs[0] }]) {
+        expect({ label, outcome: await derivedOutcome(derivedAfter[label], input) }).toEqual({
+          label,
+          outcome: await derivedOutcome(derive, input),
+        });
+      }
+      expect({ label, jsonSchema: attempt(() => toJSONSchema(derivedAfter[label]() as never)) }).toEqual({
+        label,
+        jsonSchema: attempt(() => toJSONSchema(derive() as never)),
+      });
+    }
+  });
+});
diff --git a/libs/sdk/src/agent/agent-builtin-tools.ts b/libs/sdk/src/agent/agent-builtin-tools.ts
index 05d9c1a2b..47acc9ea3 100644
--- a/libs/sdk/src/agent/agent-builtin-tools.ts
+++ b/libs/sdk/src/agent/agent-builtin-tools.ts
@@ -10,7 +10,7 @@
  * and errors that apply to a client's call apply to the model's too.
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import {
   type GetPromptResult,
   type ListPromptsResult,
diff --git a/libs/sdk/src/agent/agent.instance.ts b/libs/sdk/src/agent/agent.instance.ts
index 36ceba2ba..9f21c7b1f 100644
--- a/libs/sdk/src/agent/agent.instance.ts
+++ b/libs/sdk/src/agent/agent.instance.ts
@@ -2,7 +2,7 @@
 
 import { AuthorityDeniedError, type AuthoritiesMetadata } from '@frontmcp/auth';
 import { type Token } from '@frontmcp/di';
-import { toJSONSchema, z } from '@frontmcp/lazy-zod';
+import { toJSONSchema, internalZ as z } from '@frontmcp/lazy-zod';
 import { type CallToolRequest, type CallToolResult, type TextContent, type Tool } from '@frontmcp/protocol';
 
 import { ConfigService } from '../builtin/config';
diff --git a/libs/sdk/src/agent/flows/call-agent.flow.ts b/libs/sdk/src/agent/flows/call-agent.flow.ts
index 4d07c0756..e35188470 100644
--- a/libs/sdk/src/agent/flows/call-agent.flow.ts
+++ b/libs/sdk/src/agent/flows/call-agent.flow.ts
@@ -2,7 +2,7 @@
 
 import { AuthorityDeniedError, resolveRequiredScopes } from '@frontmcp/auth';
 import { ExecutionTimeoutError, withTimeout, type SemaphoreTicket } from '@frontmcp/guard';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { CallToolRequestSchema, CallToolResultSchema, type AuthInfo } from '@frontmcp/protocol';
 
 import { completionEventsOf, completionOutputText } from '../../channel/sources/completion-events';
diff --git a/libs/sdk/src/auth/flows/auth.verify.flow.ts b/libs/sdk/src/auth/flows/auth.verify.flow.ts
index 9a0b96487..e8b12286c 100644
--- a/libs/sdk/src/auth/flows/auth.verify.flow.ts
+++ b/libs/sdk/src/auth/flows/auth.verify.flow.ts
@@ -42,7 +42,7 @@ import {
   type TransparentVerifiedPayload,
   type VerifyResult,
 } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { LocalPrimaryAuth } from '../instances/instance.local-primary-auth';
 
diff --git a/libs/sdk/src/auth/flows/oauth.auth-ui.flow.ts b/libs/sdk/src/auth/flows/oauth.auth-ui.flow.ts
index f96856503..c29bea2cc 100644
--- a/libs/sdk/src/auth/flows/oauth.auth-ui.flow.ts
+++ b/libs/sdk/src/auth/flows/oauth.auth-ui.flow.ts
@@ -21,7 +21,7 @@
  *
  * @packageDocumentation
  */
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import {
   enforceGlobalRateLimit,
diff --git a/libs/sdk/src/auth/flows/oauth.authorize.flow.ts b/libs/sdk/src/auth/flows/oauth.authorize.flow.ts
index 36416de7c..2afc17395 100644
--- a/libs/sdk/src/auth/flows/oauth.authorize.flow.ts
+++ b/libs/sdk/src/auth/flows/oauth.authorize.flow.ts
@@ -37,7 +37,7 @@ import {
   type ProviderCard,
   type ProviderPkce,
 } from '@frontmcp/auth';
-import { z, type ZodError } from '@frontmcp/lazy-zod';
+import { internalZ as z, type ZodError } from '@frontmcp/lazy-zod';
 import { generateCodeVerifier, randomUUID, sha256Base64url } from '@frontmcp/utils';
 
 import {
diff --git a/libs/sdk/src/auth/flows/oauth.callback.flow.ts b/libs/sdk/src/auth/flows/oauth.callback.flow.ts
index 3ce178650..53bfc73ab 100644
--- a/libs/sdk/src/auth/flows/oauth.callback.flow.ts
+++ b/libs/sdk/src/auth/flows/oauth.callback.flow.ts
@@ -29,7 +29,7 @@ import {
   type PendingLoginState,
   type ProviderPkce,
 } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import {
   base64urlEncode,
   generateCodeVerifier,
diff --git a/libs/sdk/src/auth/flows/oauth.connect.flow.ts b/libs/sdk/src/auth/flows/oauth.connect.flow.ts
index ab3fda4e0..3b59a4d27 100644
--- a/libs/sdk/src/auth/flows/oauth.connect.flow.ts
+++ b/libs/sdk/src/auth/flows/oauth.connect.flow.ts
@@ -30,7 +30,7 @@ import {
   type LoginConfig,
   type LoginFieldConfig,
 } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import {
   enforceGlobalRateLimit,
diff --git a/libs/sdk/src/auth/flows/oauth.provider-callback.flow.ts b/libs/sdk/src/auth/flows/oauth.provider-callback.flow.ts
index c6fc0bde7..176c85d71 100644
--- a/libs/sdk/src/auth/flows/oauth.provider-callback.flow.ts
+++ b/libs/sdk/src/auth/flows/oauth.provider-callback.flow.ts
@@ -32,7 +32,7 @@ import {
   type ProviderTokens,
   type ProviderUserInfo,
 } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import {
   base64urlEncode,
   generateCodeVerifier,
diff --git a/libs/sdk/src/auth/flows/oauth.register.flow.ts b/libs/sdk/src/auth/flows/oauth.register.flow.ts
index ab53607bd..1736ba407 100644
--- a/libs/sdk/src/auth/flows/oauth.register.flow.ts
+++ b/libs/sdk/src/auth/flows/oauth.register.flow.ts
@@ -32,7 +32,7 @@
  */
 
 import { isLoopbackRedirectUri, type RegisteredClient } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { base64urlEncode, randomBytes, randomUUID } from '@frontmcp/utils';
 
 import {
diff --git a/libs/sdk/src/auth/flows/oauth.token.flow.ts b/libs/sdk/src/auth/flows/oauth.token.flow.ts
index 03c505cdd..57a5d1433 100644
--- a/libs/sdk/src/auth/flows/oauth.token.flow.ts
+++ b/libs/sdk/src/auth/flows/oauth.token.flow.ts
@@ -56,7 +56,7 @@
  * That's it. No pages with complex consent screens are required; reuse your normal /oauth/authorize
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { randomUUID } from '@frontmcp/utils';
 
 import {
diff --git a/libs/sdk/src/auth/flows/oauth.userinfo.flow.ts b/libs/sdk/src/auth/flows/oauth.userinfo.flow.ts
index ee634fe81..0791dd152 100644
--- a/libs/sdk/src/auth/flows/oauth.userinfo.flow.ts
+++ b/libs/sdk/src/auth/flows/oauth.userinfo.flow.ts
@@ -18,7 +18,7 @@
 import 'reflect-metadata';
 
 import { extractBearerToken } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import {
   enforceGlobalRateLimit,
diff --git a/libs/sdk/src/auth/flows/session.verify.flow.ts b/libs/sdk/src/auth/flows/session.verify.flow.ts
index b311178e4..49a120b33 100644
--- a/libs/sdk/src/auth/flows/session.verify.flow.ts
+++ b/libs/sdk/src/auth/flows/session.verify.flow.ts
@@ -40,7 +40,7 @@ import {
   type ProviderVerifyRef,
   type VerifyResult,
 } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { getMachineId, randomUUID, sha256, sha256Hex, timingSafeEqual } from '@frontmcp/utils';
 
 import { detectPlatformFromUserAgent } from '../../notification/notification.service';
diff --git a/libs/sdk/src/auth/flows/well-known.jwks.flow.ts b/libs/sdk/src/auth/flows/well-known.jwks.flow.ts
index bb8b3d39b..f631fbd41 100644
--- a/libs/sdk/src/auth/flows/well-known.jwks.flow.ts
+++ b/libs/sdk/src/auth/flows/well-known.jwks.flow.ts
@@ -21,7 +21,7 @@ import {
 import 'reflect-metadata';
 
 import { JwksService } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { OrchestratorJwksNotAvailableError } from '../../errors/auth-internal.errors';
 
diff --git a/libs/sdk/src/auth/flows/well-known.oauth-authorization-server.flow.ts b/libs/sdk/src/auth/flows/well-known.oauth-authorization-server.flow.ts
index 47420daba..d5c2b0879 100644
--- a/libs/sdk/src/auth/flows/well-known.oauth-authorization-server.flow.ts
+++ b/libs/sdk/src/auth/flows/well-known.oauth-authorization-server.flow.ts
@@ -2,7 +2,7 @@
 import 'reflect-metadata';
 
 import { advertisedScopes, trimSlash } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { isProduction } from '@frontmcp/utils';
 
 import {
diff --git a/libs/sdk/src/auth/flows/well-known.prm.flow.ts b/libs/sdk/src/auth/flows/well-known.prm.flow.ts
index a6a7f0f53..8781f83c3 100644
--- a/libs/sdk/src/auth/flows/well-known.prm.flow.ts
+++ b/libs/sdk/src/auth/flows/well-known.prm.flow.ts
@@ -2,7 +2,7 @@
 import 'reflect-metadata';
 
 import { resourceScopesFor, type ResourceScopeOptions } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import {
   computeResource,
diff --git a/libs/sdk/src/channel/flows/list-channels.flow.ts b/libs/sdk/src/channel/flows/list-channels.flow.ts
index 8677a61fb..68e23974e 100644
--- a/libs/sdk/src/channel/flows/list-channels.flow.ts
+++ b/libs/sdk/src/channel/flows/list-channels.flow.ts
@@ -1,6 +1,6 @@
 // file: libs/sdk/src/channel/flows/list-channels.flow.ts
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Flow, FlowBase, FlowHooksOf, type FlowPlan, type FlowRunOptions } from '../../common';
 
diff --git a/libs/sdk/src/channel/flows/send-channel-notification.flow.ts b/libs/sdk/src/channel/flows/send-channel-notification.flow.ts
index 9bfce10d7..431e17372 100644
--- a/libs/sdk/src/channel/flows/send-channel-notification.flow.ts
+++ b/libs/sdk/src/channel/flows/send-channel-notification.flow.ts
@@ -1,6 +1,6 @@
 // file: libs/sdk/src/channel/flows/send-channel-notification.flow.ts
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Flow, FlowBase, FlowHooksOf, type FlowPlan, type FlowRunOptions } from '../../common';
 import { InvalidInputError } from '../../errors';
diff --git a/libs/sdk/src/channel/reply/reply.types.ts b/libs/sdk/src/channel/reply/reply.types.ts
index b19f1aa65..b44da21da 100644
--- a/libs/sdk/src/channel/reply/reply.types.ts
+++ b/libs/sdk/src/channel/reply/reply.types.ts
@@ -1,6 +1,6 @@
 // file: libs/sdk/src/channel/reply/reply.types.ts
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 /**
  * Input schema for the channel reply tool.
diff --git a/libs/sdk/src/common/common.schema.ts b/libs/sdk/src/common/common.schema.ts
index 1e8526f2e..4c2947fd0 100644
--- a/libs/sdk/src/common/common.schema.ts
+++ b/libs/sdk/src/common/common.schema.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { type ServerResponse } from '../common';
 
diff --git a/libs/sdk/src/common/entries/job.entry.ts b/libs/sdk/src/common/entries/job.entry.ts
index f76c0ee0e..652ef440b 100644
--- a/libs/sdk/src/common/entries/job.entry.ts
+++ b/libs/sdk/src/common/entries/job.entry.ts
@@ -1,4 +1,4 @@
-import { toJSONSchema, z } from '@frontmcp/lazy-zod';
+import { toJSONSchema, internalZ as z } from '@frontmcp/lazy-zod';
 
 import type ProviderRegistry from '../../provider/provider.registry';
 import { type ToolInputOf, type ToolOutputOf } from '../decorators';
diff --git a/libs/sdk/src/common/entries/tool.entry.ts b/libs/sdk/src/common/entries/tool.entry.ts
index c9e2e99fc..ca51dfdc8 100644
--- a/libs/sdk/src/common/entries/tool.entry.ts
+++ b/libs/sdk/src/common/entries/tool.entry.ts
@@ -1,6 +1,6 @@
 // file: libs/sdk/src/common/entries/tool.entry.ts
 
-import { toJSONSchema, z } from '@frontmcp/lazy-zod';
+import { toJSONSchema, internalZ as z } from '@frontmcp/lazy-zod';
 import {
   type AuthInfo,
   type CallToolRequest,
diff --git a/libs/sdk/src/common/flow/flow.utils.ts b/libs/sdk/src/common/flow/flow.utils.ts
index ae1220d29..c60edbce1 100644
--- a/libs/sdk/src/common/flow/flow.utils.ts
+++ b/libs/sdk/src/common/flow/flow.utils.ts
@@ -1,7 +1,7 @@
 // file: libs/sdk/src/common/flow/flow.utils.ts
 // Shared utilities for list flows (tools/list, resources/list, etc.)
 
-import { z, type ZodType } from '@frontmcp/lazy-zod';
+import { internalZ as z, type ZodType } from '@frontmcp/lazy-zod';
 
 import { InvalidInputError, InvalidMethodError } from '../../errors';
 
diff --git a/libs/sdk/src/common/metadata/adapter.metadata.ts b/libs/sdk/src/common/metadata/adapter.metadata.ts
index cd8388906..974290241 100644
--- a/libs/sdk/src/common/metadata/adapter.metadata.ts
+++ b/libs/sdk/src/common/metadata/adapter.metadata.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { type RawZodShape } from '../types';
 
diff --git a/libs/sdk/src/common/metadata/agent.metadata.ts b/libs/sdk/src/common/metadata/agent.metadata.ts
index dffb0e556..ce1dd96d1 100644
--- a/libs/sdk/src/common/metadata/agent.metadata.ts
+++ b/libs/sdk/src/common/metadata/agent.metadata.ts
@@ -7,7 +7,7 @@ import {
   type RateLimitConfig,
   type TimeoutConfig,
 } from '@frontmcp/guard';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { entryAvailabilitySchema, type EntryAvailability } from '@frontmcp/utils';
 
 import { type AdapterType } from '../interfaces/adapter.interface';
diff --git a/libs/sdk/src/common/metadata/app-filter.metadata.ts b/libs/sdk/src/common/metadata/app-filter.metadata.ts
index 6180ac226..44411a21f 100644
--- a/libs/sdk/src/common/metadata/app-filter.metadata.ts
+++ b/libs/sdk/src/common/metadata/app-filter.metadata.ts
@@ -4,7 +4,7 @@
  * loaded from remote or ESM-based apps.
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 /**
  * Glob-style name patterns per primitive type.
diff --git a/libs/sdk/src/common/metadata/app.metadata.ts b/libs/sdk/src/common/metadata/app.metadata.ts
index 77e50f97c..c10098361 100644
--- a/libs/sdk/src/common/metadata/app.metadata.ts
+++ b/libs/sdk/src/common/metadata/app.metadata.ts
@@ -1,5 +1,5 @@
 import { authOptionsSchema } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import type { AuthInfo } from '@frontmcp/protocol';
 import { isValidMcpUri } from '@frontmcp/utils';
 
diff --git a/libs/sdk/src/common/metadata/auth-provider.metadata.ts b/libs/sdk/src/common/metadata/auth-provider.metadata.ts
index 7f6c4f6bc..3ff22fa17 100644
--- a/libs/sdk/src/common/metadata/auth-provider.metadata.ts
+++ b/libs/sdk/src/common/metadata/auth-provider.metadata.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { type RawZodShape } from '../types';
 
diff --git a/libs/sdk/src/common/metadata/channel.metadata.ts b/libs/sdk/src/common/metadata/channel.metadata.ts
index 68de6ae6c..546b1ba99 100644
--- a/libs/sdk/src/common/metadata/channel.metadata.ts
+++ b/libs/sdk/src/common/metadata/channel.metadata.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { entryAvailabilitySchema, type EntryAvailability } from '@frontmcp/utils';
 
 import { type ToolType } from '../interfaces/tool.interface';
diff --git a/libs/sdk/src/common/metadata/flow.metadata.ts b/libs/sdk/src/common/metadata/flow.metadata.ts
index 3a372c153..688ce7444 100644
--- a/libs/sdk/src/common/metadata/flow.metadata.ts
+++ b/libs/sdk/src/common/metadata/flow.metadata.ts
@@ -1,5 +1,5 @@
 import { type Token } from '@frontmcp/di';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { type ScopeEntry } from '../entries';
 import { type HttpMethod, type ServerRequest } from '../interfaces';
diff --git a/libs/sdk/src/common/metadata/front-mcp.metadata.ts b/libs/sdk/src/common/metadata/front-mcp.metadata.ts
index 44464e7e4..d29ab5598 100644
--- a/libs/sdk/src/common/metadata/front-mcp.metadata.ts
+++ b/libs/sdk/src/common/metadata/front-mcp.metadata.ts
@@ -1,5 +1,5 @@
 import { guardConfigSchema, type GuardConfig } from '@frontmcp/guard';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { MAX_CONCURRENT_TASKS_PER_SESSION } from '../../task/task.types';
 import type { AdapterType, AppType, PluginType, ProviderType, ResourceType, SkillType, ToolType } from '../interfaces';
diff --git a/libs/sdk/src/common/metadata/job.metadata.ts b/libs/sdk/src/common/metadata/job.metadata.ts
index c5e7ef737..e7c7c6922 100644
--- a/libs/sdk/src/common/metadata/job.metadata.ts
+++ b/libs/sdk/src/common/metadata/job.metadata.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { type RawZodShape } from '../types';
 import { type ToolInputType, type ToolOutputType } from './tool.metadata';
diff --git a/libs/sdk/src/common/metadata/logger.metadata.ts b/libs/sdk/src/common/metadata/logger.metadata.ts
index fdf808494..2124ca6df 100644
--- a/libs/sdk/src/common/metadata/logger.metadata.ts
+++ b/libs/sdk/src/common/metadata/logger.metadata.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { type RawZodShape } from '../types';
 
diff --git a/libs/sdk/src/common/metadata/output-policy.ts b/libs/sdk/src/common/metadata/output-policy.ts
index 4a50b290a..352c57c6d 100644
--- a/libs/sdk/src/common/metadata/output-policy.ts
+++ b/libs/sdk/src/common/metadata/output-policy.ts
@@ -1,5 +1,5 @@
 // file: libs/sdk/src/common/metadata/output-policy.ts
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { isDevelopment } from '@frontmcp/utils';
 
 /**
diff --git a/libs/sdk/src/common/metadata/plugin.metadata.ts b/libs/sdk/src/common/metadata/plugin.metadata.ts
index 27fb0e960..2257016ad 100644
--- a/libs/sdk/src/common/metadata/plugin.metadata.ts
+++ b/libs/sdk/src/common/metadata/plugin.metadata.ts
@@ -1,5 +1,5 @@
 import { type Token } from '@frontmcp/di';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import {
   type AdapterType,
diff --git a/libs/sdk/src/common/metadata/prompt.metadata.ts b/libs/sdk/src/common/metadata/prompt.metadata.ts
index c89e787f8..6c3af2512 100644
--- a/libs/sdk/src/common/metadata/prompt.metadata.ts
+++ b/libs/sdk/src/common/metadata/prompt.metadata.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { IconSchema, type Icon } from '@frontmcp/protocol';
 import { entryAvailabilitySchema, type EntryAvailability } from '@frontmcp/utils';
 
diff --git a/libs/sdk/src/common/metadata/provider.metadata.ts b/libs/sdk/src/common/metadata/provider.metadata.ts
index 5a1b1b21d..e7c5e58b8 100644
--- a/libs/sdk/src/common/metadata/provider.metadata.ts
+++ b/libs/sdk/src/common/metadata/provider.metadata.ts
@@ -1,5 +1,5 @@
 import { ProviderScope, type ProviderMetadata } from '@frontmcp/di';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { type RawZodShape } from '../types';
 
diff --git a/libs/sdk/src/common/metadata/resource.metadata.ts b/libs/sdk/src/common/metadata/resource.metadata.ts
index 1f9ffac11..3984d9c5b 100644
--- a/libs/sdk/src/common/metadata/resource.metadata.ts
+++ b/libs/sdk/src/common/metadata/resource.metadata.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { IconSchema, type Icon } from '@frontmcp/protocol';
 import { entryAvailabilitySchema, isValidMcpUri, isValidMcpUriTemplate, type EntryAvailability } from '@frontmcp/utils';
 
diff --git a/libs/sdk/src/common/metadata/skill.metadata.ts b/libs/sdk/src/common/metadata/skill.metadata.ts
index 276ca2e4c..04af600f5 100644
--- a/libs/sdk/src/common/metadata/skill.metadata.ts
+++ b/libs/sdk/src/common/metadata/skill.metadata.ts
@@ -1,5 +1,5 @@
 import { getMetadata, isClass, type Type } from '@frontmcp/di';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { entryAvailabilitySchema, isValidMcpUri, type EntryAvailability } from '@frontmcp/utils';
 
 import { InvalidInputError } from '../../errors/mcp.error';
diff --git a/libs/sdk/src/common/metadata/tool.metadata.ts b/libs/sdk/src/common/metadata/tool.metadata.ts
index 008f9effa..58374df90 100644
--- a/libs/sdk/src/common/metadata/tool.metadata.ts
+++ b/libs/sdk/src/common/metadata/tool.metadata.ts
@@ -6,7 +6,7 @@ import {
   type RateLimitConfig,
   type TimeoutConfig,
 } from '@frontmcp/guard';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import {
   AudioContentSchema,
   EmbeddedResourceSchema,
diff --git a/libs/sdk/src/common/metadata/ui-serving-mode.ts b/libs/sdk/src/common/metadata/ui-serving-mode.ts
index a210e818e..ff5fc6568 100644
--- a/libs/sdk/src/common/metadata/ui-serving-mode.ts
+++ b/libs/sdk/src/common/metadata/ui-serving-mode.ts
@@ -1,5 +1,5 @@
 // file: libs/sdk/src/common/metadata/ui-serving-mode.ts
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import type { WidgetServingMode } from '@frontmcp/uipack/types';
 
 /**
diff --git a/libs/sdk/src/common/metadata/workflow.metadata.ts b/libs/sdk/src/common/metadata/workflow.metadata.ts
index c39817ebe..7d4c32f7a 100644
--- a/libs/sdk/src/common/metadata/workflow.metadata.ts
+++ b/libs/sdk/src/common/metadata/workflow.metadata.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { type RawZodShape } from '../types';
 import { type JobPermission, type JobRetryConfig } from './job.metadata';
diff --git a/libs/sdk/src/common/schemas/annotated-class.schema.ts b/libs/sdk/src/common/schemas/annotated-class.schema.ts
index a48f99019..0f46b005d 100644
--- a/libs/sdk/src/common/schemas/annotated-class.schema.ts
+++ b/libs/sdk/src/common/schemas/annotated-class.schema.ts
@@ -1,5 +1,5 @@
 import { type Type } from '@frontmcp/di';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { isPackageSpecifier } from '../../esm-loader/package-specifier';
 import type { AdapterType, AgentType, PluginType, ProviderType } from '../interfaces';
diff --git a/libs/sdk/src/common/schemas/http-input.schema.ts b/libs/sdk/src/common/schemas/http-input.schema.ts
index 2392e807e..69388b556 100644
--- a/libs/sdk/src/common/schemas/http-input.schema.ts
+++ b/libs/sdk/src/common/schemas/http-input.schema.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 // Checked as `z.object({})` checks, but passed through as is: a passthrough object copies every key of a Node request.
 const httpObjectSchema = () =>
diff --git a/libs/sdk/src/common/schemas/http-output.schema.ts b/libs/sdk/src/common/schemas/http-output.schema.ts
index ac465d31a..ccb104d6e 100644
--- a/libs/sdk/src/common/schemas/http-output.schema.ts
+++ b/libs/sdk/src/common/schemas/http-output.schema.ts
@@ -1,7 +1,7 @@
 // output-schemas.ts
 // Use lazy-zod: this module defines many top-level discriminated-union
 // and object schemas. Lazy construction defers the cost to first `.parse()`.
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import {
   JSONRPCErrorSchema,
   JSONRPCResponseSchema,
diff --git a/libs/sdk/src/common/schemas/session-header.schema.ts b/libs/sdk/src/common/schemas/session-header.schema.ts
index 8b7a713f1..14bf7e473 100644
--- a/libs/sdk/src/common/schemas/session-header.schema.ts
+++ b/libs/sdk/src/common/schemas/session-header.schema.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 /**
  * Zod schema for validating mcp-session-id header format.
diff --git a/libs/sdk/src/common/types/auth/session.types.ts b/libs/sdk/src/common/types/auth/session.types.ts
index 96afc7b94..0ffe9237b 100644
--- a/libs/sdk/src/common/types/auth/session.types.ts
+++ b/libs/sdk/src/common/types/auth/session.types.ts
@@ -6,7 +6,7 @@ import {
   type SessionIdPayload,
   type UserClaim,
 } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 // Re-export non-conflicting session types from @frontmcp/auth
 export { aiPlatformTypeSchema, userClaimSchema, sessionIdPayloadSchema } from '@frontmcp/auth';
diff --git a/libs/sdk/src/common/types/options/elicitation/schema.ts b/libs/sdk/src/common/types/options/elicitation/schema.ts
index 2efbf0720..9b555a9b1 100644
--- a/libs/sdk/src/common/types/options/elicitation/schema.ts
+++ b/libs/sdk/src/common/types/options/elicitation/schema.ts
@@ -3,7 +3,7 @@
 // Elicitation configuration schema for @FrontMcp decorator.
 // Uses explicit interfaces from interfaces.ts for IDE autocomplete.
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { RawZodShape } from '../../common.types';
 import { redisOptionsSchema } from '../redis';
diff --git a/libs/sdk/src/common/types/options/ext-apps/schema.ts b/libs/sdk/src/common/types/options/ext-apps/schema.ts
index 03e011c49..d45865b62 100644
--- a/libs/sdk/src/common/types/options/ext-apps/schema.ts
+++ b/libs/sdk/src/common/types/options/ext-apps/schema.ts
@@ -1,7 +1,7 @@
 // common/types/options/ext-apps/schema.ts
 // Zod schema for ext-apps configuration
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { RawZodShape } from '../../common.types';
 import type { ExtAppsHostCapabilitiesInterface, ExtAppsOptionsInterface } from './interfaces';
diff --git a/libs/sdk/src/common/types/options/health/schema.ts b/libs/sdk/src/common/types/options/health/schema.ts
index 7fc84e0aa..7753113a7 100644
--- a/libs/sdk/src/common/types/options/health/schema.ts
+++ b/libs/sdk/src/common/types/options/health/schema.ts
@@ -3,7 +3,7 @@
 // Health and readiness endpoint configuration schema for @FrontMcp decorator.
 // Uses explicit interfaces from interfaces.ts for IDE autocomplete.
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { RawZodShape } from '../../common.types';
 import type { HealthOptionsInterface, HealthReadyzOptionsInterface } from './interfaces';
diff --git a/libs/sdk/src/common/types/options/http/schema.ts b/libs/sdk/src/common/types/options/http/schema.ts
index 16f9698dc..ee1d76ee9 100644
--- a/libs/sdk/src/common/types/options/http/schema.ts
+++ b/libs/sdk/src/common/types/options/http/schema.ts
@@ -2,7 +2,7 @@
 // Zod schema for HTTP configuration. Uses lazy-zod so the schema tree is
 // not constructed at module load when nothing parses it.
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { getEnv } from '@frontmcp/utils';
 
 import type { HttpMethod, ServerRequestHandler } from '../../../interfaces';
diff --git a/libs/sdk/src/common/types/options/logging/schema.ts b/libs/sdk/src/common/types/options/logging/schema.ts
index 7436ccbf6..ff65674b2 100644
--- a/libs/sdk/src/common/types/options/logging/schema.ts
+++ b/libs/sdk/src/common/types/options/logging/schema.ts
@@ -1,7 +1,7 @@
 // common/types/options/logging/schema.ts
 // Zod schema for logging configuration
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { getEnv, getRuntimeContext } from '@frontmcp/utils';
 
 import { annotatedFrontMcpLoggerSchema } from '../../../schemas';
diff --git a/libs/sdk/src/common/types/options/metrics/schema.ts b/libs/sdk/src/common/types/options/metrics/schema.ts
index 5da7cea9c..5c5918611 100644
--- a/libs/sdk/src/common/types/options/metrics/schema.ts
+++ b/libs/sdk/src/common/types/options/metrics/schema.ts
@@ -2,7 +2,7 @@
 //
 // Configuration schema for the /metrics endpoint (issue #397).
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { RawZodShape } from '../../common.types';
 import type { MetricsOptionsInterface, MetricsProcessOptionsInterface } from './interfaces';
diff --git a/libs/sdk/src/common/types/options/observability/schema.ts b/libs/sdk/src/common/types/options/observability/schema.ts
index ccfd41d22..a309dac72 100644
--- a/libs/sdk/src/common/types/options/observability/schema.ts
+++ b/libs/sdk/src/common/types/options/observability/schema.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 /**
  * Zod schema for observability configuration.
diff --git a/libs/sdk/src/common/types/options/outbound-fetch/schema.ts b/libs/sdk/src/common/types/options/outbound-fetch/schema.ts
index b48c2bee0..7f20bfebc 100644
--- a/libs/sdk/src/common/types/options/outbound-fetch/schema.ts
+++ b/libs/sdk/src/common/types/options/outbound-fetch/schema.ts
@@ -1,7 +1,7 @@
 // common/types/options/outbound-fetch/schema.ts
 // Zod schema for outbound `this.fetch()` configuration
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { RawZodShape } from '../../common.types';
 import type { OutboundFetchOptionsInterface } from './interfaces';
diff --git a/libs/sdk/src/common/types/options/pagination/schema.ts b/libs/sdk/src/common/types/options/pagination/schema.ts
index de509110f..64f8e1b54 100644
--- a/libs/sdk/src/common/types/options/pagination/schema.ts
+++ b/libs/sdk/src/common/types/options/pagination/schema.ts
@@ -1,7 +1,7 @@
 // common/types/options/pagination/schema.ts
 // Zod schema for pagination configuration
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { RawZodShape } from '../../common.types';
 import type { PaginationOptionsInterface, ToolPaginationOptionsInterface } from './interfaces';
diff --git a/libs/sdk/src/common/types/options/redis/schema.ts b/libs/sdk/src/common/types/options/redis/schema.ts
index cdcaf4743..e33745212 100644
--- a/libs/sdk/src/common/types/options/redis/schema.ts
+++ b/libs/sdk/src/common/types/options/redis/schema.ts
@@ -1,7 +1,7 @@
 // common/types/options/redis/schema.ts
 // Zod schema for Redis/storage configuration
 
-import { NEVER, z } from '@frontmcp/lazy-zod';
+import { NEVER, internalZ as z } from '@frontmcp/lazy-zod';
 import { describeRedisUrlConflicts, mergeRedisUrlFields } from '@frontmcp/utils';
 
 import type { PubsubOptionsInterface, RedisOptionsInterface } from './interfaces';
diff --git a/libs/sdk/src/common/types/options/registry/schema.ts b/libs/sdk/src/common/types/options/registry/schema.ts
index f41c247d3..c383aefea 100644
--- a/libs/sdk/src/common/types/options/registry/schema.ts
+++ b/libs/sdk/src/common/types/options/registry/schema.ts
@@ -1,6 +1,6 @@
 // common/types/options/registry/schema.ts
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { RawZodShape } from '../../common.types';
 import type { McpRegistryOptionsInterface, McpRegistryRepositoryInterface } from './interfaces';
diff --git a/libs/sdk/src/common/types/options/server-info/schema.ts b/libs/sdk/src/common/types/options/server-info/schema.ts
index 6fbfa403f..622675d0a 100644
--- a/libs/sdk/src/common/types/options/server-info/schema.ts
+++ b/libs/sdk/src/common/types/options/server-info/schema.ts
@@ -1,7 +1,7 @@
 // common/types/options/server-info/schema.ts
 // Zod schema for server info configuration
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { IconSchema } from '@frontmcp/protocol';
 
 import { type RawZodShape } from '../../common.types';
diff --git a/libs/sdk/src/common/types/options/session/schema.ts b/libs/sdk/src/common/types/options/session/schema.ts
index 2a07c5a2d..a0c4378bf 100644
--- a/libs/sdk/src/common/types/options/session/schema.ts
+++ b/libs/sdk/src/common/types/options/session/schema.ts
@@ -1,7 +1,7 @@
 // common/types/options/session/schema.ts
 // Zod schema for session configuration
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { aiPlatformTypeSchema } from '../../auth/session.types';
 import { type RawZodShape } from '../../common.types';
diff --git a/libs/sdk/src/common/types/options/skills-http/schema.ts b/libs/sdk/src/common/types/options/skills-http/schema.ts
index 6a649cb30..a4c0295f2 100644
--- a/libs/sdk/src/common/types/options/skills-http/schema.ts
+++ b/libs/sdk/src/common/types/options/skills-http/schema.ts
@@ -1,7 +1,7 @@
 // common/types/options/skills-http/schema.ts
 // Zod schema for skills HTTP configuration
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { ExternalSkillProviderBase } from '../../../../skill/providers/external-skill.provider';
 import type { RawZodShape } from '../../common.types';
diff --git a/libs/sdk/src/common/types/options/sqlite/schema.ts b/libs/sdk/src/common/types/options/sqlite/schema.ts
index d366a52f4..f76616c82 100644
--- a/libs/sdk/src/common/types/options/sqlite/schema.ts
+++ b/libs/sdk/src/common/types/options/sqlite/schema.ts
@@ -4,7 +4,7 @@
  * Zod schema for SQLite storage options used in FrontMCP config.
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { RawZodShape } from '../../common.types';
 import type { SqliteOptionsInterface } from './interfaces';
diff --git a/libs/sdk/src/common/types/options/transport/schema.ts b/libs/sdk/src/common/types/options/transport/schema.ts
index 015392377..e99e9a934 100644
--- a/libs/sdk/src/common/types/options/transport/schema.ts
+++ b/libs/sdk/src/common/types/options/transport/schema.ts
@@ -3,7 +3,7 @@
 // Transport configuration schema with protocol presets and simplified structure.
 // Uses explicit interfaces from interfaces.ts for IDE autocomplete.
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { isServerless } from '@frontmcp/utils';
 
 import { type RawZodShape } from '../../common.types';
diff --git a/libs/sdk/src/common/utils/decide-request-intent.utils.ts b/libs/sdk/src/common/utils/decide-request-intent.utils.ts
index 0b5cea81a..7cbe10098 100644
--- a/libs/sdk/src/common/utils/decide-request-intent.utils.ts
+++ b/libs/sdk/src/common/utils/decide-request-intent.utils.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { type ServerRequest } from '../interfaces';
 import { type LegacyProtocolFlags } from '../types/options/transport/schema';
diff --git a/libs/sdk/src/completion/flows/complete.flow.ts b/libs/sdk/src/completion/flows/complete.flow.ts
index badd303e3..fce6dd564 100644
--- a/libs/sdk/src/completion/flows/complete.flow.ts
+++ b/libs/sdk/src/completion/flows/complete.flow.ts
@@ -1,7 +1,7 @@
 // file: libs/sdk/src/completion/flows/complete.flow.ts
 
 import { AuthorityDeniedError, resolveRequiredScopes, type AuthoritiesMetadata } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { CompleteRequestSchema, CompleteResultSchema, type AuthInfo } from '@frontmcp/protocol';
 
 import { loadRemoteAppCapabilities } from '../../app/remote-capabilities.utils';
diff --git a/libs/sdk/src/elicitation/flows/elicitation-request.flow.ts b/libs/sdk/src/elicitation/flows/elicitation-request.flow.ts
index a9d215b73..6a0890e19 100644
--- a/libs/sdk/src/elicitation/flows/elicitation-request.flow.ts
+++ b/libs/sdk/src/elicitation/flows/elicitation-request.flow.ts
@@ -7,7 +7,7 @@
  * @module elicitation/flows/elicitation-request.flow
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { randomUUID } from '@frontmcp/utils';
 
 import { Flow, FlowBase, FlowHooksOf, type FlowPlan, type FlowRunOptions } from '../../common';
diff --git a/libs/sdk/src/elicitation/flows/elicitation-result.flow.ts b/libs/sdk/src/elicitation/flows/elicitation-result.flow.ts
index face74cf3..5f3b5117c 100644
--- a/libs/sdk/src/elicitation/flows/elicitation-result.flow.ts
+++ b/libs/sdk/src/elicitation/flows/elicitation-result.flow.ts
@@ -7,7 +7,7 @@
  * @module elicitation/flows/elicitation-result.flow
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Flow, FlowBase, FlowHooksOf, type FlowPlan, type FlowRunOptions } from '../../common';
 import { ElicitationStoreNotInitializedError, InvalidInputError } from '../../errors';
diff --git a/libs/sdk/src/elicitation/helpers/elicit.helper.ts b/libs/sdk/src/elicitation/helpers/elicit.helper.ts
index fc0eedf00..0fa69591f 100644
--- a/libs/sdk/src/elicitation/helpers/elicit.helper.ts
+++ b/libs/sdk/src/elicitation/helpers/elicit.helper.ts
@@ -7,7 +7,7 @@
  * @module elicitation/helpers/elicit.helper
  */
 
-import { toJSONSchema, z, type ZodType } from '@frontmcp/lazy-zod';
+import { toJSONSchema, internalZ as z, type ZodType } from '@frontmcp/lazy-zod';
 import { awaitOutsideRequest, randomUUID } from '@frontmcp/utils';
 
 import { type FrontMcpContext } from '../../context';
diff --git a/libs/sdk/src/elicitation/helpers/validate-elicitation-content.ts b/libs/sdk/src/elicitation/helpers/validate-elicitation-content.ts
index 044255a1e..8aafae369 100644
--- a/libs/sdk/src/elicitation/helpers/validate-elicitation-content.ts
+++ b/libs/sdk/src/elicitation/helpers/validate-elicitation-content.ts
@@ -7,7 +7,7 @@
  * @module elicitation/helpers/validate-elicitation-content
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 /**
  * Validation result interface.
diff --git a/libs/sdk/src/elicitation/send-elicitation-result.tool.ts b/libs/sdk/src/elicitation/send-elicitation-result.tool.ts
index 0fbeed721..5a7f3f751 100644
--- a/libs/sdk/src/elicitation/send-elicitation-result.tool.ts
+++ b/libs/sdk/src/elicitation/send-elicitation-result.tool.ts
@@ -12,7 +12,7 @@
  * 5. Original tool's elicit() returns the pre-resolved result immediately
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import type { CallToolResult } from '@frontmcp/protocol';
 
 import { Tool, ToolContext } from '../common';
diff --git a/libs/sdk/src/errors/authorization-required.error.ts b/libs/sdk/src/errors/authorization-required.error.ts
index 0c6f599e9..9cac8a137 100644
--- a/libs/sdk/src/errors/authorization-required.error.ts
+++ b/libs/sdk/src/errors/authorization-required.error.ts
@@ -11,7 +11,7 @@
  *
  * Supports MCP elicit flow for clients that support it.
  */
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { PublicMcpError } from './mcp.error';
 
diff --git a/libs/sdk/src/esm-loader/esm-auth.types.ts b/libs/sdk/src/esm-loader/esm-auth.types.ts
index 4cbceeb6a..1072752a6 100644
--- a/libs/sdk/src/esm-loader/esm-auth.types.ts
+++ b/libs/sdk/src/esm-loader/esm-auth.types.ts
@@ -3,7 +3,7 @@
  * @description Authentication configuration for private npm registries and esm.sh CDN.
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 /**
  * Authentication configuration for accessing private npm registries.
diff --git a/libs/sdk/src/esm-loader/esm-manifest.ts b/libs/sdk/src/esm-loader/esm-manifest.ts
index ce9498985..8ba50592e 100644
--- a/libs/sdk/src/esm-loader/esm-manifest.ts
+++ b/libs/sdk/src/esm-loader/esm-manifest.ts
@@ -4,7 +4,7 @@
  * Defines the contract that npm packages must follow to be loadable by FrontMCP.
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import {
   isDecoratedAgentClass,
diff --git a/libs/sdk/src/esm-loader/factories/esm-record-builders.ts b/libs/sdk/src/esm-loader/factories/esm-record-builders.ts
index 89cf80bd5..3657cf1f8 100644
--- a/libs/sdk/src/esm-loader/factories/esm-record-builders.ts
+++ b/libs/sdk/src/esm-loader/factories/esm-record-builders.ts
@@ -7,7 +7,7 @@
  */
 
 import type { Type } from '@frontmcp/di';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import {
   PromptKind,
diff --git a/libs/sdk/src/job/flows/execute-job.flow.ts b/libs/sdk/src/job/flows/execute-job.flow.ts
index 4e34db847..f2d3e955f 100644
--- a/libs/sdk/src/job/flows/execute-job.flow.ts
+++ b/libs/sdk/src/job/flows/execute-job.flow.ts
@@ -1,6 +1,6 @@
 // file: libs/sdk/src/job/flows/execute-job.flow.ts
 import type { AuthoritiesContextBuilder } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import {
   Flow,
diff --git a/libs/sdk/src/job/job.instance.ts b/libs/sdk/src/job/job.instance.ts
index ea38a0ce6..92820efaf 100644
--- a/libs/sdk/src/job/job.instance.ts
+++ b/libs/sdk/src/job/job.instance.ts
@@ -1,5 +1,5 @@
 import { type Token } from '@frontmcp/di';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import {
   type EntryOwnerRef,
diff --git a/libs/sdk/src/job/tools/execute-job.tool.ts b/libs/sdk/src/job/tools/execute-job.tool.ts
index a0fade35b..1f4792f18 100644
--- a/libs/sdk/src/job/tools/execute-job.tool.ts
+++ b/libs/sdk/src/job/tools/execute-job.tool.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Tool, ToolContext } from '../../common';
 import { JobNotAuthorizedError } from '../../errors';
diff --git a/libs/sdk/src/job/tools/get-job-status.tool.ts b/libs/sdk/src/job/tools/get-job-status.tool.ts
index 00d98cb4f..0e2610629 100644
--- a/libs/sdk/src/job/tools/get-job-status.tool.ts
+++ b/libs/sdk/src/job/tools/get-job-status.tool.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Tool, ToolContext } from '../../common';
 import { resolvePrincipal } from '../../common/utils/principal.utils';
diff --git a/libs/sdk/src/job/tools/list-jobs.tool.ts b/libs/sdk/src/job/tools/list-jobs.tool.ts
index dcef6b7d4..6ecf1c65d 100644
--- a/libs/sdk/src/job/tools/list-jobs.tool.ts
+++ b/libs/sdk/src/job/tools/list-jobs.tool.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Tool, ToolContext } from '../../common';
 import { type JobEntry } from '../../common/entries/job.entry';
diff --git a/libs/sdk/src/job/tools/register-job.tool.ts b/libs/sdk/src/job/tools/register-job.tool.ts
index d235acb36..63913e672 100644
--- a/libs/sdk/src/job/tools/register-job.tool.ts
+++ b/libs/sdk/src/job/tools/register-job.tool.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Tool, ToolContext } from '../../common';
 import type { ToolInputType, ToolOutputType } from '../../common/metadata/tool.metadata';
diff --git a/libs/sdk/src/job/tools/remove-job.tool.ts b/libs/sdk/src/job/tools/remove-job.tool.ts
index b37f0ebbd..939b92089 100644
--- a/libs/sdk/src/job/tools/remove-job.tool.ts
+++ b/libs/sdk/src/job/tools/remove-job.tool.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Tool, ToolContext } from '../../common';
 import { JobNotAuthorizedError } from '../../errors';
diff --git a/libs/sdk/src/logging/flows/set-level.flow.ts b/libs/sdk/src/logging/flows/set-level.flow.ts
index d49b1fcfd..ec45da034 100644
--- a/libs/sdk/src/logging/flows/set-level.flow.ts
+++ b/libs/sdk/src/logging/flows/set-level.flow.ts
@@ -1,6 +1,6 @@
 // file: libs/sdk/src/logging/flows/set-level.flow.ts
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { EmptyResultSchema, LoggingLevelSchema, SetLevelRequestSchema } from '@frontmcp/protocol';
 
 import { Flow, FlowBase, FlowHooksOf, type FlowPlan, type FlowRunOptions } from '../../common';
diff --git a/libs/sdk/src/mcp-registry/flows/server-card.flow.ts b/libs/sdk/src/mcp-registry/flows/server-card.flow.ts
index 029548b2b..412fa20cb 100644
--- a/libs/sdk/src/mcp-registry/flows/server-card.flow.ts
+++ b/libs/sdk/src/mcp-registry/flows/server-card.flow.ts
@@ -1,6 +1,6 @@
 /** GET <entryPath>/server-card: the SEP-2127 server card of the server's own streamable-HTTP endpoint. */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { sha256Base64url } from '@frontmcp/utils';
 
 import {
diff --git a/libs/sdk/src/mcp-registry/flows/well-known.ai-catalog.flow.ts b/libs/sdk/src/mcp-registry/flows/well-known.ai-catalog.flow.ts
index fa5601893..daf6396b9 100644
--- a/libs/sdk/src/mcp-registry/flows/well-known.ai-catalog.flow.ts
+++ b/libs/sdk/src/mcp-registry/flows/well-known.ai-catalog.flow.ts
@@ -1,6 +1,6 @@
 /** GET /.well-known/ai-catalog.json at the literal root of the host: the AI Catalog listing the server card. */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import {
   enforceGlobalRateLimit,
diff --git a/libs/sdk/src/prompt/flows/get-prompt.flow.ts b/libs/sdk/src/prompt/flows/get-prompt.flow.ts
index 0c0fd3952..69af7fe04 100644
--- a/libs/sdk/src/prompt/flows/get-prompt.flow.ts
+++ b/libs/sdk/src/prompt/flows/get-prompt.flow.ts
@@ -1,7 +1,7 @@
 // file: libs/sdk/src/prompt/flows/get-prompt.flow.ts
 
 import { AuthorityDeniedError, resolveRequiredScopes } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { GetPromptRequestSchema, GetPromptResultSchema, type AuthInfo } from '@frontmcp/protocol';
 
 import { loadRemoteAppCapabilities } from '../../app/remote-capabilities.utils';
diff --git a/libs/sdk/src/prompt/flows/prompts-list.flow.ts b/libs/sdk/src/prompt/flows/prompts-list.flow.ts
index 74a40d309..294ff6df4 100644
--- a/libs/sdk/src/prompt/flows/prompts-list.flow.ts
+++ b/libs/sdk/src/prompt/flows/prompts-list.flow.ts
@@ -12,7 +12,7 @@ import {
 
 import 'reflect-metadata';
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { ListPromptsRequestSchema, ListPromptsResultSchema, type Prompt } from '@frontmcp/protocol';
 
 import { isPubliclyListed, publicAccessFor } from '../../auth/public-access.utils';
diff --git a/libs/sdk/src/resource/flows/read-resource.flow.ts b/libs/sdk/src/resource/flows/read-resource.flow.ts
index 2be7e0e98..ea6c5bb5a 100644
--- a/libs/sdk/src/resource/flows/read-resource.flow.ts
+++ b/libs/sdk/src/resource/flows/read-resource.flow.ts
@@ -1,7 +1,7 @@
 // file: libs/sdk/src/resource/flows/read-resource.flow.ts
 
 import { AuthorityDeniedError, resolveRequiredScopes } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { ReadResourceRequestSchema, ReadResourceResultSchema, type AuthInfo } from '@frontmcp/protocol';
 import { randomBytes } from '@frontmcp/utils';
 
diff --git a/libs/sdk/src/resource/flows/resource-templates-list.flow.ts b/libs/sdk/src/resource/flows/resource-templates-list.flow.ts
index 5b8510985..f8a914126 100644
--- a/libs/sdk/src/resource/flows/resource-templates-list.flow.ts
+++ b/libs/sdk/src/resource/flows/resource-templates-list.flow.ts
@@ -12,7 +12,7 @@ import {
 
 import 'reflect-metadata';
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import {
   ListResourceTemplatesRequestSchema,
   ListResourceTemplatesResultSchema,
diff --git a/libs/sdk/src/resource/flows/resources-list.flow.ts b/libs/sdk/src/resource/flows/resources-list.flow.ts
index 4145e1657..f2be5bfab 100644
--- a/libs/sdk/src/resource/flows/resources-list.flow.ts
+++ b/libs/sdk/src/resource/flows/resources-list.flow.ts
@@ -12,7 +12,7 @@ import {
 
 import 'reflect-metadata';
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { ListResourcesRequestSchema, ListResourcesResultSchema, type Resource } from '@frontmcp/protocol';
 
 import { annotationsForClient, callerClientProfile, type ClientNameSources } from '../../answer';
diff --git a/libs/sdk/src/resource/flows/subscribe-resource.flow.ts b/libs/sdk/src/resource/flows/subscribe-resource.flow.ts
index 9721a24d2..870a3c40c 100644
--- a/libs/sdk/src/resource/flows/subscribe-resource.flow.ts
+++ b/libs/sdk/src/resource/flows/subscribe-resource.flow.ts
@@ -1,6 +1,6 @@
 // file: libs/sdk/src/resource/flows/subscribe-resource.flow.ts
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { EmptyResultSchema, SubscribeRequestSchema } from '@frontmcp/protocol';
 
 import { loadRemoteAppCapabilities } from '../../app/remote-capabilities.utils';
diff --git a/libs/sdk/src/resource/flows/unsubscribe-resource.flow.ts b/libs/sdk/src/resource/flows/unsubscribe-resource.flow.ts
index 49d9e3df3..bc3cbd9b1 100644
--- a/libs/sdk/src/resource/flows/unsubscribe-resource.flow.ts
+++ b/libs/sdk/src/resource/flows/unsubscribe-resource.flow.ts
@@ -1,6 +1,6 @@
 // file: libs/sdk/src/resource/flows/unsubscribe-resource.flow.ts
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { EmptyResultSchema, UnsubscribeRequestSchema } from '@frontmcp/protocol';
 
 import { Flow, FlowBase, FlowHooksOf, type FlowPlan, type FlowRunOptions } from '../../common';
diff --git a/libs/sdk/src/scope/flows/http.request.flow.ts b/libs/sdk/src/scope/flows/http.request.flow.ts
index ce70c1790..3bb59243f 100644
--- a/libs/sdk/src/scope/flows/http.request.flow.ts
+++ b/libs/sdk/src/scope/flows/http.request.flow.ts
@@ -8,7 +8,7 @@ import {
   type TokenRefreshCallback,
 } from '@frontmcp/auth';
 import { GuardStorageUnavailableError, type GuardManager } from '@frontmcp/guard';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { randomUUID } from '@frontmcp/utils';
 
 import { sessionVerifyOutputSchema } from '../../auth/flows/session.verify.flow';
diff --git a/libs/sdk/src/skill/flows/filter-skills.flow.ts b/libs/sdk/src/skill/flows/filter-skills.flow.ts
index de451b43c..e5503e2b2 100644
--- a/libs/sdk/src/skill/flows/filter-skills.flow.ts
+++ b/libs/sdk/src/skill/flows/filter-skills.flow.ts
@@ -1,6 +1,6 @@
 // file: libs/sdk/src/skill/flows/filter-skills.flow.ts
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Flow, FlowBase, FlowHooksOf, type FlowPlan, type FlowRunOptions, type SkillEntry } from '../../common';
 import { InvalidInputError } from '../../errors';
diff --git a/libs/sdk/src/skill/flows/http/llm-full-txt.flow.ts b/libs/sdk/src/skill/flows/http/llm-full-txt.flow.ts
index 1272dc9e0..01fe1513b 100644
--- a/libs/sdk/src/skill/flows/http/llm-full-txt.flow.ts
+++ b/libs/sdk/src/skill/flows/http/llm-full-txt.flow.ts
@@ -5,7 +5,7 @@
  * Returns full skill content with instructions and tool schemas.
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import {
   enforceGlobalRateLimit,
diff --git a/libs/sdk/src/skill/flows/http/llm-txt.flow.ts b/libs/sdk/src/skill/flows/http/llm-txt.flow.ts
index 4491ed77d..6c366d7e9 100644
--- a/libs/sdk/src/skill/flows/http/llm-txt.flow.ts
+++ b/libs/sdk/src/skill/flows/http/llm-txt.flow.ts
@@ -5,7 +5,7 @@
  * Returns compact skill summaries in plain text format.
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import {
   enforceGlobalRateLimit,
diff --git a/libs/sdk/src/skill/flows/http/skills-api.flow.ts b/libs/sdk/src/skill/flows/http/skills-api.flow.ts
index 960efd1e0..fb8bf8275 100644
--- a/libs/sdk/src/skill/flows/http/skills-api.flow.ts
+++ b/libs/sdk/src/skill/flows/http/skills-api.flow.ts
@@ -5,7 +5,7 @@
  * Provides JSON API for listing, searching, and loading skills.
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import {
   enforceGlobalRateLimit,
diff --git a/libs/sdk/src/skill/flows/load-skill.flow.ts b/libs/sdk/src/skill/flows/load-skill.flow.ts
index 3750514a5..01a6e606e 100644
--- a/libs/sdk/src/skill/flows/load-skill.flow.ts
+++ b/libs/sdk/src/skill/flows/load-skill.flow.ts
@@ -1,6 +1,6 @@
 // file: libs/sdk/src/skill/flows/load-skill.flow.ts
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Flow, FlowBase, FlowHooksOf, type FlowPlan, type FlowRunOptions } from '../../common';
 import { InvalidInputError, PublicMcpError } from '../../errors';
diff --git a/libs/sdk/src/skill/flows/search-skills.flow.ts b/libs/sdk/src/skill/flows/search-skills.flow.ts
index 862e3cacc..9ac41984f 100644
--- a/libs/sdk/src/skill/flows/search-skills.flow.ts
+++ b/libs/sdk/src/skill/flows/search-skills.flow.ts
@@ -1,6 +1,6 @@
 // file: libs/sdk/src/skill/flows/search-skills.flow.ts
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Flow, FlowBase, FlowHooksOf, type FlowPlan, type FlowRunOptions } from '../../common';
 import { extractToolNames } from '../../common/metadata/skill.metadata';
diff --git a/libs/sdk/src/task/flows/tasks-cancel.flow.ts b/libs/sdk/src/task/flows/tasks-cancel.flow.ts
index d5aea1d54..fc3e8b709 100644
--- a/libs/sdk/src/task/flows/tasks-cancel.flow.ts
+++ b/libs/sdk/src/task/flows/tasks-cancel.flow.ts
@@ -10,7 +10,7 @@
  * @module task/flows/tasks-cancel.flow
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { CancelTaskRequestSchema, CancelTaskResultSchema, type AuthInfo } from '@frontmcp/protocol';
 
 import { Flow, FlowBase, FlowHooksOf, type FlowPlan, type FlowRunOptions } from '../../common';
diff --git a/libs/sdk/src/task/flows/tasks-get.flow.ts b/libs/sdk/src/task/flows/tasks-get.flow.ts
index 3f255f898..02be8a26c 100644
--- a/libs/sdk/src/task/flows/tasks-get.flow.ts
+++ b/libs/sdk/src/task/flows/tasks-get.flow.ts
@@ -7,7 +7,7 @@
  * @module task/flows/tasks-get.flow
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { GetTaskRequestSchema, GetTaskResultSchema, type AuthInfo } from '@frontmcp/protocol';
 
 import { Flow, FlowBase, FlowHooksOf, type FlowPlan, type FlowRunOptions } from '../../common';
diff --git a/libs/sdk/src/task/flows/tasks-list.flow.ts b/libs/sdk/src/task/flows/tasks-list.flow.ts
index 8047b332b..53803ce82 100644
--- a/libs/sdk/src/task/flows/tasks-list.flow.ts
+++ b/libs/sdk/src/task/flows/tasks-list.flow.ts
@@ -8,7 +8,7 @@
  * @module task/flows/tasks-list.flow
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { ListTasksRequestSchema, ListTasksResultSchema, type AuthInfo } from '@frontmcp/protocol';
 
 import { Flow, FlowBase, FlowHooksOf, type FlowPlan, type FlowRunOptions } from '../../common';
diff --git a/libs/sdk/src/task/flows/tasks-result.flow.ts b/libs/sdk/src/task/flows/tasks-result.flow.ts
index f0d7cf605..9d1040c62 100644
--- a/libs/sdk/src/task/flows/tasks-result.flow.ts
+++ b/libs/sdk/src/task/flows/tasks-result.flow.ts
@@ -14,7 +14,7 @@
  * @module task/flows/tasks-result.flow
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { GetTaskPayloadRequestSchema, GetTaskPayloadResultSchema, type AuthInfo } from '@frontmcp/protocol';
 
 import { Flow, FlowBase, FlowHooksOf, type FlowPlan, type FlowRunOptions } from '../../common';
diff --git a/libs/sdk/src/tool/flows/call-tool.flow.ts b/libs/sdk/src/tool/flows/call-tool.flow.ts
index 4c59822d8..b7f0ade75 100644
--- a/libs/sdk/src/tool/flows/call-tool.flow.ts
+++ b/libs/sdk/src/tool/flows/call-tool.flow.ts
@@ -1,7 +1,7 @@
 // tools/flows/call-tool.flow.ts
 import { AuthorityDeniedError, resolveRequiredScopes, signIncrementalAuthTicket } from '@frontmcp/auth';
 import { ExecutionTimeoutError, withTimeout, type SemaphoreTicket } from '@frontmcp/guard';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { CallToolRequestSchema, CallToolResultSchema, type AuthInfo } from '@frontmcp/protocol';
 import type { ToolResponseContent } from '@frontmcp/uipack/adapters';
 import {
diff --git a/libs/sdk/src/tool/flows/tools-list.flow.ts b/libs/sdk/src/tool/flows/tools-list.flow.ts
index 4c81aa1de..e22d1bb0f 100644
--- a/libs/sdk/src/tool/flows/tools-list.flow.ts
+++ b/libs/sdk/src/tool/flows/tools-list.flow.ts
@@ -16,7 +16,7 @@ import {
 
 import 'reflect-metadata';
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { ListToolsRequestSchema, ListToolsResultSchema, type AuthInfo } from '@frontmcp/protocol';
 import type { AdapterPlatformType as AIPlatformType } from '@frontmcp/uipack/adapters';
 import { isUIType, type UIType } from '@frontmcp/uipack/types';
diff --git a/libs/sdk/src/tool/tool.instance.ts b/libs/sdk/src/tool/tool.instance.ts
index 84bb750f1..987648fac 100644
--- a/libs/sdk/src/tool/tool.instance.ts
+++ b/libs/sdk/src/tool/tool.instance.ts
@@ -1,6 +1,6 @@
 // file: libs/sdk/src/tool/tool.instance.ts
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import type { CallToolRequest } from '@frontmcp/protocol';
 
 import {
diff --git a/libs/sdk/src/tool/tool.utils.ts b/libs/sdk/src/tool/tool.utils.ts
index 69c4d1698..95468eccd 100644
--- a/libs/sdk/src/tool/tool.utils.ts
+++ b/libs/sdk/src/tool/tool.utils.ts
@@ -1,6 +1,6 @@
 // file: libs/sdk/src/tool/tool.utils.ts
 import { depsOfClass, depsOfFunc, getMetadata, isClass, type Token, type Type } from '@frontmcp/di';
-import { hasTransform, z, ZodBigInt, ZodBoolean, ZodDate, ZodNumber, ZodString } from '@frontmcp/lazy-zod';
+import { hasTransform, internalZ as z, ZodBigInt, ZodBoolean, ZodDate, ZodNumber, ZodString } from '@frontmcp/lazy-zod';
 import {
   type AudioContent,
   type ContentBlock,
diff --git a/libs/sdk/src/transport/flows/handle.mcp-20260728.flow.ts b/libs/sdk/src/transport/flows/handle.mcp-20260728.flow.ts
index 8f5dfcf1e..971234b85 100644
--- a/libs/sdk/src/transport/flows/handle.mcp-20260728.flow.ts
+++ b/libs/sdk/src/transport/flows/handle.mcp-20260728.flow.ts
@@ -15,7 +15,7 @@
  * @see https://modelcontextprotocol.io/specification/2026-07-28/basic/transports/streamable-http
  */
 import { isAnonymousSubject } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { MCP_20260728_META, type LoggingLevel, type SubscriptionFilter } from '@frontmcp/protocol';
 import { runRequestExclusive } from '@frontmcp/utils';
 
diff --git a/libs/sdk/src/transport/flows/handle.sse.flow.ts b/libs/sdk/src/transport/flows/handle.sse.flow.ts
index a9e5d4c5f..88a63dc25 100644
--- a/libs/sdk/src/transport/flows/handle.sse.flow.ts
+++ b/libs/sdk/src/transport/flows/handle.sse.flow.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { createSessionId } from '../../auth/session/utils/session-id.utils';
 import {
diff --git a/libs/sdk/src/transport/flows/handle.stateless-http.flow.ts b/libs/sdk/src/transport/flows/handle.stateless-http.flow.ts
index a7c2a41b5..a584d0563 100644
--- a/libs/sdk/src/transport/flows/handle.stateless-http.flow.ts
+++ b/libs/sdk/src/transport/flows/handle.stateless-http.flow.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { RequestSchema } from '@frontmcp/protocol';
 
 import {
diff --git a/libs/sdk/src/transport/flows/handle.streamable-http.flow.ts b/libs/sdk/src/transport/flows/handle.streamable-http.flow.ts
index b966e1db9..f8f5aad03 100644
--- a/libs/sdk/src/transport/flows/handle.streamable-http.flow.ts
+++ b/libs/sdk/src/transport/flows/handle.streamable-http.flow.ts
@@ -1,5 +1,5 @@
 import type { StoredSession } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import { CallToolResultSchema, ElicitResultSchema, RequestSchema, type RequestId } from '@frontmcp/protocol';
 
 import { createSessionId } from '../../auth/session/utils/session-id.utils';
diff --git a/libs/sdk/src/transport/mcp-20260728/dispatcher.ts b/libs/sdk/src/transport/mcp-20260728/dispatcher.ts
index 79dd96811..b2aa8b0bf 100644
--- a/libs/sdk/src/transport/mcp-20260728/dispatcher.ts
+++ b/libs/sdk/src/transport/mcp-20260728/dispatcher.ts
@@ -8,7 +8,7 @@
  * and result decoration.
  */
 import { isAnonymousSubject } from '@frontmcp/auth';
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 import {
   MCP_20260728_ERROR_CODES,
   MCP_20260728_REMOVED_METHODS,
diff --git a/libs/sdk/src/transport/mcp-handlers/skills-mcp.types.ts b/libs/sdk/src/transport/mcp-handlers/skills-mcp.types.ts
index 7a8f5c106..7f2e03e94 100644
--- a/libs/sdk/src/transport/mcp-handlers/skills-mcp.types.ts
+++ b/libs/sdk/src/transport/mcp-handlers/skills-mcp.types.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 // ═══════════════════════════════════════════════════════════════════════════
 // Skills Search Types
diff --git a/libs/sdk/src/workflow/tools/execute-workflow.tool.ts b/libs/sdk/src/workflow/tools/execute-workflow.tool.ts
index ef141032e..222b43d89 100644
--- a/libs/sdk/src/workflow/tools/execute-workflow.tool.ts
+++ b/libs/sdk/src/workflow/tools/execute-workflow.tool.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Tool, ToolContext } from '../../common';
 import { JobNotAuthorizedError } from '../../errors';
diff --git a/libs/sdk/src/workflow/tools/get-workflow-status.tool.ts b/libs/sdk/src/workflow/tools/get-workflow-status.tool.ts
index fbfbdc93e..18014e4df 100644
--- a/libs/sdk/src/workflow/tools/get-workflow-status.tool.ts
+++ b/libs/sdk/src/workflow/tools/get-workflow-status.tool.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Tool, ToolContext } from '../../common';
 import { resolvePrincipal } from '../../common/utils/principal.utils';
diff --git a/libs/sdk/src/workflow/tools/list-workflows.tool.ts b/libs/sdk/src/workflow/tools/list-workflows.tool.ts
index bf1b30e2b..0d73a519a 100644
--- a/libs/sdk/src/workflow/tools/list-workflows.tool.ts
+++ b/libs/sdk/src/workflow/tools/list-workflows.tool.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Tool, ToolContext } from '../../common';
 import { type WorkflowEntry } from '../../common/entries/workflow.entry';
diff --git a/libs/sdk/src/workflow/tools/register-workflow.tool.ts b/libs/sdk/src/workflow/tools/register-workflow.tool.ts
index 4403bc3a4..40bf4d282 100644
--- a/libs/sdk/src/workflow/tools/register-workflow.tool.ts
+++ b/libs/sdk/src/workflow/tools/register-workflow.tool.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Tool, ToolContext } from '../../common';
 import { WorkflowKind } from '../../common/records/workflow.record';
diff --git a/libs/sdk/src/workflow/tools/remove-workflow.tool.ts b/libs/sdk/src/workflow/tools/remove-workflow.tool.ts
index f917db9ff..761386faa 100644
--- a/libs/sdk/src/workflow/tools/remove-workflow.tool.ts
+++ b/libs/sdk/src/workflow/tools/remove-workflow.tool.ts
@@ -1,4 +1,4 @@
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { Tool, ToolContext } from '../../common';
 import { JobNotAuthorizedError } from '../../errors';
diff --git a/libs/utils/src/crypto/key-persistence/schemas.ts b/libs/utils/src/crypto/key-persistence/schemas.ts
index 207eb6aa8..b9df4a873 100644
--- a/libs/utils/src/crypto/key-persistence/schemas.ts
+++ b/libs/utils/src/crypto/key-persistence/schemas.ts
@@ -4,7 +4,7 @@
  * @module @frontmcp/utils/key-persistence
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { AnyKeyData, AsymmetricKeyData, SecretKeyData } from './types';
 
diff --git a/libs/utils/src/crypto/secret-persistence/schema.ts b/libs/utils/src/crypto/secret-persistence/schema.ts
index f055b8046..838b59445 100644
--- a/libs/utils/src/crypto/secret-persistence/schema.ts
+++ b/libs/utils/src/crypto/secret-persistence/schema.ts
@@ -4,7 +4,7 @@
  * @module @frontmcp/utils/secret-persistence
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import type { SecretData, SecretValidationResult } from './types';
 
diff --git a/libs/utils/src/env/browser-runtime-context.ts b/libs/utils/src/env/browser-runtime-context.ts
index 197e67290..7a7214454 100644
--- a/libs/utils/src/env/browser-runtime-context.ts
+++ b/libs/utils/src/env/browser-runtime-context.ts
@@ -6,7 +6,7 @@
  * `os`/`provider`/`target`/`surface`).
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { getNodeEnv } from './browser-env';
 
diff --git a/libs/utils/src/env/runtime-context.ts b/libs/utils/src/env/runtime-context.ts
index 92ef7b7c0..aa966458e 100644
--- a/libs/utils/src/env/runtime-context.ts
+++ b/libs/utils/src/env/runtime-context.ts
@@ -15,7 +15,7 @@
  *   - `surface` (per-call axis: mcp / cli / agent / job / http-trigger / webmcp)
  */
 
-import { z } from '@frontmcp/lazy-zod';
+import { internalZ as z } from '@frontmcp/lazy-zod';
 
 import { getNodeEnv, isEdgeRuntime, isServerless } from '#env';