@@ -234,6 +234,9 @@
           { "field.currency":  { "name": "moneyVal", "@required": true, "@currency": "USD" } },
           { "field.enum":      { "name": "enumVal", "@required": true, "@values": ["LOW", "MEDIUM", "HIGH"] } },
           { "field.uuid":      { "name": "uuidVal", "@required": true } },
+          { "field.uri":       { "name": "uriVal",   "@required": true } },
+          { "field.inet":      { "name": "inetVal",  "@required": true } },
+          { "field.inet":      { "name": "inet6Val", "@required": true } },
           { "field.object":    { "name": "settings", "@objectRef": "Settings", "@storage": "jsonb" } },
           { "identity.primary": { "name": "id", "@fields": "id", "@generation": "uuid" } }
         ]
 
@@ -113,6 +113,9 @@ CREATE TABLE "all_types" (
   "moneyVal" BIGINT NOT NULL,
   "enumVal" TEXT NOT NULL,
   "uuidVal" UUID NOT NULL,
+  "uriVal" TEXT NOT NULL,
+  "inetVal" INET NOT NULL,
+  "inet6Val" INET NOT NULL,
   "settings" JSONB,
   CONSTRAINT "all_types_pkey" PRIMARY KEY ("id"),
   CONSTRAINT "all_types_enumVal_chk" CHECK ("enumVal" IN ('LOW', 'MEDIUM', 'HIGH'))
 
@@ -15,7 +15,7 @@ description: |
 
     string / int / long / double / float / decimal / boolean /
     date / time / timestamp / timestamp(tz) / currency / enum / uuid /
-    object(@objectRef, jsonb storage)
+    uri / inet (IPv4 + IPv6) / object(@objectRef, jsonb storage)
 
   Tricky wire cases asserted here:
     - decimal: exact, canonical (no trailing zeros) → "123.456".
@@ -37,6 +37,15 @@ description: |
       renders the identical minimal plain-decimal string (see normalization.md).
     - object: a typed @objectRef value-object stored as JSONB → re-serialized
       with sorted keys.
+    - uri: field.uri → TEXT column; round-trips as the verbatim URI string
+      (no normalization — the port stores/returns it unchanged).
+    - inet: field.inet → Postgres-native INET column. A HOST address (no CIDR
+      prefix) round-trips WITHOUT a mask: Postgres's wire text format for inet
+      omits the /32 (IPv4) or /128 (IPv6) when no prefix was supplied on insert,
+      so the read-back equals the bare address. (NOTE: an explicit `::text` cast
+      WOULD append /32 — ports must read the inet column directly, not cast to
+      text. IPv6 also round-trips in its canonical compressed form, e.g.
+      `2001:db8::1`.)
 
 queries:
   - name: write-all-subtypes-then-read-back
@@ -59,6 +68,9 @@ queries:
       moneyVal: 199900
       enumVal: "MEDIUM"
       uuidVal: "AAAAAAAA-AAAA-4AAA-8AAA-AAAAAAAAAAAA"
+      uriVal: "https://example.com/a/b?q=1"
+      inetVal: "192.168.1.1"
+      inet6Val: "2001:db8::1"
       settings: { theme: "dark", notify: true, retries: 3 }
     expect:
       sVal: "hello"
@@ -75,6 +87,9 @@ queries:
       moneyVal: "199900"
       enumVal: "MEDIUM"
       uuidVal: "aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa"
+      uriVal: "https://example.com/a/b?q=1"
+      inetVal: "192.168.1.1"
+      inet6Val: "2001:db8::1"
       settings: { notify: true, retries: 3, theme: "dark" }
 
   - name: write-whole-second-temporal-then-read-back
@@ -95,6 +110,9 @@ queries:
       moneyVal: 0
       enumVal: "LOW"
       uuidVal: "11111111-1111-4111-8111-111111111111"
+      uriVal: "urn:isbn:0451450523"
+      inetVal: "10.0.0.5"
+      inet6Val: "fe80::1"
       settings: { theme: "light", notify: false, retries: 0 }
     expect:
       sVal: "second row"
@@ -111,6 +129,9 @@ queries:
       moneyVal: "0"
       enumVal: "LOW"
       uuidVal: "11111111-1111-4111-8111-111111111111"
+      uriVal: "urn:isbn:0451450523"
+      inetVal: "10.0.0.5"
+      inet6Val: "fe80::1"
       settings: { notify: false, retries: 0, theme: "light" }
 
   - name: write-full-int64-then-read-back
@@ -143,6 +164,11 @@ queries:
       moneyVal: "9223372036854775807"
       enumVal: "HIGH"
       uuidVal: "ffffffff-ffff-4fff-bfff-ffffffffffff"
+      uriVal: "https://example.org/path#frag"
+      inetVal: "255.255.255.255"
+      # Authored in the long (uncompressed) form; Postgres returns the canonical
+      # compressed form, so the expected read-back is `2001:db8::8a2e:370:7334`.
+      inet6Val: "2001:0db8:0000:0000:0000:8a2e:0370:7334"
       settings: { theme: "dark", notify: true, retries: 9 }
     expect:
       sVal: "int64 row"
@@ -159,4 +185,7 @@ queries:
       moneyVal: "9223372036854775807"
       enumVal: "HIGH"
       uuidVal: "ffffffff-ffff-4fff-bfff-ffffffffffff"
+      uriVal: "https://example.org/path#frag"
+      inetVal: "255.255.255.255"
+      inet6Val: "2001:db8::8a2e:370:7334"
       settings: { notify: true, retries: 9, theme: "dark" }
@@ -41,12 +41,14 @@ description: |
 seed-data: |
   INSERT INTO "all_types" (
     "id", "sVal", "iVal", "lVal", "dVal", "fVal", "decVal", "bVal",
-    "dateVal", "timeVal", "tsVal", "tsTzVal", "moneyVal", "enumVal", "uuidVal", "settings"
+    "dateVal", "timeVal", "tsVal", "tsTzVal", "moneyVal", "enumVal", "uuidVal",
+    "uriVal", "inetVal", "inet6Val", "settings"
   ) VALUES (
     '22222222-2222-4222-8222-222222222222',
     'before', 1, 1, 0.5, 0.5, 1.000000, true,
     '2020-01-01', '00:00:00', '2020-01-01T00:00:00', '2020-01-01T00:00:00Z',
     100, 'LOW', '11111111-1111-4111-8111-111111111111',
+    'urn:example:before', '10.0.0.1', 'fe80::abcd',
     '{"theme":"light","notify":false,"retries":0}'
   );
 
@@ -74,6 +76,9 @@ queries:
       moneyVal: 250000
       enumVal: "HIGH"
       uuidVal: "AAAAAAAA-AAAA-4AAA-8AAA-AAAAAAAAAAAA"
+      uriVal: "https://example.com/after?x=1"
+      inetVal: "192.168.10.20"
+      inet6Val: "2001:db8::dead:beef"
       settings: { theme: "dark", notify: true, retries: 7 }
     expect:
       id: "22222222-2222-4222-8222-222222222222"
@@ -91,6 +96,9 @@ queries:
       moneyVal: "250000"
       enumVal: "HIGH"
       uuidVal: "aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa"
+      uriVal: "https://example.com/after?x=1"
+      inetVal: "192.168.10.20"
+      inet6Val: "2001:db8::dead:beef"
       settings: { notify: true, retries: 7, theme: "dark" }
 
   - name: read-back-after-update
@@ -114,6 +122,9 @@ queries:
       moneyVal: "250000"
       enumVal: "HIGH"
       uuidVal: "aaaaaaaa-aaaa-4aaa-8aaa-aaaaaaaaaaaa"
+      uriVal: "https://example.com/after?x=1"
+      inetVal: "192.168.10.20"
+      inet6Val: "2001:db8::dead:beef"
       settings: { notify: true, retries: 7, theme: "dark" }
 
   - name: delete-by-pk
 
@@ -512,6 +512,8 @@ added without a write-round-trip is visible:
 | currency  | ✅ | ✅ | ✅ |
 | enum      | ✅ | ✅ | ✅ |
 | uuid      | ✅ | ✅ | ✅ |
+| uri       | ✅ | ✅ | ✅ |
+| inet      | ✅ | ✅ | ✅ |
 | object    | ✅ | ✅ | ✅ |
 
 - **persistence write-round-trip** = the `op: roundtrip` scenario type in
 
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Net;
 
 namespace MetaObjects.IntegrationTests.Generated;
 
@@ -45,5 +46,14 @@ public enum AllTypesEnumVal { LOW, MEDIUM, HIGH }
     public AllTypesEnumVal EnumVal { get; set; }
     [Column("uuidVal")]
     public Guid UuidVal { get; set; }
+    [Column("uriVal")]
+    [Required]
+    public Uri UriVal { get; set; } = default!;
+    [Column("inetVal")]
+    [Required]
+    public IPAddress InetVal { get; set; } = default!;
+    [Column("inet6Val")]
+    [Required]
+    public IPAddress Inet6Val { get; set; } = default!;
     public Settings? Settings { get; set; }
 }
@@ -35,6 +35,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.Entity<AllTypes>().Property(x => x.DecVal).HasPrecision(18, 6);
         modelBuilder.Entity<AllTypes>().Property(x => x.TsVal).HasColumnType("timestamp without time zone");
         modelBuilder.Entity<AllTypes>().Property(x => x.TsTzVal).HasColumnType("timestamp with time zone");
+        modelBuilder.Entity<AllTypes>().Property(x => x.UriVal).HasColumnType("text").HasConversion(v => v!.ToString(), v => new Uri(v));
+        modelBuilder.Entity<AllTypes>().Property(x => x.InetVal).HasColumnType("inet");
+        modelBuilder.Entity<AllTypes>().Property(x => x.Inet6Val).HasColumnType("inet");
         modelBuilder.Entity<Asset>().Property(x => x.RecordedAt).HasColumnType("timestamp with time zone");
         modelBuilder.Entity<Asset>().Property(x => x.ObservedAt).HasColumnType("timestamp without time zone");
         modelBuilder.Entity<Asset>().Property(x => x.ExternalId).HasColumnType("uuid").HasConversion(v => Guid.Parse(v!), g => g.ToString("D"));
 
@@ -10,6 +10,7 @@
 // column — keeping the wire form identical across read/write and across ports.
 // Scalars / temporal / Guid / enum pass straight through to Normalization.
 
+using System.Net;
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Nodes;
@@ -45,6 +46,12 @@ public static class EntityRow
         // UTC wire string + "Z"), NOT into PocoToJsonNode's reflection path.
         if (t.IsPrimitive || value is string or decimal or DateTime or DateTimeOffset or DateOnly or TimeOnly or Guid or Enum)
             return value;
+        // ADR-0036 Wave 3 — a field.uri materializes as System.Uri (EF HasConversion) and a
+        // field.inet as System.Net.IPAddress (Npgsql inet). Both are reference types, so pass
+        // them straight to Normalization (which renders the wire string) rather than into
+        // PocoToJsonNode's reflection path. IPAddress.ToString() yields the bare, compressed
+        // address — matching Postgres's inet read form (no ::text cast → no /32, /128 mask).
+        if (value is Uri or IPAddress) return value;
         // A @dbColumnType:jsonb open-bag surfaces as JsonDocument/JsonElement (issue #98) —
         // pass it through so Normalization re-serializes the parsed value with sorted keys,
         // exactly as a string-typed jsonb column does. NOT a POCO to reflect over.
 
@@ -5,6 +5,7 @@
 // scenario's `expect:` block can be authored once and validated everywhere.
 
 using System.Globalization;
+using System.Net;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 
@@ -69,6 +70,12 @@ string js when TryParseJsonContainer(js, out var node) => NormalizeJsonContainer
         // back byte-identical to the other ports' canonicalTimestamptz wire form.
         DateTimeOffset dto => FormatDateTime(dto.UtcDateTime),
         Guid uuid => uuid.ToString("D").ToLowerInvariant(),
+        // ADR-0036 Wave 3 — field.uri (System.Uri) round-trips verbatim via its absolute
+        // string; field.inet (System.Net.IPAddress) renders the bare address — IPAddress.ToString()
+        // emits no CIDR mask and the COMPRESSED IPv6 form (Postgres compresses inet on read,
+        // e.g. 2001:0db8:..:8a2e:0370:7334 → 2001:db8::8a2e:370:7334), matching the wire contract.
+        Uri uri => uri.ToString(),
+        IPAddress ip => ip.ToString(),
         byte[] bytes => Convert.ToBase64String(bytes),
         // A pre-parsed JsonNode (assembled by a runner path) — sort keys.
         // (JsonDocument/JsonElement from a @dbColumnType:jsonb column are handled above.)
 
@@ -20,6 +20,7 @@
 // caught by that scenario's per-subtype re-encode assertions.
 
 using System.Globalization;
+using System.Net;
 using System.Reflection;
 using YamlDotNet.Core;
 using YamlDotNet.RepresentationModel;
@@ -58,6 +59,11 @@ public static PropertyInfo Property(Type entity, string fieldName) =>
 
         if (underlying.IsEnum)   return Enum.Parse(underlying, raw, ignoreCase: false);
         if (underlying == typeof(Guid))    return Guid.Parse(raw);
+        // ADR-0036 Wave 3 — field.uri → System.Uri (EF's HasConversion stores v.ToString()
+        // to the text column); field.inet → System.Net.IPAddress (Npgsql binds IPAddress↔inet
+        // natively, no CIDR mask on a HOST address).
+        if (underlying == typeof(Uri))       return new Uri(raw);
+        if (underlying == typeof(IPAddress)) return IPAddress.Parse(raw);
         if (underlying == typeof(bool))    return ParseBool(raw);
         if (underlying == typeof(string))  return raw;
         if (underlying == typeof(int))     return int.Parse(raw, NumberStyles.Integer, CultureInfo.InvariantCulture);