From 65bf18a6320c305d58c63c88fe0d65b167e6dca3 Mon Sep 17 00:00:00 2001
From: Sebastian Lorenz <fubhy@fubhy.com>
Date: Wed, 5 Aug 2026 21:28:11 +0000
Subject: [PATCH 1/2] Fix mixed index signatures lose their broad constraint

---
 .../toJsonSchemaDocument.test.ts              | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/effect/test/schema/representation/toJsonSchemaDocument.test.ts b/packages/effect/test/schema/representation/toJsonSchemaDocument.test.ts
index 15d9906e5fc..33940328301 100644
--- a/packages/effect/test/schema/representation/toJsonSchemaDocument.test.ts
+++ b/packages/effect/test/schema/representation/toJsonSchemaDocument.test.ts
@@ -252,6 +252,31 @@ describe("SchemaRepresentation.toJsonSchemaDocument", () => {
         { type: "object" }
       )
     })
+
+    it("retains a broad index constraint alongside patternProperties", () => {
+      const output = compile({
+        _tag: "Objects",
+        propertySignatures: [],
+        indexSignatures: [
+          { parameter: StringRepresentation, type: NumberRepresentation },
+          {
+            parameter: {
+              _tag: "TemplateLiteral",
+              parts: [
+                { _tag: "Literal", literal: "x_", checks: [] },
+                StringRepresentation
+              ],
+              checks: []
+            },
+            type: StringRepresentation
+          }
+        ],
+        checks: []
+      })
+
+      assert.isDefined(output.patternProperties)
+      assert.isDefined(output.additionalProperties)
+    })
   })
 
   describe("unions", () => {

From 99934ba49d4779452d610eab9e3f71574c6ca1bb Mon Sep 17 00:00:00 2001
From: Tim Smart <hello@timsmart.co>
Date: Wed, 5 Aug 2026 23:29:11 +0000
Subject: [PATCH 2/2] Fix mixed JSON Schema index signatures

---
 .changeset/bright-keys-remember.md                          | 5 +++++
 packages/effect/src/internal/schema/toJsonSchemaDocument.ts | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/bright-keys-remember.md

diff --git a/.changeset/bright-keys-remember.md b/.changeset/bright-keys-remember.md
new file mode 100644
index 00000000000..3f850346770
--- /dev/null
+++ b/.changeset/bright-keys-remember.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Preserve broad index constraints when generating JSON Schema pattern properties.
diff --git a/packages/effect/src/internal/schema/toJsonSchemaDocument.ts b/packages/effect/src/internal/schema/toJsonSchemaDocument.ts
index 509439970c5..d8d6faba0a5 100644
--- a/packages/effect/src/internal/schema/toJsonSchemaDocument.ts
+++ b/packages/effect/src/internal/schema/toJsonSchemaDocument.ts
@@ -369,6 +369,7 @@ function compileJsonSchema(
         if (representation.propertySignatures.length > 0) out.properties = properties
         if (required.length > 0) out.required = required
         out.additionalProperties = options?.additionalProperties ?? false
+        let hasBroadIndexSignature = false
         const patternProperties: Record<string, JsonSchema.JsonSchema | false> = {}
         for (let index = 0; index < representation.indexSignatures.length; index++) {
           const signature = representation.indexSignatures[index]
@@ -383,6 +384,7 @@ function compileJsonSchema(
             new Set()
           )
           if (patterns.length === 0) {
+            hasBroadIndexSignature = true
             out.additionalProperties = type
           } else {
             for (const pattern of patterns) InternalRecord.assignProperty(patternProperties, pattern, type)
@@ -390,7 +392,7 @@ function compileJsonSchema(
         }
         if (Object.keys(patternProperties).length > 0) {
           out.patternProperties = patternProperties
-          delete out.additionalProperties
+          if (!hasBroadIndexSignature) delete out.additionalProperties
         }
         if (
           typeof out.additionalProperties === "object" &&