stitchkit 0.23.0 → 0.25.0

package/dist/cli.js

@@ -4,7 +4,7 @@ import {
   emitResult,
   parseCliArgs,
   pollUntilDone
-} from "./index-x8m8e7dc.js";
+} from "./index-h9d1fm0p.js";
 import"./index-0ed3bx43.js";
 import"./index-4gawbm74.js";
 import"./index-c7nyw0yt.js";

package/dist/{index-x8m8e7dc.js → index-h9d1fm0p.js}

@@ -76,13 +76,66 @@ function coerceJsonArgs(args, schema) {
 }
 
 // src/tools/flatten.ts
+import { z as z3 } from "zod";
+
+// src/tools/schema.ts
 import { z as z2 } from "zod";
+function objectShapeKeys(schema) {
+  return schema instanceof z2.ZodObject ? Object.keys(schema.shape) : [];
+}
+function keyPolicyOf(schema) {
+  return schema.def.catchall;
+}
+function rebuildObject(source, shape) {
+  return withKeyPolicy(z2.object(shape), keyPolicyOf(source));
+}
+function withKeyPolicy(object, policy) {
+  if (policy === undefined)
+    return object;
+  return object.catchall(representable(policy));
+}
+function representable(policy) {
+  if (policy instanceof z2.ZodNever || policy instanceof z2.ZodUnknown)
+    return policy;
+  if (!(policy instanceof z2.ZodType))
+    return z2.unknown();
+  try {
+    toJsonSchema(policy, "input");
+    return policy;
+  } catch {
+    return z2.unknown();
+  }
+}
+function mergeSchemas(paramsSchema, inputSchema) {
+  if (paramsSchema && !(paramsSchema instanceof z2.ZodObject)) {
+    throw new Error("Tool params schema must be a z.object()");
+  }
+  const paramsObject = paramsSchema instanceof z2.ZodObject ? paramsSchema : undefined;
+  if (!inputSchema) {
+    return paramsObject ?? z2.object({});
+  }
+  if (inputSchema instanceof z2.ZodObject) {
+    if (paramsObject) {
+      const conflicts = Object.keys(paramsObject.shape).filter((key) => (key in inputSchema.shape));
+      if (conflicts.length > 0) {
+        throw new Error(`Schema merge conflict: ${conflicts.join(", ")} appear in both params and input`);
+      }
+    }
+    return rebuildObject(inputSchema, {
+      ...paramsObject?.shape ?? {},
+      ...inputSchema.shape
+    });
+  }
+  return paramsObject ? z2.intersection(paramsObject, inputSchema) : inputSchema;
+}
+
+// src/tools/flatten.ts
 function flattenDiscriminatedUnion(union) {
   const discriminator = union.def.discriminator;
   const allDiscValues = [];
   const perKey = new Map;
   for (const opt of union.def.options) {
-    if (!(opt instanceof z2.ZodObject)) {
+    if (!(opt instanceof z3.ZodObject)) {
       throw new Error(`flattenDiscriminatedUnion: variant for discriminator '${discriminator}' is not a ZodObject`);
     }
     const discValues = stringLiteralOrEnumValues(opt.shape[discriminator]);
@@ -95,7 +148,7 @@ function flattenDiscriminatedUnion(union) {
       if (key === discriminator)
         continue;
       const entry = perKey.get(key) ?? { schemas: [], variants: [] };
-      entry.schemas.push(field instanceof z2.ZodOptional ? field.unwrap() : field);
+      entry.schemas.push(unwrapField(field));
       entry.variants.push(label);
       perKey.set(key, entry);
     }
@@ -106,23 +159,44 @@ function flattenDiscriminatedUnion(union) {
     throw new Error("flattenDiscriminatedUnion: union has no options");
   }
   const shape = {
-    [discriminator]: z2.enum([firstLiteral, ...restLiterals])
+    [discriminator]: z3.enum([firstLiteral, ...restLiterals])
   };
   for (const [key, entry] of perKey) {
     const advertised = mergeCollidingFields(entry.schemas);
     const hint = `Required if ${discriminator} = ${[...new Set(entry.variants)].join(" | ")}`;
-    shape[key] = z2.optional(advertised).describe(hint);
+    shape[key] = z3.optional(advertised).describe(hint);
+  }
+  return withKeyPolicy(z3.object(shape), mergeVariantKeyPolicies(union.def.options));
+}
+function mergeVariantKeyPolicies(options) {
+  let strict = 0;
+  let counted = 0;
+  for (const option of options) {
+    const policy = option instanceof z3.ZodObject ? keyPolicyOf(option) : undefined;
+    if (policy !== undefined && !(policy instanceof z3.ZodNever))
+      return z3.unknown();
+    counted++;
+    if (policy instanceof z3.ZodNever)
+      strict++;
+  }
+  if (counted === 0 || strict === 0)
+    return;
+  return strict === counted ? z3.never() : z3.unknown();
+}
+function unwrapField(field) {
+  if (field instanceof z3.ZodOptional || field instanceof z3.ZodDefault) {
+    return unwrapField(field.unwrap());
   }
-  return z2.object(shape);
+  return field;
 }
 function preserveDescription(from, to) {
   return from.description === undefined ? to : to.describe(from.description);
 }
 function stringLiteralOrEnumValues(field) {
   let raw = null;
-  if (field instanceof z2.ZodLiteral)
+  if (field instanceof z3.ZodLiteral)
     raw = field.def.values;
-  else if (field instanceof z2.ZodEnum)
+  else if (field instanceof z3.ZodEnum)
     raw = field.options;
   if (raw === null)
     return null;
@@ -134,7 +208,7 @@ function isFlattenableDU(union) {
   if (union.def.options.length === 0)
     return false;
   for (const opt of union.def.options) {
-    if (!(opt instanceof z2.ZodObject))
+    if (!(opt instanceof z3.ZodObject))
       return false;
     if (stringLiteralOrEnumValues(opt.shape[disc]) === null)
       return false;
@@ -156,31 +230,31 @@ function stripAnnotations(node) {
   }
 }
 function hasChecks(schema) {
-  if (!(schema instanceof z2.ZodType))
+  if (!(schema instanceof z3.ZodType))
     return false;
   const def = schema.def;
   if (isRecord(def) && Array.isArray(def.checks) && def.checks.length > 0)
     return true;
-  if (schema instanceof z2.ZodOptional || schema instanceof z2.ZodNullable || schema instanceof z2.ZodDefault) {
+  if (schema instanceof z3.ZodOptional || schema instanceof z3.ZodNullable || schema instanceof z3.ZodDefault) {
     return hasChecks(schema.unwrap());
   }
-  if (schema instanceof z2.ZodPipe)
+  if (schema instanceof z3.ZodPipe)
     return hasChecks(schema.def.in) || hasChecks(schema.def.out);
-  if (schema instanceof z2.ZodObject)
+  if (schema instanceof z3.ZodObject)
     return Object.values(schema.shape).some(hasChecks);
-  if (schema instanceof z2.ZodArray)
+  if (schema instanceof z3.ZodArray)
     return hasChecks(schema.element);
-  if (schema instanceof z2.ZodUnion)
+  if (schema instanceof z3.ZodUnion)
     return schema.def.options.some(hasChecks);
-  if (schema instanceof z2.ZodRecord)
+  if (schema instanceof z3.ZodRecord)
     return hasChecks(schema.valueType);
-  if (schema instanceof z2.ZodIntersection) {
+  if (schema instanceof z3.ZodIntersection) {
     return hasChecks(schema.def.left) || hasChecks(schema.def.right);
   }
   return false;
 }
 function normalizedJson(schema) {
-  if (!(schema instanceof z2.ZodType))
+  if (!(schema instanceof z3.ZodType))
     return "{}";
   const json = toJsonSchema(schema, "input", "any");
   stripAnnotations(json);
@@ -197,8 +271,8 @@ function mergeCollidingFields(schemas) {
   const only = values[0];
   if (values.length <= 1) {
     if (only === undefined)
-      return z2.unknown();
-    return schemas.length > 1 && hasChecks(only) ? z2.unknown() : only;
+      return z3.unknown();
+    return schemas.length > 1 && hasChecks(only) ? z3.unknown() : only;
   }
   const merged = [];
   let allEnum = true;
@@ -214,47 +288,47 @@ function mergeCollidingFields(schemas) {
     const uniq = [...new Set(merged)];
     const [first, ...rest] = uniq;
     if (first !== undefined)
-      return z2.enum([first, ...rest]);
+      return z3.enum([first, ...rest]);
   }
-  return z2.unknown();
+  return z3.unknown();
 }
 function flattenUnionsDeep(schema) {
-  if (!(schema instanceof z2.ZodType))
-    return z2.unknown();
-  if (schema instanceof z2.ZodDiscriminatedUnion) {
+  if (!(schema instanceof z3.ZodType))
+    return z3.unknown();
+  if (schema instanceof z3.ZodDiscriminatedUnion) {
     if (!isFlattenableDU(schema))
       return schema;
     return preserveDescription(schema, flattenUnionsDeep(flattenDiscriminatedUnion(schema)));
   }
-  if (schema instanceof z2.ZodObject) {
+  if (schema instanceof z3.ZodObject) {
     const shape = {};
     for (const [key, field] of Object.entries(schema.shape)) {
       shape[key] = flattenUnionsDeep(field);
     }
-    return preserveDescription(schema, z2.object(shape));
+    return preserveDescription(schema, rebuildObject(schema, shape));
   }
-  if (schema instanceof z2.ZodArray) {
-    return preserveDescription(schema, z2.array(flattenUnionsDeep(schema.element)));
+  if (schema instanceof z3.ZodArray) {
+    return preserveDescription(schema, z3.array(flattenUnionsDeep(schema.element)));
   }
-  if (schema instanceof z2.ZodUnion) {
+  if (schema instanceof z3.ZodUnion) {
     const opts = schema.def.options.map((option) => flattenUnionsDeep(option));
     const [a, b, ...rest] = opts;
-    return a && b ? preserveDescription(schema, z2.union([a, b, ...rest])) : schema;
+    return a && b ? preserveDescription(schema, z3.union([a, b, ...rest])) : schema;
   }
-  if (schema instanceof z2.ZodRecord) {
-    return preserveDescription(schema, z2.record(schema.keyType, flattenUnionsDeep(schema.valueType)));
+  if (schema instanceof z3.ZodRecord) {
+    return preserveDescription(schema, z3.record(schema.keyType, flattenUnionsDeep(schema.valueType)));
   }
-  if (schema instanceof z2.ZodOptional) {
-    return preserveDescription(schema, z2.optional(flattenUnionsDeep(schema.unwrap())));
+  if (schema instanceof z3.ZodOptional) {
+    return preserveDescription(schema, z3.optional(flattenUnionsDeep(schema.unwrap())));
   }
-  if (schema instanceof z2.ZodNullable) {
-    return preserveDescription(schema, z2.nullable(flattenUnionsDeep(schema.unwrap())));
+  if (schema instanceof z3.ZodNullable) {
+    return preserveDescription(schema, z3.nullable(flattenUnionsDeep(schema.unwrap())));
   }
-  if (schema instanceof z2.ZodDefault) {
+  if (schema instanceof z3.ZodDefault) {
     return preserveDescription(schema, flattenUnionsDeep(schema.unwrap()).default(schema.def.defaultValue));
   }
-  if (schema instanceof z2.ZodIntersection) {
-    return preserveDescription(schema, z2.intersection(flattenUnionsDeep(schema.def.left), flattenUnionsDeep(schema.def.right)));
+  if (schema instanceof z3.ZodIntersection) {
+    return preserveDescription(schema, z3.intersection(flattenUnionsDeep(schema.def.left), flattenUnionsDeep(schema.def.right)));
   }
   return schema;
 }
@@ -262,31 +336,6 @@ function flattenUnionsDeep(schema) {
 // src/tools/mount.ts
 import { z as z4 } from "zod";
 
-// src/tools/schema.ts
-import { z as z3 } from "zod";
-function objectShapeKeys(schema) {
-  return schema instanceof z3.ZodObject ? Object.keys(schema.shape) : [];
-}
-function mergeSchemas(paramsSchema, inputSchema) {
-  if (paramsSchema && !(paramsSchema instanceof z3.ZodObject)) {
-    throw new Error("Tool params schema must be a z.object()");
-  }
-  const paramsObject = paramsSchema instanceof z3.ZodObject ? paramsSchema : undefined;
-  if (!inputSchema) {
-    return paramsObject ?? z3.object({});
-  }
-  if (inputSchema instanceof z3.ZodObject) {
-    if (paramsObject) {
-      const conflicts = Object.keys(paramsObject.shape).filter((key) => (key in inputSchema.shape));
-      if (conflicts.length > 0) {
-        throw new Error(`Schema merge conflict: ${conflicts.join(", ")} appear in both params and input`);
-      }
-    }
-    return z3.object({ ...paramsObject?.shape ?? {}, ...inputSchema.shape });
-  }
-  return paramsObject ? z3.intersection(paramsObject, inputSchema) : inputSchema;
-}
-
 // src/tools/execute.ts
 function toolResultFromError(err) {
   const appErr = normalizeError(err);
@@ -421,7 +470,7 @@ function applyExtend(base, extra) {
     if (conflicts.length > 0) {
       throw new Error(`Tool extend conflict: ${conflicts.join(", ")} already declared by the contract`);
     }
-    return z4.object({ ...extra, ...base.shape });
+    return rebuildObject(base, { ...extra, ...base.shape });
   }
   return z4.intersection(z4.object(extra), base);
 }

package/dist/tools/coerce.d.ts

@@ -6,7 +6,8 @@ import { z } from 'zod';
  * Operates recursively against the schema (object fields, array items, and the
  * matching variant of a discriminated union) so a stringified value at any depth
  * is repaired, not just a top-level field. The transform touches the **arguments**
- * only — the advertised tool schema stays exactly the contract schema.
+ * only — it never rebuilds a schema, so it cannot alter what an object does with
+ * an undeclared key (→ ADR 0034).
  */
 export declare function coerceJsonArgs(args: Record<string, unknown>, schema: z.ZodType | undefined): Record<string, unknown>;
 //# sourceMappingURL=coerce.d.ts.map

package/dist/tools/coerce.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coerce.d.ts","sourceRoot":"","sources":["../../src/tools/coerce.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAoFxB;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,MAAM,EAAE,CAAC,CAAC,OAAO,GAAG,SAAS,GAC5B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGzB"}
+{"version":3,"file":"coerce.d.ts","sourceRoot":"","sources":["../../src/tools/coerce.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAoFxB;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,MAAM,EAAE,CAAC,CAAC,OAAO,GAAG,SAAS,GAC5B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGzB"}

package/dist/tools/flatten.d.ts

@@ -18,10 +18,18 @@ import { z } from 'zod';
  * 0033) **and** a superset of the original union, so a model can always produce a
  * value that passes both the transport SDK and validation.
  *
- * **Lossy and advertised-only:** the original union remains the validation schema
- * in `executeToolMethod`. `.strict()` / `.catchall()` / object-level refinements
- * on variants are dropped from the *advertised* hint (validation still enforces
- * them — see ADR 0033 on the strict-variant caveat).
+ * **Key policy is merged, not dropped.** The flat object stands in for every
+ * variant, so it takes the policy that cannot remove what any variant would have
+ * kept: every variant `.strict()` → strict (sound, because the flat shape is the
+ * union of all variant keys); any variant with a catchall → loose; otherwise
+ * plain. A *typed* catchall is never copied onto the flat object — it would
+ * reject a sibling variant's differently-typed extra key.
+ *
+ * **Still lossy:** per-variant strictness (a key legal in variant A and illegal
+ * in B) is unrepresentable in one flat object, as are object-level refinements.
+ * Those stay enforced only by the original union in `executeToolMethod`. What is
+ * *not* lossy any more is deletion — the advertised schema can no longer drop a
+ * key the contract would have seen. → ADR 0034.
  */
 export declare function flattenDiscriminatedUnion(union: z.ZodDiscriminatedUnion): z.ZodObject<z.ZodRawShape>;
 /**
@@ -30,8 +38,10 @@ export declare function flattenDiscriminatedUnion(union: z.ZodDiscriminatedUnion
  * and `optional` / `nullable` / `default` / intersection wrappers — so the
  * advertised JSON Schema carries no `oneOf` / `anyOf` at any depth. A union that
  * cannot be flattened (non-string discriminator, non-object variant) is left
- * untouched rather than crashing the mount (→ ADR 0033). Advertised-only; the
- * original schemas remain the validation schemas.
+ * untouched rather than crashing the mount (→ ADR 0033).
+ *
+ * Every object is rebuilt **with its key policy** (`rebuildObject`) — the walk
+ * changes union shape, never what an object does with an undeclared key. → ADR 0034.
  */
 export declare function flattenUnionsDeep(schema: z.core.$ZodType): z.ZodType;
 //# sourceMappingURL=flatten.d.ts.map

package/dist/tools/flatten.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flatten.d.ts","sourceRoot":"","sources":["../../src/tools/flatten.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,CAAC,CAAC,qBAAqB,GAC7B,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CA6C5B;AAmID;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,OAAO,CAkDpE"}
+{"version":3,"file":"flatten.d.ts","sourceRoot":"","sources":["../../src/tools/flatten.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,CAAC,CAAC,qBAAqB,GAC7B,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAiD5B;AAsKD;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,OAAO,CAqDpE"}

package/dist/tools/mount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../src/tools/mount.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,UAAU,EAChB,MAAM,WAAW,CAAC;AAKnB;;;;;;;GAOG;AACH,MAAM,WAAW,UAAU,CACzB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAElE,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;IAClC,qEAAqE;IACrE,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3F,uEAAuE;IACvE,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC;CAC9D;AAED,2DAA2D;AAC3D,MAAM,WAAW,aAAa;IAC5B,2CAA2C;IAC3C,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7C,+EAA+E;IAC/E,IAAI,EAAE,MAAM,CAAC;IACb,sFAAsF;IACtF,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC;IAClB,mDAAmD;IACnD,YAAY,EAAE,OAAO,CAAC;CACvB;AAkBD,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,uFAAuF;IACvF,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,SAAS,EACpB,MAAM,GAAE,kBAAuB,GAC9B,aAAa,EAAE,CAkCjB;AAED,kDAAkD;AAClD,MAAM,WAAW,gBAAgB;IAC/B,iDAAiD;IACjD,MAAM,EAAE,eAAe,CAAC;IACxB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,gDAAgD;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,qCAAqC;IACrC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,yEAAyE;IACzE,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,gEAAgE;IAChE,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,+EAA+E;IAC/E,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,gBAAgB,GACvB,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,UAAU,CAAC,CA4BhF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE;IAAE,EAAE,EAAE,KAAK,CAAA;CAAE,CAAC,EAC1C,QAAQ,CAAC,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,WAAW,GACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAazB"}
+{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../src/tools/mount.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,UAAU,EAChB,MAAM,WAAW,CAAC;AAKnB;;;;;;;GAOG;AACH,MAAM,WAAW,UAAU,CACzB,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAElE,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;IAClC,qEAAqE;IACrE,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC3F,uEAAuE;IACvE,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC;CAC9D;AAED,2DAA2D;AAC3D,MAAM,WAAW,aAAa;IAC5B,2CAA2C;IAC3C,MAAM,EAAE,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7C,+EAA+E;IAC/E,IAAI,EAAE,MAAM,CAAC;IACb,sFAAsF;IACtF,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC;IAClB,mDAAmD;IACnD,YAAY,EAAE,OAAO,CAAC;CACvB;AAyBD,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,uFAAuF;IACvF,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,SAAS,EACpB,MAAM,GAAE,kBAAuB,GAC9B,aAAa,EAAE,CAmCjB;AAED,kDAAkD;AAClD,MAAM,WAAW,gBAAgB;IAC/B,iDAAiD;IACjD,MAAM,EAAE,eAAe,CAAC;IACxB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,gDAAgD;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,qCAAqC;IACrC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,yEAAyE;IACzE,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,gEAAgE;IAChE,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,+EAA+E;IAC/E,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,gBAAgB,GACvB,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,UAAU,CAAC,CA4BhF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE;IAAE,EAAE,EAAE,KAAK,CAAA;CAAE,CAAC,EAC1C,QAAQ,CAAC,EAAE,MAAM,EACjB,SAAS,CAAC,EAAE,WAAW,GACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAazB"}

package/dist/tools/oauth-provider.d.ts

@@ -1,15 +1,25 @@
 import type { RawRoute } from '../server/types';
+/**
+ * OpenID Connect DCR `application_type` (SEP-837). A `native` client (desktop /
+ * CLI) may register an `http` loopback redirect; a `web` client may not — the
+ * mismatch is the usual cause of a `redirect_uri` rejection for CLI clients.
+ */
+export type ApplicationType = 'native' | 'web';
 /** A client as registered via DCR. Public clients (PKCE) carry no secret. */
 export interface RegisteredClient {
     clientId: string;
     redirectUris: string[];
     clientName?: string;
+    /** The `application_type` the client declared, when it declared one. */
+    applicationType?: ApplicationType;
 }
 /** Metadata posted to `/register` (RFC 7591) before a client id is assigned. */
 export interface ClientMetadata {
     redirectUris: string[];
     clientName?: string;
     tokenEndpointAuthMethod?: string;
+    /** `native` (desktop / CLI, loopback allowed) or `web` (https only). */
+    applicationType?: ApplicationType;
 }
 /** State persisted between `/authorize` and `/token`, keyed by the auth code. */
 export interface AuthCodeData {

package/dist/tools/oauth-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-provider.d.ts","sourceRoot":"","sources":["../../src/tools/oauth-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAIhD,6EAA6E;AAC7E,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,gFAAgF;AAChF,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAED,iFAAiF;AACjF,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,wFAAwF;IACxF,mBAAmB,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,2CAA2C;AAC3C,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,+EAA+E;AAC/E,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,mBAAmB;IAClC,oFAAoF;IACpF,MAAM,EAAE,MAAM,CAAC;IACf,kDAAkD;IAClD,aAAa,EAAE,MAAM,CAAC;IACtB,gEAAgE;IAChE,QAAQ,EAAE,MAAM,CAAC;IACjB,wDAAwD;IACxD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,4CAA4C;IAC5C,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,6BAA6B;IAC7B,OAAO,EAAE;QACP,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC9D,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;KACzD,CAAC;IACF,+EAA+E;IAC/E,KAAK,EAAE;QACL,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;KAClD,CAAC;IACF,uEAAuE;IACvE,aAAa,CAAC,EAAE;QACd,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;KAClD,CAAC;IAEF;;;;OAIG;IACH,aAAa,CACX,GAAG,EAAE,OAAO,EACZ,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,QAAQ,CAAC,CAAC;CAC3C;AAoED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,mBAAmB,GAAG,QAAQ,EAAE,CAkR1E"}
+{"version":3,"file":"oauth-provider.d.ts","sourceRoot":"","sources":["../../src/tools/oauth-provider.ts"],"names":[],"mappings":"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"}

package/dist/tools/schema.d.ts

@@ -1,6 +1,39 @@
 import { z } from 'zod';
 /** Keys of a Zod object schema's shape — `[]` for a non-object or absent schema. */
 export declare function objectShapeKeys(schema?: z.ZodType): string[];
+/**
+ * An object schema's own key policy — what it does with a key its shape does not
+ * declare. Zod stores it in `def.catchall`: `ZodNever` for `.strict()` (reject),
+ * `ZodUnknown` for `.loose()` / `.passthrough()` (keep), a concrete type for
+ * `.catchall(T)` (keep and validate), `undefined` for a plain object (strip).
+ */
+export type KeyPolicy = z.core.$ZodType | undefined;
+/** The key policy of an object schema. */
+export declare function keyPolicyOf(schema: z.ZodObject): KeyPolicy;
+/**
+ * Rebuild an object schema with a new shape, **carrying the source object's key
+ * policy over**.
+ *
+ * Load-bearing, not cosmetic: the advertised tool schema is not
+ * advertised-only. Both transport SDKs parse the caller's arguments *with it* and
+ * hand the handler the parsed result (MCP `validateToolInput` →
+ * `parseResult.data`; the AI SDK's `doParseToolCall` → `parseResult.value`), so
+ * an object rebuilt as a bare `z.object()` silently **deletes** every key the
+ * contract schema would have rejected (`.strict()`) or kept (`.loose()` /
+ * `.catchall()`) — the caller gets a success and never learns its argument was
+ * wrong. → ADR 0034.
+ *
+ * A plain source (`undefined` policy) needs no special case: the rebuilt object
+ * strips exactly as the contract object would have.
+ *
+ * A policy JSON Schema cannot represent (`.catchall(z.date())`) degrades to
+ * `z.unknown()`: copying it verbatim would fail the mount's JSON Schema probe and
+ * take every tool down with it, while dropping it would silently delete data.
+ * Loose keeps the invariant — nothing the contract would have kept is removed.
+ */
+export declare function rebuildObject(source: z.ZodObject, shape: Record<string, z.core.$ZodType>): z.ZodObject;
+/** Apply a key policy to a freshly built object, degrading what JSON Schema cannot carry. */
+export declare function withKeyPolicy(object: z.ZodObject<z.ZodRawShape>, policy: KeyPolicy): z.ZodObject;
 /**
  * Merge an endpoint's `params` and `input` schemas into the single schema a
  * tool advertises.
@@ -10,12 +43,21 @@ export declare function objectShapeKeys(schema?: z.ZodType): string[];
  * - A non-object `input` (a union, a discriminated union, a refined / piped
  *   schema) is kept intact and intersected with `params` when present — the
  *   transport SDK converts it natively (a discriminated union becomes a clean
- *   `oneOf`).
+ *   `oneOf`). ⚠️ Zod drops both sides' key policy when it intersects objects, so
+ *   this branch still strips (MCP rejects a non-object merged schema at mount;
+ *   the agent surface does not). → ADR 0034, "Not covered".
  *
  * The merged schema is exactly the two source schemas side by side: nothing is
  * coerced, flattened or transformed, so the schema a tool advertises is the
  * schema its arguments are validated against (`executeToolMethod` parses each
  * source schema over its own slice of the args).
+ *
+ * The merged object takes the **input** schema's key policy, never the params
+ * one. `executeToolMethod` slices the flat args by the params shape's keys and
+ * routes *everything else* into the input slice, so a params catchall can never
+ * fire (its slice is built from its own shape) while an undeclared top-level key
+ * is judged by the input schema. A params-only tool returns the params object
+ * untouched, policy included.
  */
 export declare function mergeSchemas(paramsSchema?: z.ZodType<unknown>, inputSchema?: z.ZodType<unknown>): z.ZodType;
 //# sourceMappingURL=schema.d.ts.map

package/dist/tools/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/tools/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,oFAAoF;AACpF,wBAAgB,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,GAAG,MAAM,EAAE,CAE5D;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,YAAY,CAC1B,YAAY,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EACjC,WAAW,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAC/B,CAAC,CAAC,OAAO,CA2BX"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/tools/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,oFAAoF;AACpF,wBAAgB,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,GAAG,MAAM,EAAE,CAE5D;AAED;;;;;GAKG;AACH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;AAEpD,0CAA0C;AAC1C,wBAAgB,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,SAAS,GAAG,SAAS,CAE1D;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,CAAC,CAAC,SAAS,EACnB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GACrC,CAAC,CAAC,SAAS,CAEb;AAED,6FAA6F;AAC7F,wBAAgB,aAAa,CAC3B,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,EAClC,MAAM,EAAE,SAAS,GAChB,CAAC,CAAC,SAAS,CAGb;AAcD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,YAAY,CAC1B,YAAY,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EACjC,WAAW,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAC/B,CAAC,CAAC,OAAO,CA8BX"}

package/dist/tools.d.ts

@@ -17,7 +17,7 @@ export { type DownloadToolConfig, mountDownload } from './tools/mount-download';
 export { mountUpload, type UploadToolConfig } from './tools/mount-upload';
 export { mountWait, type WaitToolConfig } from './tools/mount-wait';
 export { oauthProtectedResourceRoute, PROTECTED_RESOURCE_PATH, type ProtectedResourceConfig, protectedResourceMetadataUrl, wwwAuthenticateHeader, } from './tools/oauth-metadata';
-export { type AuthCodeData, type AuthRequest, type ClientMetadata, mountOAuthProvider, type OAuthProviderConfig, type RefreshData, type RegisteredClient, } from './tools/oauth-provider';
+export { type ApplicationType, type AuthCodeData, type AuthRequest, type ClientMetadata, mountOAuthProvider, type OAuthProviderConfig, type RefreshData, type RegisteredClient, } from './tools/oauth-provider';
 export { type ImplementRemoteOptions, implementRemote } from './tools/remote';
 export { createToolLogger, type ToolCallRecord, type ToolLoggerConfig, } from './tools/tool-logger';
 export { createToolkit, type Toolkit } from './tools/toolkit';

package/dist/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,gBAAgB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,KAAK,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxD,YAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,YAAY,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,KAAK,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EACL,cAAc,EACd,KAAK,wBAAwB,EAC7B,KAAK,cAAc,EACnB,KAAK,oBAAoB,EACzB,QAAQ,EACR,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,2BAA2B,EAC3B,kBAAkB,EAClB,KAAK,SAAS,EACd,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,kBAAkB,GACnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AAClF,OAAO,EAAE,KAAK,kBAAkB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EACL,2BAA2B,EAC3B,uBAAuB,EACvB,KAAK,uBAAuB,EAC5B,4BAA4B,EAC5B,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,kBAAkB,EAClB,KAAK,mBAAmB,EACxB,KAAK,WAAW,EAChB,KAAK,gBAAgB,GACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,KAAK,sBAAsB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EACL,gBAAgB,EAChB,KAAK,cAAc,EACnB,KAAK,gBAAgB,GACtB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,KAAK,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EACL,mBAAmB,EACnB,KAAK,eAAe,EACpB,KAAK,gBAAgB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,gBAAgB,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,KAAK,SAAS,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxD,YAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,YAAY,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,KAAK,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EACL,cAAc,EACd,KAAK,wBAAwB,EAC7B,KAAK,cAAc,EACnB,KAAK,oBAAoB,EACzB,QAAQ,EACR,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,2BAA2B,EAC3B,kBAAkB,EAClB,KAAK,SAAS,EACd,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,kBAAkB,GACnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AAClF,OAAO,EAAE,KAAK,kBAAkB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EACL,2BAA2B,EAC3B,uBAAuB,EACvB,KAAK,uBAAuB,EAC5B,4BAA4B,EAC5B,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,kBAAkB,EAClB,KAAK,mBAAmB,EACxB,KAAK,WAAW,EAChB,KAAK,gBAAgB,GACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,KAAK,sBAAsB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EACL,gBAAgB,EAChB,KAAK,cAAc,EACnB,KAAK,gBAAgB,GACtB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,KAAK,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EACL,mBAAmB,EACnB,KAAK,eAAe,EACpB,KAAK,gBAAgB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/tools.js

@@ -18,7 +18,7 @@ import {
   pollUntil,
   readCapped,
   toolResultFromError
-} from "./index-x8m8e7dc.js";
+} from "./index-h9d1fm0p.js";
 import {
   toJsonSchema
 } from "./index-0ed3bx43.js";
@@ -615,13 +615,15 @@ function json(body, status = 200, extraHeaders) {
 function oauthError(error, description, status = 400) {
   return json({ error, error_description: description }, status);
 }
-function isHttpUri(value) {
+function isRegistrableRedirectUri(value, applicationType) {
   try {
     const url = new URL(value);
     if (url.protocol === "https:")
       return true;
     if (url.protocol !== "http:")
       return false;
+    if (applicationType === "web")
+      return false;
     const host = url.hostname.replace(/^\[|\]$/g, "");
     return host === "127.0.0.1" || host === "::1" || host === "localhost";
   } catch {
@@ -655,6 +657,7 @@ function mountOAuthProvider(config) {
   const registerPath = `${base}/register`;
   const authorizePath = `${base}/authorize`;
   const tokenPath = `${base}/token`;
+  const redirectToClient = (uri, params) => redirectWith(uri, { ...params, iss: config.issuer });
   const metadataRoute = {
     method: "ALL",
     path: AS_METADATA_PATH,
@@ -670,6 +673,7 @@ function mountOAuthProvider(config) {
         grant_types_supported: config.refreshTokens ? ["authorization_code", "refresh_token"] : ["authorization_code"],
         code_challenge_methods_supported: ["S256"],
         token_endpoint_auth_methods_supported: ["none"],
+        authorization_response_iss_parameter_supported: true,
         ...config.scopesSupported && { scopes_supported: config.scopesSupported }
       });
     }
@@ -686,14 +690,20 @@ function mountOAuthProvider(config) {
       if (!isRecord(meta)) {
         return oauthError("invalid_client_metadata", "Body must be a JSON object");
       }
+      const rawAppType = meta.application_type;
+      if (rawAppType !== undefined && rawAppType !== "native" && rawAppType !== "web") {
+        return oauthError("invalid_client_metadata", "application_type must be 'native' or 'web'");
+      }
+      const applicationType = rawAppType;
       const redirectUris = meta.redirect_uris;
-      if (!Array.isArray(redirectUris) || redirectUris.length === 0 || !redirectUris.every((u) => typeof u === "string" && isHttpUri(u))) {
-        return oauthError("invalid_redirect_uri", "redirect_uris must be a non-empty array of absolute https URLs (http is allowed only on a loopback host)");
+      if (!Array.isArray(redirectUris) || redirectUris.length === 0 || !redirectUris.every((u) => typeof u === "string" && isRegistrableRedirectUri(u, applicationType))) {
+        return oauthError("invalid_redirect_uri", applicationType === "web" ? "redirect_uris must be a non-empty array of absolute https URLs (a web client cannot register an http loopback URI)" : "redirect_uris must be a non-empty array of absolute https URLs (http is allowed only on a loopback host)");
       }
       const client = await config.clients.register({
         redirectUris,
         clientName: typeof meta.client_name === "string" ? meta.client_name : undefined,
-        tokenEndpointAuthMethod: typeof meta.token_endpoint_auth_method === "string" ? meta.token_endpoint_auth_method : undefined
+        tokenEndpointAuthMethod: typeof meta.token_endpoint_auth_method === "string" ? meta.token_endpoint_auth_method : undefined,
+        ...applicationType && { applicationType }
       });
       return json({
         client_id: client.clientId,
@@ -701,7 +711,8 @@ function mountOAuthProvider(config) {
         token_endpoint_auth_method: "none",
         grant_types: config.refreshTokens ? ["authorization_code", "refresh_token"] : ["authorization_code"],
         response_types: ["code"],
-        ...client.clientName && { client_name: client.clientName }
+        ...client.clientName && { client_name: client.clientName },
+        ...client.applicationType && { application_type: client.applicationType }
       }, 201);
     }
   };
@@ -731,27 +742,27 @@ function mountOAuthProvider(config) {
         return oauthError("invalid_request", "redirect_uri does not match a registered URI");
       }
       if (responseType !== "code") {
-        return redirectWith(redirectUri, {
+        return redirectToClient(redirectUri, {
           error: "unsupported_response_type",
           ...state && { state }
         });
       }
       if (!codeChallenge || codeChallengeMethod !== "S256") {
-        return redirectWith(redirectUri, {
+        return redirectToClient(redirectUri, {
           error: "invalid_request",
           error_description: "PKCE S256 code_challenge is required",
           ...state && { state }
         });
       }
       if (!resource) {
-        return redirectWith(redirectUri, {
+        return redirectToClient(redirectUri, {
           error: "invalid_target",
           error_description: "resource parameter is required",
           ...state && { state }
         });
       }
       if (resource !== config.resource) {
-        return redirectWith(redirectUri, {
+        return redirectToClient(redirectUri, {
           error: "invalid_target",
           error_description: "resource is not served by this authorization server",
           ...state && { state }
@@ -772,7 +783,7 @@ function mountOAuthProvider(config) {
         userId: result.userId,
         expiresAt: Date.now() + AUTH_CODE_TTL_MS
       });
-      return redirectWith(redirectUri, { code, ...state && { state } });
+      return redirectToClient(redirectUri, { code, ...state && { state } });
     }
   };
   const issueAccessToken = (userId, audience, clientId, scope) => signJwt({ scope, client_id: clientId }, config.signingSecret, {

package/llms-full.txt

@@ -1303,11 +1303,23 @@ each variant's fields become optional with a `Required if <disc> = …` hint.
 It is **deep**: unions are flattened at every depth — top level, object fields,
 array items, and through `optional` / `nullable` / `default` / intersection
 wrappers — so no `oneOf` survives anywhere (e.g. a `content.parts[]` that is an
-array of a discriminated union). It is **advertised-only and lossy**: the original
-schemas stay the validation schemas in `executeToolMethod`, so requests are still
-validated against the real union. Schemas a transform cannot safely rebuild
+array of a discriminated union). Schemas a transform cannot safely rebuild
 (refined / piped / lazy / plain non-discriminated unions) are left as-is.
 
+The flattened form is **lossy but never destructive**. Lossy: per-variant
+strictness and object-level refinements are not advertised — the original schemas
+enforce them in `executeToolMethod`. Not destructive: every object keeps its own
+**key policy** (`.strict()` stays strict, `.loose()` / `.catchall()` still keep
+extra keys), because the advertised schema is not advertised-only — the MCP and
+AI SDKs parse the caller's arguments *with it* and hand the handler the parsed
+result. An object advertised without its policy would silently delete keys the
+contract would have rejected. → [ADR 0034](../decisions/0034-advertised-schema-key-policy.md).
+
+A consequence worth knowing when you read logs: a `.strict()` violation is caught
+by the SDK **before** the tool callback runs, so it comes back as an MCP
+`InvalidParams` protocol error rather than a stitchkit `VALIDATION_ERROR`
+envelope, and `beforeToolCall` / `afterToolCall` do not fire for it.
+
 ## `mountMcp`
 
 If you already run an `McpServer` from the SDK, `mountMcp` adds contract tools
@@ -1393,14 +1405,36 @@ createServer({
 })
 ```
 
-Access tokens are signed HS256 JWTs (`signJwt`) whose `aud` is the resource —
-validate them in `auth` with `verifyJwt(token, secret, { audience: resource })`.
-`authorizeUser` is where the app authenticates the user (reuse an existing
-session) and records consent; return `{ userId }` to issue a code, or a
-`Response` to redirect the browser to a login page first. The AS and resource
-server can co-locate or live on separate origins. See
+Access tokens are signed HS256 JWTs (`signJwt`) whose `aud` is the resource and
+whose `iss` is the issuer — validate both in `auth` with
+`verifyJwt(token, secret, { audience: resource, issuer })`. `authorizeUser` is
+where the app authenticates the user (reuse an existing session) and records
+consent; return `{ userId }` to issue a code, or a `Response` to redirect the
+browser to a login page first. The AS and resource server can co-locate or live
+on separate origins. See
 [ADR 0015](../decisions/0015-oauth-resource-server.md).
 
+### Authorization hardening (MCP 2026-07-28)
+
+- **`iss` on every authorization response (RFC 9207, SEP-2468).** Success *and*
+  error redirects carry `iss`, and the AS metadata advertises
+  `authorization_response_iss_parameter_supported: true`. A client that talks to
+  several authorization servers validates `iss` before redeeming the code, which
+  closes the **mix-up attack** — an attacker's server cannot pass its response
+  off as this issuer's. Additive on the wire: a client that ignores `iss` is
+  unaffected.
+- **`application_type` on registration (SEP-837).** A client may declare
+  `"native"` (desktop / CLI) or `"web"` in its DCR body. A **native** client may
+  register an `http` loopback redirect (`http://127.0.0.1:…`, RFC 8252 §7.3); a
+  **web** client is held to `https` only — that mismatch is the usual cause of
+  the `redirect_uri` rejection CLI clients hit. Omit the field and registration
+  behaves exactly as before (loopback allowed); an unknown value is rejected
+  rather than silently defaulted.
+
+> Dynamic Client Registration is **deprecated** in the 2026-07-28 spec in favour
+> of Client ID Metadata Documents (CIMD), with a ≥12-month window. DCR keeps
+> working and stays supported here; CIMD support is tracked separately.
+
 ## Proxying a remote API — `implementRemote`
 
 `implement` binds a contract to local handlers. `implementRemote` binds it to a
@@ -3470,6 +3504,7 @@ A native remote-connector auth surface for MCP — [guide](../guide/mcp-and-agen
 | `PROTECTED_RESOURCE_PATH` | const | the well-known metadata path |
 | `OAuthProviderConfig` | _type_ | config for `mountOAuthProvider` |
 | `ProtectedResourceConfig` | _type_ | config for `oauthProtectedResourceRoute` |
+| `ApplicationType` | _type_ | DCR `application_type` — `'native'` (loopback allowed) \| `'web'` (https only) |
 | `AuthCodeData` | _type_ | a stored authorization-code record |
 | `AuthRequest` | _type_ | a parsed authorization request |
 | `ClientMetadata` | _type_ | dynamic-client-registration metadata |
@@ -3506,7 +3541,7 @@ Advanced building blocks — the shared machinery the mounts are built on.
 | `TransportCounts` | _type_ | per-transport counts (`{ HTTP, MCP, AGENT, CLI }`) |
 | `coerceJsonArgs` | function | coerce JSON-stringified array/object tool arguments |
 | `flattenDiscriminatedUnion` | function | flatten one discriminated union into a single object schema |
-| `flattenUnionsDeep` | function | flatten discriminated unions at every depth (advertised schema only) |
+| `flattenUnionsDeep` | function | flatten discriminated unions at every depth — union shape only; each object keeps its own key policy (`.strict()` / `.loose()` / `.catchall()`) |
 | `MountableTool` | _type_ | one contract method resolved for mounting |
 | `ToolManifestEntry` | _type_ | one `buildToolManifest` row |
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stitchkit",
-  "version": "0.23.0",
+  "version": "0.25.0",
   "description": "Contract-first backend framework — one defineContract() into an HTTP API, MCP tools, AI-agent tools and a typed client. Bun and Node.",
   "keywords": [
     "bun",