From 32a94d7f49b6e414fdf33ef48d89af836f0c6b53 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Thu, 26 Feb 2026 11:34:25 +0000
Subject: [PATCH 01/10] fix: resolve isolatedDeclarations errors (TS9021,
 TS9038)

Extract Data.TaggedClass/TaggedError/Context.Tag expressions from
extends clauses into intermediate const variables with explicit type
annotations, following the same pattern used by Effect's own
declaration output.

For Data.TaggedClass: use ReturnType<typeof Data.TaggedClass<Tag>>
For Data.TaggedError: use ReturnType<typeof Data.TaggedError<Tag>>
For Context.Tag: use Context.TagClass<Self, Id, Shape>

For computed [TypeId] properties in BotApiError classes: use
interface merging + Object.defineProperty on prototype to satisfy
both isolatedDeclarations and runtime type-checking.

Closes #31

Co-authored-by: Vladislav Deryabkin <evermake@users.noreply.github.com>
---
 src/Bot.ts             |  6 ++---
 src/BotApi.ts          |  6 ++---
 src/BotApiError.ts     | 53 +++++++++++++++++++++++++++---------------
 src/BotApiTransport.ts |  6 ++---
 src/BotApiUrl.ts       |  6 ++---
 src/Content.ts         | 39 ++++++++++++++++++++-----------
 src/Dialog.ts          | 21 +++++++++++------
 src/File.ts            |  3 ++-
 src/Markup.ts          | 12 ++++++----
 src/Send.ts            |  6 ++---
 src/Text.ts            | 12 ++++++----
 11 files changed, 102 insertions(+), 68 deletions(-)

diff --git a/src/Bot.ts b/src/Bot.ts
index 2029db5..f906906 100644
--- a/src/Bot.ts
+++ b/src/Bot.ts
@@ -4,10 +4,8 @@ import * as Context from 'effect/Context'
 
 export type Bot<E = never, R = never> = Effect.Effect<void, E, R | Update>
 
-export class Update extends Context.Tag('@grom.js/effect-tg/Bot/Update')<
-  Update,
-  BotApi.Types.Update
->() {}
+const _Update: Context.TagClass<Update, '@grom.js/effect-tg/Bot/Update', BotApi.Types.Update> = Context.Tag('@grom.js/effect-tg/Bot/Update')<Update, BotApi.Types.Update>()
+export class Update extends _Update {}
 
 export interface Middleware {
   <E, R>(self: Bot<E, R>): Bot<any, any>
diff --git a/src/BotApi.ts b/src/BotApi.ts
index 4addbe3..5f34706 100644
--- a/src/BotApi.ts
+++ b/src/BotApi.ts
@@ -19,10 +19,8 @@ import * as internal from './internal/botApi.ts'
 
 export type { MethodParams, MethodResults, Service, Types }
 
-export class BotApi extends Context.Tag('@grom.js/effect-tg/BotApi')<
-  BotApi,
-  Service
->() {}
+const _BotApi: Context.TagClass<BotApi, '@grom.js/effect-tg/BotApi', Service> = Context.Tag('@grom.js/effect-tg/BotApi')<BotApi, Service>()
+export class BotApi extends _BotApi {}
 
 export interface BotApiMethod<TMethod extends keyof MethodParams> {
   (...args: MethodArgs<TMethod>): Effect.Effect<
diff --git a/src/BotApiError.ts b/src/BotApiError.ts
index b0a0561..5887a84 100644
--- a/src/BotApiError.ts
+++ b/src/BotApiError.ts
@@ -25,13 +25,15 @@ export type BotApiError =
 /**
  * Error caused by the transport when accessing Bot API.
  */
-export class TransportError extends Data.TaggedError('TransportError')<{
+const _TransportError: ReturnType<typeof Data.TaggedError<'TransportError'>> = Data.TaggedError('TransportError')
+// eslint-disable-next-line ts/no-unsafe-declaration-merging
+export interface TransportError { readonly [TypeId]: TypeId }
+// eslint-disable-next-line ts/no-unsafe-declaration-merging
+export class TransportError extends _TransportError<{
   cause:
     | HttpClientError.HttpClientError
     | HttpBody.HttpBodyError
 }> {
-  readonly [TypeId]: TypeId = TypeId
-
   override get message(): string {
     return Match.value(this.cause).pipe(
       Match.tagsExhaustive({
@@ -47,45 +49,58 @@ export class TransportError extends Data.TaggedError('TransportError')<{
     )
   }
 }
+Object.defineProperty(TransportError.prototype, TypeId, { value: TypeId })
 
-export class MethodFailed extends Data.TaggedError('MethodFailed')<{
+const _MethodFailed: ReturnType<typeof Data.TaggedError<'MethodFailed'>> = Data.TaggedError('MethodFailed')
+// eslint-disable-next-line ts/no-unsafe-declaration-merging
+export interface MethodFailed { readonly [TypeId]: TypeId }
+// eslint-disable-next-line ts/no-unsafe-declaration-merging
+export class MethodFailed extends _MethodFailed<{
   response: FailureResponse
   possibleReason: MethodFailureReason
 }> {
-  readonly [TypeId]: TypeId = TypeId
-
-  override get message() {
+  override get message(): string {
     return `(${this.response.error_code}) ${this.response.description}`
   }
 }
+Object.defineProperty(MethodFailed.prototype, TypeId, { value: TypeId })
 
-export class GroupUpgraded extends Data.TaggedError('GroupUpgraded')<{
+const _GroupUpgraded: ReturnType<typeof Data.TaggedError<'GroupUpgraded'>> = Data.TaggedError('GroupUpgraded')
+// eslint-disable-next-line ts/no-unsafe-declaration-merging
+export interface GroupUpgraded { readonly [TypeId]: TypeId }
+// eslint-disable-next-line ts/no-unsafe-declaration-merging
+export class GroupUpgraded extends _GroupUpgraded<{
   response: FailureResponse
   supergroup: Dialog.Supergroup
 }> {
-  readonly [TypeId]: TypeId = TypeId
-
-  override get message() {
+  override get message(): string {
     return `Group has been upgraded to a supergroup with ID ${this.supergroup.id}.`
   }
 }
+Object.defineProperty(GroupUpgraded.prototype, TypeId, { value: TypeId })
 
-export class RateLimited extends Data.TaggedError('RateLimited')<{
+const _RateLimited: ReturnType<typeof Data.TaggedError<'RateLimited'>> = Data.TaggedError('RateLimited')
+// eslint-disable-next-line ts/no-unsafe-declaration-merging
+export interface RateLimited { readonly [TypeId]: TypeId }
+// eslint-disable-next-line ts/no-unsafe-declaration-merging
+export class RateLimited extends _RateLimited<{
   response: FailureResponse
   retryAfter: Duration.Duration
 }> {
-  readonly [TypeId]: TypeId = TypeId
-
-  override get message() {
+  override get message(): string {
     return `Flood limit exceeded. Should wait for ${Duration.format(this.retryAfter)} before retrying.`
   }
 }
+Object.defineProperty(RateLimited.prototype, TypeId, { value: TypeId })
 
-export class InternalServerError extends Data.TaggedError('InternalServerError')<{
+const _InternalServerError: ReturnType<typeof Data.TaggedError<'InternalServerError'>> = Data.TaggedError('InternalServerError')
+// eslint-disable-next-line ts/no-unsafe-declaration-merging
+export interface InternalServerError { readonly [TypeId]: TypeId }
+// eslint-disable-next-line ts/no-unsafe-declaration-merging
+export class InternalServerError extends _InternalServerError<{
   response: FailureResponse
-}> {
-  readonly [TypeId]: TypeId = TypeId
-}
+}> {}
+Object.defineProperty(InternalServerError.prototype, TypeId, { value: TypeId })
 
 export const fromResponse = (response: FailureResponse): BotApiError => {
   if (response.error_code === 429 && response.parameters?.retry_after != null) {
diff --git a/src/BotApiTransport.ts b/src/BotApiTransport.ts
index a1cfdae..78ba293 100644
--- a/src/BotApiTransport.ts
+++ b/src/BotApiTransport.ts
@@ -7,10 +7,8 @@ import * as Layer from 'effect/Layer'
 import * as BotApiUrl from './BotApiUrl.ts'
 import * as internal from './internal/botApiTransport.ts'
 
-export class BotApiTransport extends Context.Tag('@grom.js/effect-tg/BotApiTransport')<
-  BotApiTransport,
-  Service
->() {}
+const _BotApiTransport: Context.TagClass<BotApiTransport, '@grom.js/effect-tg/BotApiTransport', Service> = Context.Tag('@grom.js/effect-tg/BotApiTransport')<BotApiTransport, Service>()
+export class BotApiTransport extends _BotApiTransport {}
 
 export interface Service {
   sendRequest: (
diff --git a/src/BotApiUrl.ts b/src/BotApiUrl.ts
index b70297b..7aefdc2 100644
--- a/src/BotApiUrl.ts
+++ b/src/BotApiUrl.ts
@@ -1,9 +1,7 @@
 import * as Context from 'effect/Context'
 
-export class BotApiUrl extends Context.Tag('@grom.js/effect-tg/BotApiUrl')<
-  BotApiUrl,
-  Service
->() {}
+const _BotApiUrl: Context.TagClass<BotApiUrl, '@grom.js/effect-tg/BotApiUrl', Service> = Context.Tag('@grom.js/effect-tg/BotApiUrl')<BotApiUrl, Service>()
+export class BotApiUrl extends _BotApiUrl {}
 
 export interface Service {
   toMethod: (method: string) => URL
diff --git a/src/Content.ts b/src/Content.ts
index 8e5bc7d..63526d4 100644
--- a/src/Content.ts
+++ b/src/Content.ts
@@ -33,7 +33,8 @@ export type Content =
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_text.html TDLib • td_api.inputMessageText}
  * @see {@link https://core.telegram.org/bots/api#sendmessage Bot API • sendMessage}
  */
-export class Text extends Data.TaggedClass('Text')<{
+const _Text: ReturnType<typeof Data.TaggedClass<'Text'>> = Data.TaggedClass('Text')
+export class Text extends _Text<{
   text: Text_.Text
   linkPreview: Option.Option<LinkPreview.LinkPreview>
 }> {}
@@ -44,7 +45,8 @@ export class Text extends Data.TaggedClass('Text')<{
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_photo.html TDLib • td_api.inputMessagePhoto}
  * @see {@link https://core.telegram.org/bots/api#sendphoto Bot API • sendPhoto}
  */
-export class Photo extends Data.TaggedClass('Photo')<{
+const _Photo: ReturnType<typeof Data.TaggedClass<'Photo'>> = Data.TaggedClass('Photo')
+export class Photo extends _Photo<{
   file: File.FileId | File.External | File.InputFile
   caption: Option.Option<Text_.Text>
   layout: 'caption-above' | 'caption-below'
@@ -57,7 +59,8 @@ export class Photo extends Data.TaggedClass('Photo')<{
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_audio.html TDLib • td_api.inputMessageAudio}
  * @see {@link https://core.telegram.org/bots/api#sendaudio Bot API • sendAudio}
  */
-export class Audio extends Data.TaggedClass('Audio')<{
+const _Audio: ReturnType<typeof Data.TaggedClass<'Audio'>> = Data.TaggedClass('Audio')
+export class Audio extends _Audio<{
   file: File.FileId | File.External | File.InputFile
   caption: Option.Option<Text_.Text>
   duration: Option.Option<Duration.Duration>
@@ -72,7 +75,8 @@ export class Audio extends Data.TaggedClass('Audio')<{
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_document.html TDLib • td_api.inputMessageDocument}
  * @see {@link https://core.telegram.org/bots/api#senddocument Bot API • sendDocument}
  */
-export class Document extends Data.TaggedClass('Document')<{
+const _Document: ReturnType<typeof Data.TaggedClass<'Document'>> = Data.TaggedClass('Document')
+export class Document extends _Document<{
   file: File.FileId | File.External | File.InputFile
   caption: Option.Option<Text_.Text>
   thumbnail: Option.Option<File.InputFile>
@@ -85,7 +89,8 @@ export class Document extends Data.TaggedClass('Document')<{
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_video.html TDLib • td_api.inputMessageVideo}
  * @see {@link https://core.telegram.org/bots/api#sendvideo Bot API • sendVideo}
  */
-export class Video extends Data.TaggedClass('Video')<{
+const _Video: ReturnType<typeof Data.TaggedClass<'Video'>> = Data.TaggedClass('Video')
+export class Video extends _Video<{
   file: File.FileId | File.External | File.InputFile
   caption: Option.Option<Text_.Text>
   layout: 'caption-above' | 'caption-below'
@@ -105,7 +110,8 @@ export class Video extends Data.TaggedClass('Video')<{
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_animation.html TDLib • td_api.inputMessageAnimation}
  * @see {@link https://core.telegram.org/bots/api#sendanimation Bot API • sendAnimation}
  */
-export class Animation extends Data.TaggedClass('Animation')<{
+const _Animation: ReturnType<typeof Data.TaggedClass<'Animation'>> = Data.TaggedClass('Animation')
+export class Animation extends _Animation<{
   file: File.FileId | File.External | File.InputFile
   caption: Option.Option<Text_.Text>
   layout: 'caption-above' | 'caption-below'
@@ -122,7 +128,8 @@ export class Animation extends Data.TaggedClass('Animation')<{
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_voice_note.html TDLib • td_api.inputMessageVoiceNote}
  * @see {@link https://core.telegram.org/bots/api#sendvoice Bot API • sendVoice}
  */
-export class Voice extends Data.TaggedClass('Voice')<{
+const _Voice: ReturnType<typeof Data.TaggedClass<'Voice'>> = Data.TaggedClass('Voice')
+export class Voice extends _Voice<{
   file: File.FileId | File.External | File.InputFile
   caption: Option.Option<Text_.Text>
   duration: Option.Option<Duration.Duration>
@@ -134,7 +141,8 @@ export class Voice extends Data.TaggedClass('Voice')<{
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_video_note.html TDLib • td_api.inputMessageVideoNote}
  * @see {@link https://core.telegram.org/bots/api#sendvideonote Bot API • sendVideoNote}
  */
-export class VideoNote extends Data.TaggedClass('VideoNote')<{
+const _VideoNote: ReturnType<typeof Data.TaggedClass<'VideoNote'>> = Data.TaggedClass('VideoNote')
+export class VideoNote extends _VideoNote<{
   file: File.FileId | File.InputFile
   duration: Option.Option<Duration.Duration>
   diameter: Option.Option<number>
@@ -147,7 +155,8 @@ export class VideoNote extends Data.TaggedClass('VideoNote')<{
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_location.html TDLib • td_api.inputMessageLocation}
  * @see {@link https://core.telegram.org/bots/api#sendlocation Bot API • sendLocation}
  */
-export class Location extends Data.TaggedClass('Location')<{
+const _Location: ReturnType<typeof Data.TaggedClass<'Location'>> = Data.TaggedClass('Location')
+export class Location extends _Location<{
   latitude: number
   longitude: number
   uncertaintyRadius: Option.Option<number>
@@ -162,7 +171,8 @@ export class Location extends Data.TaggedClass('Location')<{
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_venue.html TDLib • td_api.inputMessageVenue}
  * @see {@link https://core.telegram.org/bots/api#sendvenue Bot API • sendVenue}
  */
-export class Venue extends Data.TaggedClass('Venue')<{
+const _Venue: ReturnType<typeof Data.TaggedClass<'Venue'>> = Data.TaggedClass('Venue')
+export class Venue extends _Venue<{
   latitude: number
   longitude: number
   title: string
@@ -179,7 +189,8 @@ export class Venue extends Data.TaggedClass('Venue')<{
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_contact.html TDLib • td_api.inputMessageContact}
  * @see {@link https://core.telegram.org/bots/api#sendcontact Bot API • sendContact}
  */
-export class Contact extends Data.TaggedClass('Contact')<{
+const _Contact: ReturnType<typeof Data.TaggedClass<'Contact'>> = Data.TaggedClass('Contact')
+export class Contact extends _Contact<{
   phoneNumber: string
   firstName: string
   lastName: Option.Option<string>
@@ -192,7 +203,8 @@ export class Contact extends Data.TaggedClass('Contact')<{
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_dice.html TDLib • td_api.inputMessageDice}
  * @see {@link https://core.telegram.org/bots/api#senddice Bot API • sendDice}
  */
-export class Dice extends Data.TaggedClass('Dice')<{
+const _Dice: ReturnType<typeof Data.TaggedClass<'Dice'>> = Data.TaggedClass('Dice')
+export class Dice extends _Dice<{
   emoji: '🎲' | '🎯' | '🏀' | '⚽' | '🎳' | '🎰'
 }> {}
 
@@ -202,7 +214,8 @@ export class Dice extends Data.TaggedClass('Dice')<{
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_sticker.html TDLib • td_api.inputMessageSticker}
  * @see {@link https://core.telegram.org/bots/api#sendsticker Bot API • sendSticker}
  */
-export class Sticker extends Data.TaggedClass('Sticker')<{
+const _Sticker: ReturnType<typeof Data.TaggedClass<'Sticker'>> = Data.TaggedClass('Sticker')
+export class Sticker extends _Sticker<{
   file: File.FileId | File.External | File.InputFile
   emoji: Option.Option<string>
 }> {}
diff --git a/src/Dialog.ts b/src/Dialog.ts
index 48b3d52..868d2c4 100644
--- a/src/Dialog.ts
+++ b/src/Dialog.ts
@@ -14,17 +14,20 @@ export type Dialog =
   | ForumTopic
   | ChannelDm
 
-export class PrivateTopic extends Data.TaggedClass('PrivateTopic')<{
+const _PrivateTopic: ReturnType<typeof Data.TaggedClass<'PrivateTopic'>> = Data.TaggedClass('PrivateTopic')
+export class PrivateTopic extends _PrivateTopic<{
   user: User
   topicId: number
 }> {}
 
-export class ForumTopic extends Data.TaggedClass('ForumTopic')<{
+const _ForumTopic: ReturnType<typeof Data.TaggedClass<'ForumTopic'>> = Data.TaggedClass('ForumTopic')
+export class ForumTopic extends _ForumTopic<{
   supergroup: Supergroup
   topicId: number
 }> {}
 
-export class ChannelDm extends Data.TaggedClass('ChannelDm')<{
+const _ChannelDm: ReturnType<typeof Data.TaggedClass<'ChannelDm'>> = Data.TaggedClass('ChannelDm')
+export class ChannelDm extends _ChannelDm<{
   channel: Channel
   topicId: number
 }> {}
@@ -39,7 +42,8 @@ export type Peer =
   | Channel
   | Supergroup
 
-export class User extends Data.TaggedClass('User')<{
+const _User: ReturnType<typeof Data.TaggedClass<'User'>> = Data.TaggedClass('User')
+export class User extends _User<{
   id: UserId
 }> {
   public dialogId(): DialogId {
@@ -51,7 +55,8 @@ export class User extends Data.TaggedClass('User')<{
   }
 }
 
-export class Group extends Data.TaggedClass('Group')<{
+const _Group: ReturnType<typeof Data.TaggedClass<'Group'>> = Data.TaggedClass('Group')
+export class Group extends _Group<{
   id: GroupId
 }> {
   public dialogId(): DialogId {
@@ -59,7 +64,8 @@ export class Group extends Data.TaggedClass('Group')<{
   }
 }
 
-export class Channel extends Data.TaggedClass('Channel')<{
+const _Channel: ReturnType<typeof Data.TaggedClass<'Channel'>> = Data.TaggedClass('Channel')
+export class Channel extends _Channel<{
   id: ChannelId
 }> {
   public dialogId(): DialogId {
@@ -71,7 +77,8 @@ export class Channel extends Data.TaggedClass('Channel')<{
   }
 }
 
-export class Supergroup extends Data.TaggedClass('Supergroup')<{
+const _Supergroup: ReturnType<typeof Data.TaggedClass<'Supergroup'>> = Data.TaggedClass('Supergroup')
+export class Supergroup extends _Supergroup<{
   id: SupergroupId
 }> {
   public dialogId(): DialogId {
diff --git a/src/File.ts b/src/File.ts
index 1332757..78bb082 100644
--- a/src/File.ts
+++ b/src/File.ts
@@ -16,7 +16,8 @@ export const FileId: Brand.Brand.Constructor<FileId> = Brand.nominal<FileId>()
 export type External = URL & Brand.Brand<'External'>
 export const External: Brand.Brand.Constructor<External> = Brand.nominal<External>()
 
-export class InputFile extends Data.TaggedClass('InputFile')<{
+const _InputFile: ReturnType<typeof Data.TaggedClass<'InputFile'>> = Data.TaggedClass('InputFile')
+export class InputFile extends _InputFile<{
   stream: Stream.Stream<Uint8Array>
   filename: string
   mimeType?: string
diff --git a/src/Markup.ts b/src/Markup.ts
index dc04d9a..dcb8114 100644
--- a/src/Markup.ts
+++ b/src/Markup.ts
@@ -14,11 +14,13 @@ export type Markup =
   | ReplyKeyboardRemove
   | ForceReply
 
-export class InlineKeyboard extends Data.TaggedClass('InlineKeyboard')<{
+const _InlineKeyboard: ReturnType<typeof Data.TaggedClass<'InlineKeyboard'>> = Data.TaggedClass('InlineKeyboard')
+export class InlineKeyboard extends _InlineKeyboard<{
   readonly rows: ReadonlyArray<ReadonlyArray<InlineButton>>
 }> {}
 
-export class ReplyKeyboard extends Data.TaggedClass('ReplyKeyboard')<{
+const _ReplyKeyboard: ReturnType<typeof Data.TaggedClass<'ReplyKeyboard'>> = Data.TaggedClass('ReplyKeyboard')
+export class ReplyKeyboard extends _ReplyKeyboard<{
   readonly rows: ReadonlyArray<ReadonlyArray<ReplyButton>>
   readonly persistent: boolean
   readonly resizable: boolean
@@ -27,11 +29,13 @@ export class ReplyKeyboard extends Data.TaggedClass('ReplyKeyboard')<{
   readonly inputPlaceholder: Option.Option<string>
 }> {}
 
-export class ReplyKeyboardRemove extends Data.TaggedClass('ReplyKeyboardRemove')<{
+const _ReplyKeyboardRemove: ReturnType<typeof Data.TaggedClass<'ReplyKeyboardRemove'>> = Data.TaggedClass('ReplyKeyboardRemove')
+export class ReplyKeyboardRemove extends _ReplyKeyboardRemove<{
   readonly selective: boolean
 }> {}
 
-export class ForceReply extends Data.TaggedClass('ForceReply')<{
+const _ForceReply: ReturnType<typeof Data.TaggedClass<'ForceReply'>> = Data.TaggedClass('ForceReply')
+export class ForceReply extends _ForceReply<{
   readonly selective: boolean
   readonly inputPlaceholder: Option.Option<string>
 }> {}
diff --git a/src/Send.ts b/src/Send.ts
index 0a5f04a..aebcec3 100644
--- a/src/Send.ts
+++ b/src/Send.ts
@@ -116,10 +116,8 @@ export const message = (content: Content.Content, params?: {
 /**
  * Target dialog for sending messages.
  */
-export class TargetDialog extends Context.Tag('@grom.js/effect-tg/Send/TargetDialog')<
-  TargetDialog,
-  Dialog.Dialog | Dialog.DialogId
->() {}
+const _TargetDialog: Context.TagClass<TargetDialog, '@grom.js/effect-tg/Send/TargetDialog', Dialog.Dialog | Dialog.DialogId> = Context.Tag('@grom.js/effect-tg/Send/TargetDialog')<TargetDialog, Dialog.Dialog | Dialog.DialogId>()
+export class TargetDialog extends _TargetDialog {}
 
 /**
  * Provides the target dialog for sending messages.
diff --git a/src/Text.ts b/src/Text.ts
index 02a5dd3..0e79d06 100644
--- a/src/Text.ts
+++ b/src/Text.ts
@@ -11,20 +11,24 @@ export type Text =
   | Markdown
   | Tgx
 
-export class Plain extends Data.TaggedClass('Plain')<{
+const _Plain: ReturnType<typeof Data.TaggedClass<'Plain'>> = Data.TaggedClass('Plain')
+export class Plain extends _Plain<{
   text: string
   entities?: Array<Types.MessageEntity>
 }> {}
 
-export class Html extends Data.TaggedClass('Html')<{
+const _Html: ReturnType<typeof Data.TaggedClass<'Html'>> = Data.TaggedClass('Html')
+export class Html extends _Html<{
   html: string
 }> {}
 
-export class Markdown extends Data.TaggedClass('Markdown')<{
+const _Markdown: ReturnType<typeof Data.TaggedClass<'Markdown'>> = Data.TaggedClass('Markdown')
+export class Markdown extends _Markdown<{
   markdown: string
 }> {}
 
-export class Tgx extends Data.TaggedClass('Tgx')<{
+const _Tgx: ReturnType<typeof Data.TaggedClass<'Tgx'>> = Data.TaggedClass('Tgx')
+export class Tgx extends _Tgx<{
   tgx: TgxElement
 }> {}
 

From 302d55b1a1e1cd4fc50e5426339bc47f7e0a8c44 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Thu, 26 Feb 2026 11:57:12 +0000
Subject: [PATCH 02/10] refactor: use Effect-style patterns for
 isolatedDeclarations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace class-based patterns with idiomatic Effect alternatives:

- Data.TaggedClass → interface + Data.tagged (Content, Dialog, File,
  Markup, Text modules)
- Context.Tag class → Context.GenericTag (Bot, BotApi, BotApiTransport,
  BotApiUrl, Send modules)
- Data.TaggedError classes use _base naming convention matching
  Effect's own declaration output (BotApiError)

Additional changes:
- Dialog peer methods (dialogId, topic, directMessages) converted to
  standalone functions following Effect's functional style
- File.isInputFile guard replaces instanceof checks
- Constructor calls changed from new Foo({}) to Foo({})

Co-authored-by: Vladislav Deryabkin <evermake@users.noreply.github.com>
---
 src/Bot.ts                      |   4 +-
 src/BotApi.ts                   |   4 +-
 src/BotApiError.ts              |  20 +--
 src/BotApiTransport.ts          |   4 +-
 src/BotApiUrl.ts                |   4 +-
 src/Content.ts                  | 271 +++++++++++++++-----------------
 src/Dialog.ts                   | 111 ++++++-------
 src/File.ts                     |  16 +-
 src/Markup.ts                   |  36 +++--
 src/Send.ts                     |  20 +--
 src/Text.ts                     |  52 +++---
 src/internal/botApiTransport.ts |   4 +-
 src/internal/dialog.ts          |  14 +-
 src/internal/send.ts            |  18 +--
 14 files changed, 285 insertions(+), 293 deletions(-)

diff --git a/src/Bot.ts b/src/Bot.ts
index f906906..bc9c74e 100644
--- a/src/Bot.ts
+++ b/src/Bot.ts
@@ -4,8 +4,8 @@ import * as Context from 'effect/Context'
 
 export type Bot<E = never, R = never> = Effect.Effect<void, E, R | Update>
 
-const _Update: Context.TagClass<Update, '@grom.js/effect-tg/Bot/Update', BotApi.Types.Update> = Context.Tag('@grom.js/effect-tg/Bot/Update')<Update, BotApi.Types.Update>()
-export class Update extends _Update {}
+export interface Update { readonly _: unique symbol }
+export const Update: Context.Tag<Update, BotApi.Types.Update> = Context.GenericTag<Update, BotApi.Types.Update>('@grom.js/effect-tg/Bot/Update')
 
 export interface Middleware {
   <E, R>(self: Bot<E, R>): Bot<any, any>
diff --git a/src/BotApi.ts b/src/BotApi.ts
index 5f34706..e189a1a 100644
--- a/src/BotApi.ts
+++ b/src/BotApi.ts
@@ -19,8 +19,8 @@ import * as internal from './internal/botApi.ts'
 
 export type { MethodParams, MethodResults, Service, Types }
 
-const _BotApi: Context.TagClass<BotApi, '@grom.js/effect-tg/BotApi', Service> = Context.Tag('@grom.js/effect-tg/BotApi')<BotApi, Service>()
-export class BotApi extends _BotApi {}
+export interface BotApi { readonly _: unique symbol }
+export const BotApi: Context.Tag<BotApi, Service> = Context.GenericTag<BotApi, Service>('@grom.js/effect-tg/BotApi')
 
 export interface BotApiMethod<TMethod extends keyof MethodParams> {
   (...args: MethodArgs<TMethod>): Effect.Effect<
diff --git a/src/BotApiError.ts b/src/BotApiError.ts
index 5887a84..25cb291 100644
--- a/src/BotApiError.ts
+++ b/src/BotApiError.ts
@@ -25,11 +25,11 @@ export type BotApiError =
 /**
  * Error caused by the transport when accessing Bot API.
  */
-const _TransportError: ReturnType<typeof Data.TaggedError<'TransportError'>> = Data.TaggedError('TransportError')
+const TransportError_base: ReturnType<typeof Data.TaggedError<'TransportError'>> = Data.TaggedError('TransportError')
 // eslint-disable-next-line ts/no-unsafe-declaration-merging
 export interface TransportError { readonly [TypeId]: TypeId }
 // eslint-disable-next-line ts/no-unsafe-declaration-merging
-export class TransportError extends _TransportError<{
+export class TransportError extends TransportError_base<{
   cause:
     | HttpClientError.HttpClientError
     | HttpBody.HttpBodyError
@@ -51,11 +51,11 @@ export class TransportError extends _TransportError<{
 }
 Object.defineProperty(TransportError.prototype, TypeId, { value: TypeId })
 
-const _MethodFailed: ReturnType<typeof Data.TaggedError<'MethodFailed'>> = Data.TaggedError('MethodFailed')
+const MethodFailed_base: ReturnType<typeof Data.TaggedError<'MethodFailed'>> = Data.TaggedError('MethodFailed')
 // eslint-disable-next-line ts/no-unsafe-declaration-merging
 export interface MethodFailed { readonly [TypeId]: TypeId }
 // eslint-disable-next-line ts/no-unsafe-declaration-merging
-export class MethodFailed extends _MethodFailed<{
+export class MethodFailed extends MethodFailed_base<{
   response: FailureResponse
   possibleReason: MethodFailureReason
 }> {
@@ -65,11 +65,11 @@ export class MethodFailed extends _MethodFailed<{
 }
 Object.defineProperty(MethodFailed.prototype, TypeId, { value: TypeId })
 
-const _GroupUpgraded: ReturnType<typeof Data.TaggedError<'GroupUpgraded'>> = Data.TaggedError('GroupUpgraded')
+const GroupUpgraded_base: ReturnType<typeof Data.TaggedError<'GroupUpgraded'>> = Data.TaggedError('GroupUpgraded')
 // eslint-disable-next-line ts/no-unsafe-declaration-merging
 export interface GroupUpgraded { readonly [TypeId]: TypeId }
 // eslint-disable-next-line ts/no-unsafe-declaration-merging
-export class GroupUpgraded extends _GroupUpgraded<{
+export class GroupUpgraded extends GroupUpgraded_base<{
   response: FailureResponse
   supergroup: Dialog.Supergroup
 }> {
@@ -79,11 +79,11 @@ export class GroupUpgraded extends _GroupUpgraded<{
 }
 Object.defineProperty(GroupUpgraded.prototype, TypeId, { value: TypeId })
 
-const _RateLimited: ReturnType<typeof Data.TaggedError<'RateLimited'>> = Data.TaggedError('RateLimited')
+const RateLimited_base: ReturnType<typeof Data.TaggedError<'RateLimited'>> = Data.TaggedError('RateLimited')
 // eslint-disable-next-line ts/no-unsafe-declaration-merging
 export interface RateLimited { readonly [TypeId]: TypeId }
 // eslint-disable-next-line ts/no-unsafe-declaration-merging
-export class RateLimited extends _RateLimited<{
+export class RateLimited extends RateLimited_base<{
   response: FailureResponse
   retryAfter: Duration.Duration
 }> {
@@ -93,11 +93,11 @@ export class RateLimited extends _RateLimited<{
 }
 Object.defineProperty(RateLimited.prototype, TypeId, { value: TypeId })
 
-const _InternalServerError: ReturnType<typeof Data.TaggedError<'InternalServerError'>> = Data.TaggedError('InternalServerError')
+const InternalServerError_base: ReturnType<typeof Data.TaggedError<'InternalServerError'>> = Data.TaggedError('InternalServerError')
 // eslint-disable-next-line ts/no-unsafe-declaration-merging
 export interface InternalServerError { readonly [TypeId]: TypeId }
 // eslint-disable-next-line ts/no-unsafe-declaration-merging
-export class InternalServerError extends _InternalServerError<{
+export class InternalServerError extends InternalServerError_base<{
   response: FailureResponse
 }> {}
 Object.defineProperty(InternalServerError.prototype, TypeId, { value: TypeId })
diff --git a/src/BotApiTransport.ts b/src/BotApiTransport.ts
index 78ba293..53af030 100644
--- a/src/BotApiTransport.ts
+++ b/src/BotApiTransport.ts
@@ -7,8 +7,8 @@ import * as Layer from 'effect/Layer'
 import * as BotApiUrl from './BotApiUrl.ts'
 import * as internal from './internal/botApiTransport.ts'
 
-const _BotApiTransport: Context.TagClass<BotApiTransport, '@grom.js/effect-tg/BotApiTransport', Service> = Context.Tag('@grom.js/effect-tg/BotApiTransport')<BotApiTransport, Service>()
-export class BotApiTransport extends _BotApiTransport {}
+export interface BotApiTransport { readonly _: unique symbol }
+export const BotApiTransport: Context.Tag<BotApiTransport, Service> = Context.GenericTag<BotApiTransport, Service>('@grom.js/effect-tg/BotApiTransport')
 
 export interface Service {
   sendRequest: (
diff --git a/src/BotApiUrl.ts b/src/BotApiUrl.ts
index 7aefdc2..9e4d766 100644
--- a/src/BotApiUrl.ts
+++ b/src/BotApiUrl.ts
@@ -1,7 +1,7 @@
 import * as Context from 'effect/Context'
 
-const _BotApiUrl: Context.TagClass<BotApiUrl, '@grom.js/effect-tg/BotApiUrl', Service> = Context.Tag('@grom.js/effect-tg/BotApiUrl')<BotApiUrl, Service>()
-export class BotApiUrl extends _BotApiUrl {}
+export interface BotApiUrl { readonly _: unique symbol }
+export const BotApiUrl: Context.Tag<BotApiUrl, Service> = Context.GenericTag<BotApiUrl, Service>('@grom.js/effect-tg/BotApiUrl')
 
 export interface Service {
   toMethod: (method: string) => URL
diff --git a/src/Content.ts b/src/Content.ts
index 63526d4..c22dd38 100644
--- a/src/Content.ts
+++ b/src/Content.ts
@@ -28,197 +28,184 @@ export type Content =
   | Sticker
 
 /**
- * Content of a text message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_text.html TDLib • td_api.inputMessageText}
  * @see {@link https://core.telegram.org/bots/api#sendmessage Bot API • sendMessage}
  */
-const _Text: ReturnType<typeof Data.TaggedClass<'Text'>> = Data.TaggedClass('Text')
-export class Text extends _Text<{
-  text: Text_.Text
-  linkPreview: Option.Option<LinkPreview.LinkPreview>
-}> {}
+export interface Text {
+  readonly _tag: 'Text'
+  readonly text: Text_.Text
+  readonly linkPreview: Option.Option<LinkPreview.LinkPreview>
+}
+export const Text: Data.Case.Constructor<Text, '_tag'> = Data.tagged<Text>('Text')
 
 /**
- * Content of a photo message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_photo.html TDLib • td_api.inputMessagePhoto}
  * @see {@link https://core.telegram.org/bots/api#sendphoto Bot API • sendPhoto}
  */
-const _Photo: ReturnType<typeof Data.TaggedClass<'Photo'>> = Data.TaggedClass('Photo')
-export class Photo extends _Photo<{
-  file: File.FileId | File.External | File.InputFile
-  caption: Option.Option<Text_.Text>
-  layout: 'caption-above' | 'caption-below'
-  spoiler: boolean
-}> {}
+export interface Photo {
+  readonly _tag: 'Photo'
+  readonly file: File.FileId | File.External | File.InputFile
+  readonly caption: Option.Option<Text_.Text>
+  readonly layout: 'caption-above' | 'caption-below'
+  readonly spoiler: boolean
+}
+export const Photo: Data.Case.Constructor<Photo, '_tag'> = Data.tagged<Photo>('Photo')
 
 /**
- * Content of an audio message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_audio.html TDLib • td_api.inputMessageAudio}
  * @see {@link https://core.telegram.org/bots/api#sendaudio Bot API • sendAudio}
  */
-const _Audio: ReturnType<typeof Data.TaggedClass<'Audio'>> = Data.TaggedClass('Audio')
-export class Audio extends _Audio<{
-  file: File.FileId | File.External | File.InputFile
-  caption: Option.Option<Text_.Text>
-  duration: Option.Option<Duration.Duration>
-  performer: Option.Option<string>
-  title: Option.Option<string>
-  thumbnail: Option.Option<File.InputFile>
-}> {}
+export interface Audio {
+  readonly _tag: 'Audio'
+  readonly file: File.FileId | File.External | File.InputFile
+  readonly caption: Option.Option<Text_.Text>
+  readonly duration: Option.Option<Duration.Duration>
+  readonly performer: Option.Option<string>
+  readonly title: Option.Option<string>
+  readonly thumbnail: Option.Option<File.InputFile>
+}
+export const Audio: Data.Case.Constructor<Audio, '_tag'> = Data.tagged<Audio>('Audio')
 
 /**
- * Content of a document message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_document.html TDLib • td_api.inputMessageDocument}
  * @see {@link https://core.telegram.org/bots/api#senddocument Bot API • sendDocument}
  */
-const _Document: ReturnType<typeof Data.TaggedClass<'Document'>> = Data.TaggedClass('Document')
-export class Document extends _Document<{
-  file: File.FileId | File.External | File.InputFile
-  caption: Option.Option<Text_.Text>
-  thumbnail: Option.Option<File.InputFile>
-  contentTypeDetection: boolean
-}> {}
+export interface Document {
+  readonly _tag: 'Document'
+  readonly file: File.FileId | File.External | File.InputFile
+  readonly caption: Option.Option<Text_.Text>
+  readonly thumbnail: Option.Option<File.InputFile>
+  readonly contentTypeDetection: boolean
+}
+export const Document: Data.Case.Constructor<Document, '_tag'> = Data.tagged<Document>('Document')
 
 /**
- * Content of a video message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_video.html TDLib • td_api.inputMessageVideo}
  * @see {@link https://core.telegram.org/bots/api#sendvideo Bot API • sendVideo}
  */
-const _Video: ReturnType<typeof Data.TaggedClass<'Video'>> = Data.TaggedClass('Video')
-export class Video extends _Video<{
-  file: File.FileId | File.External | File.InputFile
-  caption: Option.Option<Text_.Text>
-  layout: 'caption-above' | 'caption-below'
-  spoiler: boolean
-  duration: Option.Option<Duration.Duration>
-  width: Option.Option<number>
-  height: Option.Option<number>
-  thumbnail: Option.Option<File.InputFile>
-  cover: Option.Option<File.FileId | File.External | File.InputFile>
-  startAt: Option.Option<Duration.Duration>
-  supportsStreaming: boolean
-}> {}
+export interface Video {
+  readonly _tag: 'Video'
+  readonly file: File.FileId | File.External | File.InputFile
+  readonly caption: Option.Option<Text_.Text>
+  readonly layout: 'caption-above' | 'caption-below'
+  readonly spoiler: boolean
+  readonly duration: Option.Option<Duration.Duration>
+  readonly width: Option.Option<number>
+  readonly height: Option.Option<number>
+  readonly thumbnail: Option.Option<File.InputFile>
+  readonly cover: Option.Option<File.FileId | File.External | File.InputFile>
+  readonly startAt: Option.Option<Duration.Duration>
+  readonly supportsStreaming: boolean
+}
+export const Video: Data.Case.Constructor<Video, '_tag'> = Data.tagged<Video>('Video')
 
 /**
- * Content of an animation message (GIF or video without sound).
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_animation.html TDLib • td_api.inputMessageAnimation}
  * @see {@link https://core.telegram.org/bots/api#sendanimation Bot API • sendAnimation}
  */
-const _Animation: ReturnType<typeof Data.TaggedClass<'Animation'>> = Data.TaggedClass('Animation')
-export class Animation extends _Animation<{
-  file: File.FileId | File.External | File.InputFile
-  caption: Option.Option<Text_.Text>
-  layout: 'caption-above' | 'caption-below'
-  spoiler: boolean
-  duration: Option.Option<Duration.Duration>
-  width: Option.Option<number>
-  height: Option.Option<number>
-  thumbnail: Option.Option<File.InputFile>
-}> {}
+export interface Animation {
+  readonly _tag: 'Animation'
+  readonly file: File.FileId | File.External | File.InputFile
+  readonly caption: Option.Option<Text_.Text>
+  readonly layout: 'caption-above' | 'caption-below'
+  readonly spoiler: boolean
+  readonly duration: Option.Option<Duration.Duration>
+  readonly width: Option.Option<number>
+  readonly height: Option.Option<number>
+  readonly thumbnail: Option.Option<File.InputFile>
+}
+export const Animation: Data.Case.Constructor<Animation, '_tag'> = Data.tagged<Animation>('Animation')
 
 /**
- * Content of a voice note message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_voice_note.html TDLib • td_api.inputMessageVoiceNote}
  * @see {@link https://core.telegram.org/bots/api#sendvoice Bot API • sendVoice}
  */
-const _Voice: ReturnType<typeof Data.TaggedClass<'Voice'>> = Data.TaggedClass('Voice')
-export class Voice extends _Voice<{
-  file: File.FileId | File.External | File.InputFile
-  caption: Option.Option<Text_.Text>
-  duration: Option.Option<Duration.Duration>
-}> {}
+export interface Voice {
+  readonly _tag: 'Voice'
+  readonly file: File.FileId | File.External | File.InputFile
+  readonly caption: Option.Option<Text_.Text>
+  readonly duration: Option.Option<Duration.Duration>
+}
+export const Voice: Data.Case.Constructor<Voice, '_tag'> = Data.tagged<Voice>('Voice')
 
 /**
- * Content of a video note message (round video).
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_video_note.html TDLib • td_api.inputMessageVideoNote}
  * @see {@link https://core.telegram.org/bots/api#sendvideonote Bot API • sendVideoNote}
  */
-const _VideoNote: ReturnType<typeof Data.TaggedClass<'VideoNote'>> = Data.TaggedClass('VideoNote')
-export class VideoNote extends _VideoNote<{
-  file: File.FileId | File.InputFile
-  duration: Option.Option<Duration.Duration>
-  diameter: Option.Option<number>
-  thumbnail: Option.Option<File.InputFile>
-}> {}
+export interface VideoNote {
+  readonly _tag: 'VideoNote'
+  readonly file: File.FileId | File.InputFile
+  readonly duration: Option.Option<Duration.Duration>
+  readonly diameter: Option.Option<number>
+  readonly thumbnail: Option.Option<File.InputFile>
+}
+export const VideoNote: Data.Case.Constructor<VideoNote, '_tag'> = Data.tagged<VideoNote>('VideoNote')
 
 /**
- * Content of a location message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_location.html TDLib • td_api.inputMessageLocation}
  * @see {@link https://core.telegram.org/bots/api#sendlocation Bot API • sendLocation}
  */
-const _Location: ReturnType<typeof Data.TaggedClass<'Location'>> = Data.TaggedClass('Location')
-export class Location extends _Location<{
-  latitude: number
-  longitude: number
-  uncertaintyRadius: Option.Option<number>
-  livePeriod: Option.Option<Duration.Duration>
-  heading: Option.Option<number>
-  proximityAlertRadius: Option.Option<number>
-}> {}
+export interface Location {
+  readonly _tag: 'Location'
+  readonly latitude: number
+  readonly longitude: number
+  readonly uncertaintyRadius: Option.Option<number>
+  readonly livePeriod: Option.Option<Duration.Duration>
+  readonly heading: Option.Option<number>
+  readonly proximityAlertRadius: Option.Option<number>
+}
+export const Location: Data.Case.Constructor<Location, '_tag'> = Data.tagged<Location>('Location')
 
 /**
- * Content of a venue message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_venue.html TDLib • td_api.inputMessageVenue}
  * @see {@link https://core.telegram.org/bots/api#sendvenue Bot API • sendVenue}
  */
-const _Venue: ReturnType<typeof Data.TaggedClass<'Venue'>> = Data.TaggedClass('Venue')
-export class Venue extends _Venue<{
-  latitude: number
-  longitude: number
-  title: string
-  address: string
-  foursquareId: Option.Option<string>
-  foursquareType: Option.Option<string>
-  googlePlaceId: Option.Option<string>
-  googlePlaceType: Option.Option<string>
-}> {}
+export interface Venue {
+  readonly _tag: 'Venue'
+  readonly latitude: number
+  readonly longitude: number
+  readonly title: string
+  readonly address: string
+  readonly foursquareId: Option.Option<string>
+  readonly foursquareType: Option.Option<string>
+  readonly googlePlaceId: Option.Option<string>
+  readonly googlePlaceType: Option.Option<string>
+}
+export const Venue: Data.Case.Constructor<Venue, '_tag'> = Data.tagged<Venue>('Venue')
 
 /**
- * Content of a contact message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_contact.html TDLib • td_api.inputMessageContact}
  * @see {@link https://core.telegram.org/bots/api#sendcontact Bot API • sendContact}
  */
-const _Contact: ReturnType<typeof Data.TaggedClass<'Contact'>> = Data.TaggedClass('Contact')
-export class Contact extends _Contact<{
-  phoneNumber: string
-  firstName: string
-  lastName: Option.Option<string>
-  vcard: Option.Option<string>
-}> {}
+export interface Contact {
+  readonly _tag: 'Contact'
+  readonly phoneNumber: string
+  readonly firstName: string
+  readonly lastName: Option.Option<string>
+  readonly vcard: Option.Option<string>
+}
+export const Contact: Data.Case.Constructor<Contact, '_tag'> = Data.tagged<Contact>('Contact')
 
 /**
- * Content of a dice message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_dice.html TDLib • td_api.inputMessageDice}
  * @see {@link https://core.telegram.org/bots/api#senddice Bot API • sendDice}
  */
-const _Dice: ReturnType<typeof Data.TaggedClass<'Dice'>> = Data.TaggedClass('Dice')
-export class Dice extends _Dice<{
-  emoji: '🎲' | '🎯' | '🏀' | '⚽' | '🎳' | '🎰'
-}> {}
+export interface Dice {
+  readonly _tag: 'Dice'
+  readonly emoji: '🎲' | '🎯' | '🏀' | '⚽' | '🎳' | '🎰'
+}
+export const Dice: Data.Case.Constructor<Dice, '_tag'> = Data.tagged<Dice>('Dice')
 
 /**
- * Content of a sticker message.
- *
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_sticker.html TDLib • td_api.inputMessageSticker}
  * @see {@link https://core.telegram.org/bots/api#sendsticker Bot API • sendSticker}
  */
-const _Sticker: ReturnType<typeof Data.TaggedClass<'Sticker'>> = Data.TaggedClass('Sticker')
-export class Sticker extends _Sticker<{
-  file: File.FileId | File.External | File.InputFile
-  emoji: Option.Option<string>
-}> {}
+export interface Sticker {
+  readonly _tag: 'Sticker'
+  readonly file: File.FileId | File.External | File.InputFile
+  readonly emoji: Option.Option<string>
+}
+export const Sticker: Data.Case.Constructor<Sticker, '_tag'> = Data.tagged<Sticker>('Sticker')
 
 // ——— Constructors ——————————————————————————————————————————————————————————
 
@@ -227,7 +214,7 @@ export const text = (
   options?: {
     linkPreview?: LinkPreview.LinkPreview
   },
-): Text => new Text({
+): Text => Text({
   text,
   linkPreview: Option.fromNullable(options?.linkPreview),
 })
@@ -239,7 +226,7 @@ export const photo = (
     layout?: 'caption-above' | 'caption-below'
     spoiler?: boolean
   },
-): Photo => new Photo({
+): Photo => Photo({
   file,
   caption: Option.fromNullable(options.caption),
   layout: options.layout ?? 'caption-below',
@@ -255,7 +242,7 @@ export const audio = (
     title?: string
     thumbnail?: File.InputFile
   },
-): Audio => new Audio({
+): Audio => Audio({
   file,
   caption: Option.fromNullable(options.caption),
   duration: Option.fromNullable(options.duration),
@@ -271,7 +258,7 @@ export const document = (
     thumbnail?: File.InputFile
     contentTypeDetection?: boolean
   },
-): Document => new Document({
+): Document => Document({
   file,
   caption: Option.fromNullable(options.caption),
   thumbnail: Option.fromNullable(options.thumbnail),
@@ -292,7 +279,7 @@ export const video = (
     startAt?: Duration.Duration
     supportsStreaming?: boolean
   },
-): Video => new Video({
+): Video => Video({
   file,
   caption: Option.fromNullable(options.caption),
   layout: options.layout ?? 'caption-below',
@@ -317,7 +304,7 @@ export const animation = (
     height?: number
     thumbnail?: File.InputFile
   },
-): Animation => new Animation({
+): Animation => Animation({
   file,
   caption: Option.fromNullable(options.caption),
   layout: options.layout ?? 'caption-below',
@@ -334,7 +321,7 @@ export const voice = (
     caption?: Text_.Text
     duration?: Duration.Duration
   },
-): Voice => new Voice({
+): Voice => Voice({
   file,
   caption: Option.fromNullable(options.caption),
   duration: Option.fromNullable(options.duration),
@@ -347,7 +334,7 @@ export const videoNote = (
     diameter?: number
     thumbnail?: File.InputFile
   },
-): VideoNote => new VideoNote({
+): VideoNote => VideoNote({
   file,
   duration: Option.fromNullable(options.duration),
   diameter: Option.fromNullable(options.diameter),
@@ -358,7 +345,7 @@ export const location = (options: {
   latitude: number
   longitude: number
   uncertaintyRadius?: number
-}): Location => new Location({
+}): Location => Location({
   latitude: options.latitude,
   longitude: options.longitude,
   uncertaintyRadius: Option.fromNullable(options.uncertaintyRadius),
@@ -374,7 +361,7 @@ export const liveLocation = (options: {
   livePeriod: Duration.Duration
   heading?: number
   proximityAlertRadius?: number
-}): Location => new Location({
+}): Location => Location({
   latitude: options.latitude,
   longitude: options.longitude,
   uncertaintyRadius: Option.fromNullable(options.uncertaintyRadius),
@@ -392,7 +379,7 @@ export const venue = (options: {
   foursquareType?: string
   googlePlaceId?: string
   googlePlaceType?: string
-}): Venue => new Venue({
+}): Venue => Venue({
   latitude: options.latitude,
   longitude: options.longitude,
   title: options.title,
@@ -408,16 +395,16 @@ export const contact = (options: {
   firstName: string
   lastName?: string
   vcard?: string
-}): Contact => new Contact({
+}): Contact => Contact({
   phoneNumber: options.phoneNumber,
   firstName: options.firstName,
   lastName: Option.fromNullable(options.lastName),
   vcard: Option.fromNullable(options.vcard),
 })
 
-export const dice = (emoji: Dice['emoji']): Dice => new Dice({ emoji })
+export const dice = (emoji: Dice['emoji']): Dice => Dice({ emoji })
 
 export const sticker = (
   file: File.FileId | File.External | File.InputFile,
   emoji?: string,
-): Sticker => new Sticker({ file, emoji: Option.fromNullable(emoji) })
+): Sticker => Sticker({ file, emoji: Option.fromNullable(emoji) })
diff --git a/src/Dialog.ts b/src/Dialog.ts
index 868d2c4..91d5cda 100644
--- a/src/Dialog.ts
+++ b/src/Dialog.ts
@@ -1,6 +1,7 @@
 import type * as BotApi from './BotApi.ts'
 import * as Brand from 'effect/Brand'
 import * as Data from 'effect/Data'
+import * as Match from 'effect/Match'
 import * as Option from 'effect/Option'
 import * as internal from './internal/dialog.ts'
 
@@ -14,23 +15,26 @@ export type Dialog =
   | ForumTopic
   | ChannelDm
 
-const _PrivateTopic: ReturnType<typeof Data.TaggedClass<'PrivateTopic'>> = Data.TaggedClass('PrivateTopic')
-export class PrivateTopic extends _PrivateTopic<{
-  user: User
-  topicId: number
-}> {}
+export interface PrivateTopic {
+  readonly _tag: 'PrivateTopic'
+  readonly user: User
+  readonly topicId: number
+}
+export const PrivateTopic: Data.Case.Constructor<PrivateTopic, '_tag'> = Data.tagged<PrivateTopic>('PrivateTopic')
 
-const _ForumTopic: ReturnType<typeof Data.TaggedClass<'ForumTopic'>> = Data.TaggedClass('ForumTopic')
-export class ForumTopic extends _ForumTopic<{
-  supergroup: Supergroup
-  topicId: number
-}> {}
+export interface ForumTopic {
+  readonly _tag: 'ForumTopic'
+  readonly supergroup: Supergroup
+  readonly topicId: number
+}
+export const ForumTopic: Data.Case.Constructor<ForumTopic, '_tag'> = Data.tagged<ForumTopic>('ForumTopic')
 
-const _ChannelDm: ReturnType<typeof Data.TaggedClass<'ChannelDm'>> = Data.TaggedClass('ChannelDm')
-export class ChannelDm extends _ChannelDm<{
-  channel: Channel
-  topicId: number
-}> {}
+export interface ChannelDm {
+  readonly _tag: 'ChannelDm'
+  readonly channel: Channel
+  readonly topicId: number
+}
+export const ChannelDm: Data.Case.Constructor<ChannelDm, '_tag'> = Data.tagged<ChannelDm>('ChannelDm')
 
 // =============================================================================
 // Peer
@@ -42,53 +46,42 @@ export type Peer =
   | Channel
   | Supergroup
 
-const _User: ReturnType<typeof Data.TaggedClass<'User'>> = Data.TaggedClass('User')
-export class User extends _User<{
-  id: UserId
-}> {
-  public dialogId(): DialogId {
-    return Option.getOrThrow(internal.encodePeerId('user', this.id))
-  }
-
-  public topic(topicId: number): PrivateTopic {
-    return new PrivateTopic({ user: this, topicId })
-  }
+export interface User {
+  readonly _tag: 'User'
+  readonly id: UserId
 }
+export const User: Data.Case.Constructor<User, '_tag'> = Data.tagged<User>('User')
 
-const _Group: ReturnType<typeof Data.TaggedClass<'Group'>> = Data.TaggedClass('Group')
-export class Group extends _Group<{
-  id: GroupId
-}> {
-  public dialogId(): DialogId {
-    return Option.getOrThrow(internal.encodePeerId('group', this.id))
-  }
+export interface Group {
+  readonly _tag: 'Group'
+  readonly id: GroupId
 }
+export const Group: Data.Case.Constructor<Group, '_tag'> = Data.tagged<Group>('Group')
 
-const _Channel: ReturnType<typeof Data.TaggedClass<'Channel'>> = Data.TaggedClass('Channel')
-export class Channel extends _Channel<{
-  id: ChannelId
-}> {
-  public dialogId(): DialogId {
-    return Option.getOrThrow(internal.encodePeerId('channel', this.id))
-  }
-
-  public directMessages(topicId: number): ChannelDm {
-    return new ChannelDm({ channel: this, topicId })
-  }
+export interface Channel {
+  readonly _tag: 'Channel'
+  readonly id: ChannelId
 }
+export const Channel: Data.Case.Constructor<Channel, '_tag'> = Data.tagged<Channel>('Channel')
 
-const _Supergroup: ReturnType<typeof Data.TaggedClass<'Supergroup'>> = Data.TaggedClass('Supergroup')
-export class Supergroup extends _Supergroup<{
-  id: SupergroupId
-}> {
-  public dialogId(): DialogId {
-    return Option.getOrThrow(internal.encodePeerId('channel', this.id))
-  }
-
-  public topic(topicId: number): ForumTopic {
-    return new ForumTopic({ supergroup: this, topicId })
-  }
+export interface Supergroup {
+  readonly _tag: 'Supergroup'
+  readonly id: SupergroupId
 }
+export const Supergroup: Data.Case.Constructor<Supergroup, '_tag'> = Data.tagged<Supergroup>('Supergroup')
+
+// =============================================================================
+// Peer Functions
+// =============================================================================
+
+export const dialogId: (peer: Peer) => DialogId = Match.type<Peer>().pipe(
+  Match.tagsExhaustive({
+    User: u => Option.getOrThrow(internal.encodePeerId('user', u.id)),
+    Group: g => Option.getOrThrow(internal.encodePeerId('group', g.id)),
+    Channel: c => Option.getOrThrow(internal.encodePeerId('channel', c.id)),
+    Supergroup: s => Option.getOrThrow(internal.encodePeerId('channel', s.id)),
+  }),
+)
 
 // =============================================================================
 // Brands
@@ -164,19 +157,19 @@ export const encodePeerId: (
 // =============================================================================
 
 export const user: (id: number) => User = (id) => {
-  return new User({ id: UserId(id) })
+  return User({ id: UserId(id) })
 }
 
 export const group: (id: number) => Group = (id) => {
-  return new Group({ id: GroupId(id) })
+  return Group({ id: GroupId(id) })
 }
 
 export const channel: (id: number) => Channel = (id) => {
-  return new Channel({ id: ChannelId(id) })
+  return Channel({ id: ChannelId(id) })
 }
 
 export const supergroup: (id: number) => Supergroup = (id) => {
-  return new Supergroup({ id: ChannelId(id) })
+  return Supergroup({ id: ChannelId(id) })
 }
 
 export const ofMessage: (
diff --git a/src/File.ts b/src/File.ts
index 78bb082..ec4cb88 100644
--- a/src/File.ts
+++ b/src/File.ts
@@ -16,12 +16,16 @@ export const FileId: Brand.Brand.Constructor<FileId> = Brand.nominal<FileId>()
 export type External = URL & Brand.Brand<'External'>
 export const External: Brand.Brand.Constructor<External> = Brand.nominal<External>()
 
-const _InputFile: ReturnType<typeof Data.TaggedClass<'InputFile'>> = Data.TaggedClass('InputFile')
-export class InputFile extends _InputFile<{
-  stream: Stream.Stream<Uint8Array>
-  filename: string
-  mimeType?: string
-}> {}
+export interface InputFile {
+  readonly _tag: 'InputFile'
+  readonly stream: Stream.Stream<Uint8Array>
+  readonly filename: string
+  readonly mimeType?: string
+}
+export const InputFile: Data.Case.Constructor<InputFile, '_tag'> = Data.tagged<InputFile>('InputFile')
+
+export const isInputFile = (u: unknown): u is InputFile =>
+  typeof u === 'object' && u !== null && '_tag' in u && (u as { _tag: unknown })._tag === 'InputFile'
 
 /**
  * Downloads a file from the Bot API server.
diff --git a/src/Markup.ts b/src/Markup.ts
index dcb8114..0a35d62 100644
--- a/src/Markup.ts
+++ b/src/Markup.ts
@@ -14,31 +14,35 @@ export type Markup =
   | ReplyKeyboardRemove
   | ForceReply
 
-const _InlineKeyboard: ReturnType<typeof Data.TaggedClass<'InlineKeyboard'>> = Data.TaggedClass('InlineKeyboard')
-export class InlineKeyboard extends _InlineKeyboard<{
+export interface InlineKeyboard {
+  readonly _tag: 'InlineKeyboard'
   readonly rows: ReadonlyArray<ReadonlyArray<InlineButton>>
-}> {}
+}
+export const InlineKeyboard: Data.Case.Constructor<InlineKeyboard, '_tag'> = Data.tagged<InlineKeyboard>('InlineKeyboard')
 
-const _ReplyKeyboard: ReturnType<typeof Data.TaggedClass<'ReplyKeyboard'>> = Data.TaggedClass('ReplyKeyboard')
-export class ReplyKeyboard extends _ReplyKeyboard<{
+export interface ReplyKeyboard {
+  readonly _tag: 'ReplyKeyboard'
   readonly rows: ReadonlyArray<ReadonlyArray<ReplyButton>>
   readonly persistent: boolean
   readonly resizable: boolean
   readonly oneTime: boolean
   readonly selective: boolean
   readonly inputPlaceholder: Option.Option<string>
-}> {}
+}
+export const ReplyKeyboard: Data.Case.Constructor<ReplyKeyboard, '_tag'> = Data.tagged<ReplyKeyboard>('ReplyKeyboard')
 
-const _ReplyKeyboardRemove: ReturnType<typeof Data.TaggedClass<'ReplyKeyboardRemove'>> = Data.TaggedClass('ReplyKeyboardRemove')
-export class ReplyKeyboardRemove extends _ReplyKeyboardRemove<{
+export interface ReplyKeyboardRemove {
+  readonly _tag: 'ReplyKeyboardRemove'
   readonly selective: boolean
-}> {}
+}
+export const ReplyKeyboardRemove: Data.Case.Constructor<ReplyKeyboardRemove, '_tag'> = Data.tagged<ReplyKeyboardRemove>('ReplyKeyboardRemove')
 
-const _ForceReply: ReturnType<typeof Data.TaggedClass<'ForceReply'>> = Data.TaggedClass('ForceReply')
-export class ForceReply extends _ForceReply<{
+export interface ForceReply {
+  readonly _tag: 'ForceReply'
   readonly selective: boolean
   readonly inputPlaceholder: Option.Option<string>
-}> {}
+}
+export const ForceReply: Data.Case.Constructor<ForceReply, '_tag'> = Data.tagged<ForceReply>('ForceReply')
 
 // =============================================================================
 // Constructors
@@ -46,7 +50,7 @@ export class ForceReply extends _ForceReply<{
 
 export const inlineKeyboard = (
   rows: ReadonlyArray<ReadonlyArray<InlineButton>>,
-): InlineKeyboard => new InlineKeyboard({ rows })
+): InlineKeyboard => InlineKeyboard({ rows })
 
 export const replyKeyboard = (
   rows: ReadonlyArray<ReadonlyArray<ReplyButton>>,
@@ -58,7 +62,7 @@ export const replyKeyboard = (
     readonly inputPlaceholder?: string
   },
 ): ReplyKeyboard =>
-  new ReplyKeyboard({
+  ReplyKeyboard({
     rows,
     persistent: options?.persistent ?? false,
     resizable: options?.resizable ?? false,
@@ -68,13 +72,13 @@ export const replyKeyboard = (
   })
 
 export const replyKeyboardRemove = (options?: { readonly selective?: boolean }): ReplyKeyboardRemove =>
-  new ReplyKeyboardRemove({ selective: options?.selective ?? false })
+  ReplyKeyboardRemove({ selective: options?.selective ?? false })
 
 export const forceReply = (options?: {
   readonly selective?: boolean
   readonly inputPlaceholder?: string
 }): ForceReply =>
-  new ForceReply({
+  ForceReply({
     selective: options?.selective ?? false,
     inputPlaceholder: Option.fromNullable(options?.inputPlaceholder),
   })
diff --git a/src/Send.ts b/src/Send.ts
index aebcec3..93a879c 100644
--- a/src/Send.ts
+++ b/src/Send.ts
@@ -36,6 +36,16 @@ export const sendMessage: (params: {
   BotApi.BotApi
 > = internal.sendMessage
 
+// =============================================================================
+// TargetDialog
+// =============================================================================
+
+/**
+ * Target dialog for sending messages.
+ */
+export interface TargetDialog { readonly _: unique symbol }
+export const TargetDialog: Context.Tag<TargetDialog, Dialog.Dialog | Dialog.DialogId> = Context.GenericTag<TargetDialog, Dialog.Dialog | Dialog.DialogId>('@grom.js/effect-tg/Send/TargetDialog')
+
 // =============================================================================
 // MessageToSend
 // =============================================================================
@@ -109,16 +119,6 @@ export const message = (content: Content.Content, params?: {
   return self
 }
 
-// =============================================================================
-// TargetDialog
-// =============================================================================
-
-/**
- * Target dialog for sending messages.
- */
-const _TargetDialog: Context.TagClass<TargetDialog, '@grom.js/effect-tg/Send/TargetDialog', Dialog.Dialog | Dialog.DialogId> = Context.Tag('@grom.js/effect-tg/Send/TargetDialog')<TargetDialog, Dialog.Dialog | Dialog.DialogId>()
-export class TargetDialog extends _TargetDialog {}
-
 /**
  * Provides the target dialog for sending messages.
  */
diff --git a/src/Text.ts b/src/Text.ts
index 0e79d06..60d4826 100644
--- a/src/Text.ts
+++ b/src/Text.ts
@@ -11,36 +11,40 @@ export type Text =
   | Markdown
   | Tgx
 
-const _Plain: ReturnType<typeof Data.TaggedClass<'Plain'>> = Data.TaggedClass('Plain')
-export class Plain extends _Plain<{
-  text: string
-  entities?: Array<Types.MessageEntity>
-}> {}
-
-const _Html: ReturnType<typeof Data.TaggedClass<'Html'>> = Data.TaggedClass('Html')
-export class Html extends _Html<{
-  html: string
-}> {}
-
-const _Markdown: ReturnType<typeof Data.TaggedClass<'Markdown'>> = Data.TaggedClass('Markdown')
-export class Markdown extends _Markdown<{
-  markdown: string
-}> {}
-
-const _Tgx: ReturnType<typeof Data.TaggedClass<'Tgx'>> = Data.TaggedClass('Tgx')
-export class Tgx extends _Tgx<{
-  tgx: TgxElement
-}> {}
+export interface Plain {
+  readonly _tag: 'Plain'
+  readonly text: string
+  readonly entities?: Array<Types.MessageEntity>
+}
+export const Plain: Data.Case.Constructor<Plain, '_tag'> = Data.tagged<Plain>('Plain')
+
+export interface Html {
+  readonly _tag: 'Html'
+  readonly html: string
+}
+export const Html: Data.Case.Constructor<Html, '_tag'> = Data.tagged<Html>('Html')
+
+export interface Markdown {
+  readonly _tag: 'Markdown'
+  readonly markdown: string
+}
+export const Markdown: Data.Case.Constructor<Markdown, '_tag'> = Data.tagged<Markdown>('Markdown')
+
+export interface Tgx {
+  readonly _tag: 'Tgx'
+  readonly tgx: TgxElement
+}
+export const Tgx: Data.Case.Constructor<Tgx, '_tag'> = Data.tagged<Tgx>('Tgx')
 
 // ———— Constructors ———————————————————————————————————————————————————————————
 
 export const plain = (
   text: string,
   entities?: Array<Types.MessageEntity>,
-): Plain => new Plain({ text, entities })
+): Plain => Plain({ text, entities })
 
-export const html = (html: string): Html => new Html({ html })
+export const html = (html: string): Html => Html({ html })
 
-export const markdown = (markdown: string): Markdown => new Markdown({ markdown })
+export const markdown = (markdown: string): Markdown => Markdown({ markdown })
 
-export const tgx = (tgx: TgxElement): Tgx => new Tgx({ tgx })
+export const tgx = (tgx: TgxElement): Tgx => Tgx({ tgx })
diff --git a/src/internal/botApiTransport.ts b/src/internal/botApiTransport.ts
index 9c74330..3603d48 100644
--- a/src/internal/botApiTransport.ts
+++ b/src/internal/botApiTransport.ts
@@ -18,7 +18,7 @@ interface ExtractedFile {
  * {@linkcode File.InputFile InputFile} instances.
  */
 const hasInputFile = (value: unknown): boolean => {
-  if (value instanceof File.InputFile) {
+  if (File.isInputFile(value)) {
     return true
   }
   if (Array.isArray(value)) {
@@ -34,7 +34,7 @@ const cloneAndExtract = (
   value: unknown,
   files: ExtractedFile[],
 ): unknown => {
-  if (value instanceof File.InputFile) {
+  if (File.isInputFile(value)) {
     const attachId = String(files.length + 1)
     files.push({ attachId, file: value })
     return `attach://${attachId}`
diff --git a/src/internal/dialog.ts b/src/internal/dialog.ts
index 10fdfcc..2a99d2e 100644
--- a/src/internal/dialog.ts
+++ b/src/internal/dialog.ts
@@ -80,34 +80,34 @@ export const ofMessage: (
 ) => Dialog.Dialog = (m) => {
   switch (m.chat.type) {
     case 'private': {
-      const user = new Dialog.User({
+      const user = Dialog.User({
         id: Option.getOrThrow(decodePeerId('user', m.chat.id)),
       })
       if (m.message_thread_id != null) {
-        return user.topic(m.message_thread_id)
+        return Dialog.PrivateTopic({ user, topicId: m.message_thread_id })
       }
       return user
     }
     case 'group': {
-      return new Dialog.Group({
+      return Dialog.Group({
         id: Option.getOrThrow(decodePeerId('group', m.chat.id)),
       })
     }
     case 'channel': {
-      const channel = new Dialog.Channel({
+      const channel = Dialog.Channel({
         id: Option.getOrThrow(decodePeerId('channel', m.chat.id)),
       })
       if (m.direct_messages_topic != null) {
-        return channel.directMessages(m.direct_messages_topic.topic_id)
+        return Dialog.ChannelDm({ channel, topicId: m.direct_messages_topic.topic_id })
       }
       return channel
     }
     case 'supergroup': {
-      const supergroup = new Dialog.Supergroup({
+      const supergroup = Dialog.Supergroup({
         id: Option.getOrThrow(decodePeerId('channel', m.chat.id)),
       })
       if (m.message_thread_id != null) {
-        return supergroup.topic(m.message_thread_id)
+        return Dialog.ForumTopic({ supergroup, topicId: m.message_thread_id })
       }
       return supergroup
     }
diff --git a/src/internal/send.ts b/src/internal/send.ts
index 7d613b5..76c6377 100644
--- a/src/internal/send.ts
+++ b/src/internal/send.ts
@@ -1,7 +1,6 @@
 import type * as Effect from 'effect/Effect'
 import type * as BotApiError from '../BotApiError.ts'
 import type * as Content from '../Content.ts'
-import type * as Dialog from '../Dialog.ts'
 import type * as Markup from '../Markup.ts'
 import type * as Reply from '../Reply.ts'
 import type * as Send from '../Send.ts'
@@ -12,6 +11,7 @@ import * as Duration from 'effect/Duration'
 import * as Match from 'effect/Match'
 import * as Option from 'effect/Option'
 import * as BotApi from '../BotApi.ts'
+import * as Dialog from '../Dialog.ts'
 import * as LinkPreview from '../LinkPreview.ts'
 
 // =============================================================================
@@ -246,27 +246,27 @@ const paramsDialog: (
   })),
   Match.tagsExhaustive({
     User: user => ({
-      chat_id: user.dialogId(),
+      chat_id: Dialog.dialogId(user),
     }),
     Group: group => ({
-      chat_id: group.dialogId(),
+      chat_id: Dialog.dialogId(group),
     }),
     Channel: channel => ({
-      chat_id: channel.dialogId(),
+      chat_id: Dialog.dialogId(channel),
     }),
     Supergroup: supergroup => ({
-      chat_id: supergroup.dialogId(),
+      chat_id: Dialog.dialogId(supergroup),
     }),
     PrivateTopic: topic => ({
-      chat_id: topic.user.dialogId(),
+      chat_id: Dialog.dialogId(topic.user),
       message_thread_id: topic.topicId,
     }),
     ForumTopic: topic => ({
-      chat_id: topic.supergroup.dialogId(),
+      chat_id: Dialog.dialogId(topic.supergroup),
       message_thread_id: topic.topicId,
     }),
     ChannelDm: dm => ({
-      chat_id: dm.channel.dialogId(),
+      chat_id: Dialog.dialogId(dm.channel),
       direct_messages_topic_id: dm.topicId,
     }),
   }),
@@ -466,7 +466,7 @@ const paramsReply = (
   reply_parameters: {
     chat_id: Match.value(reply.dialog).pipe(
       Match.when(Match.number, id => id),
-      Match.orElse(peer => peer.dialogId()),
+      Match.orElse(peer => Dialog.dialogId(peer)),
     ),
     message_id: reply.messageId,
     checklist_task_id: Option.getOrUndefined(reply.taskId),

From 4013e65fcd95908770ddd7a8813253fa371de4e4 Mon Sep 17 00:00:00 2001
From: evermake <vladeryabkin@gmail.com>
Date: Wed, 11 Mar 2026 09:58:57 +0500
Subject: [PATCH 03/10] refactor `InputFile`

---
 src/File.ts | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/File.ts b/src/File.ts
index ec4cb88..8b0070b 100644
--- a/src/File.ts
+++ b/src/File.ts
@@ -7,7 +7,7 @@ import type * as BotApi from './BotApi.ts'
 import type * as BotApiError from './BotApiError.ts'
 import type * as BotApiUrl from './BotApiUrl.ts'
 import * as Brand from 'effect/Brand'
-import * as Data from 'effect/Data'
+import * as Predicate from 'effect/Predicate'
 import * as internal from './internal/file.ts'
 
 export type FileId = string & Brand.Brand<'FileId'>
@@ -16,16 +16,42 @@ export const FileId: Brand.Brand.Constructor<FileId> = Brand.nominal<FileId>()
 export type External = URL & Brand.Brand<'External'>
 export const External: Brand.Brand.Constructor<External> = Brand.nominal<External>()
 
+// =============================================================================
+// InputFile
+// =============================================================================
+
+const InputFileTypeId: unique symbol = Symbol.for('effect-tg/InputFile') as InputFileTypeId
+
+export type InputFileTypeId = typeof InputFileTypeId
+
 export interface InputFile {
-  readonly _tag: 'InputFile'
+  readonly [InputFileTypeId]: InputFileTypeId
   readonly stream: Stream.Stream<Uint8Array>
   readonly filename: string
   readonly mimeType?: string
 }
-export const InputFile: Data.Case.Constructor<InputFile, '_tag'> = Data.tagged<InputFile>('InputFile')
 
-export const isInputFile = (u: unknown): u is InputFile =>
-  typeof u === 'object' && u !== null && '_tag' in u && (u as { _tag: unknown })._tag === 'InputFile'
+const InputFileProto = {
+  [InputFileTypeId]: InputFileTypeId,
+}
+
+export const make: (args: {
+  stream: Stream.Stream<Uint8Array>
+  filename: string
+  mimeType?: string
+}) => InputFile = ({ stream, filename, mimeType }) => {
+  const file = Object.create(InputFileProto)
+  file.stream = stream
+  file.filename = filename
+  file.mimeType = mimeType
+  return file
+}
+
+export const isInputFile = (u: unknown): u is InputFile => Predicate.hasProperty(u, InputFileTypeId)
+
+// =============================================================================
+// Utilities
+// =============================================================================
 
 /**
  * Downloads a file from the Bot API server.

From e3572549dc833627c21ff29bf0e662fd4220cb3c Mon Sep 17 00:00:00 2001
From: evermake <vladeryabkin@gmail.com>
Date: Wed, 11 Mar 2026 10:25:26 +0500
Subject: [PATCH 04/10] refactor `Markup`

---
 src/Markup.ts | 53 +++++++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/Markup.ts b/src/Markup.ts
index 0a35d62..db1fa8c 100644
--- a/src/Markup.ts
+++ b/src/Markup.ts
@@ -1,4 +1,3 @@
-import * as Data from 'effect/Data'
 import * as Option from 'effect/Option'
 
 // =============================================================================
@@ -18,7 +17,6 @@ export interface InlineKeyboard {
   readonly _tag: 'InlineKeyboard'
   readonly rows: ReadonlyArray<ReadonlyArray<InlineButton>>
 }
-export const InlineKeyboard: Data.Case.Constructor<InlineKeyboard, '_tag'> = Data.tagged<InlineKeyboard>('InlineKeyboard')
 
 export interface ReplyKeyboard {
   readonly _tag: 'ReplyKeyboard'
@@ -29,20 +27,22 @@ export interface ReplyKeyboard {
   readonly selective: boolean
   readonly inputPlaceholder: Option.Option<string>
 }
-export const ReplyKeyboard: Data.Case.Constructor<ReplyKeyboard, '_tag'> = Data.tagged<ReplyKeyboard>('ReplyKeyboard')
 
 export interface ReplyKeyboardRemove {
   readonly _tag: 'ReplyKeyboardRemove'
   readonly selective: boolean
 }
-export const ReplyKeyboardRemove: Data.Case.Constructor<ReplyKeyboardRemove, '_tag'> = Data.tagged<ReplyKeyboardRemove>('ReplyKeyboardRemove')
 
 export interface ForceReply {
   readonly _tag: 'ForceReply'
   readonly selective: boolean
   readonly inputPlaceholder: Option.Option<string>
 }
-export const ForceReply: Data.Case.Constructor<ForceReply, '_tag'> = Data.tagged<ForceReply>('ForceReply')
+
+// export const InlineKeyboard: Data.Case.Constructor<InlineKeyboard, '_tag'> = Data.tagged<InlineKeyboard>('InlineKeyboard')
+// export const ReplyKeyboard: Data.Case.Constructor<ReplyKeyboard, '_tag'> = Data.tagged<ReplyKeyboard>('ReplyKeyboard')
+// export const ReplyKeyboardRemove: Data.Case.Constructor<ReplyKeyboardRemove, '_tag'> = Data.tagged<ReplyKeyboardRemove>('ReplyKeyboardRemove')
+// export const ForceReply: Data.Case.Constructor<ForceReply, '_tag'> = Data.tagged<ForceReply>('ForceReply')
 
 // =============================================================================
 // Constructors
@@ -50,7 +50,10 @@ export const ForceReply: Data.Case.Constructor<ForceReply, '_tag'> = Data.tagged
 
 export const inlineKeyboard = (
   rows: ReadonlyArray<ReadonlyArray<InlineButton>>,
-): InlineKeyboard => InlineKeyboard({ rows })
+): InlineKeyboard => ({
+  _tag: 'InlineKeyboard',
+  rows,
+})
 
 export const replyKeyboard = (
   rows: ReadonlyArray<ReadonlyArray<ReplyButton>>,
@@ -61,27 +64,31 @@ export const replyKeyboard = (
     readonly selective?: boolean
     readonly inputPlaceholder?: string
   },
-): ReplyKeyboard =>
-  ReplyKeyboard({
-    rows,
-    persistent: options?.persistent ?? false,
-    resizable: options?.resizable ?? false,
-    oneTime: options?.oneTime ?? false,
-    selective: options?.selective ?? false,
-    inputPlaceholder: Option.fromNullable(options?.inputPlaceholder),
-  })
-
-export const replyKeyboardRemove = (options?: { readonly selective?: boolean }): ReplyKeyboardRemove =>
-  ReplyKeyboardRemove({ selective: options?.selective ?? false })
+): ReplyKeyboard => ({
+  _tag: 'ReplyKeyboard',
+  rows,
+  persistent: options?.persistent ?? false,
+  resizable: options?.resizable ?? false,
+  oneTime: options?.oneTime ?? false,
+  selective: options?.selective ?? false,
+  inputPlaceholder: Option.fromNullable(options?.inputPlaceholder),
+})
+
+export const replyKeyboardRemove = (options?: {
+  readonly selective?: boolean
+}): ReplyKeyboardRemove => ({
+  _tag: 'ReplyKeyboardRemove',
+  selective: options?.selective ?? false,
+})
 
 export const forceReply = (options?: {
   readonly selective?: boolean
   readonly inputPlaceholder?: string
-}): ForceReply =>
-  ForceReply({
-    selective: options?.selective ?? false,
-    inputPlaceholder: Option.fromNullable(options?.inputPlaceholder),
-  })
+}): ForceReply => ({
+  _tag: 'ForceReply',
+  selective: options?.selective ?? false,
+  inputPlaceholder: Option.fromNullable(options?.inputPlaceholder),
+})
 
 // =============================================================================
 // Inline button

From 11252bb6f805e49aa59677d8921d9617c053d465 Mon Sep 17 00:00:00 2001
From: evermake <vladeryabkin@gmail.com>
Date: Wed, 11 Mar 2026 10:26:29 +0500
Subject: [PATCH 05/10] remove commented code

---
 src/Markup.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Markup.ts b/src/Markup.ts
index db1fa8c..cc25296 100644
--- a/src/Markup.ts
+++ b/src/Markup.ts
@@ -39,11 +39,6 @@ export interface ForceReply {
   readonly inputPlaceholder: Option.Option<string>
 }
 
-// export const InlineKeyboard: Data.Case.Constructor<InlineKeyboard, '_tag'> = Data.tagged<InlineKeyboard>('InlineKeyboard')
-// export const ReplyKeyboard: Data.Case.Constructor<ReplyKeyboard, '_tag'> = Data.tagged<ReplyKeyboard>('ReplyKeyboard')
-// export const ReplyKeyboardRemove: Data.Case.Constructor<ReplyKeyboardRemove, '_tag'> = Data.tagged<ReplyKeyboardRemove>('ReplyKeyboardRemove')
-// export const ForceReply: Data.Case.Constructor<ForceReply, '_tag'> = Data.tagged<ForceReply>('ForceReply')
-
 // =============================================================================
 // Constructors
 // =============================================================================

From 4545c43d5bf2e15d86a364b6733d6e43c64b3df7 Mon Sep 17 00:00:00 2001
From: evermake <vladeryabkin@gmail.com>
Date: Wed, 11 Mar 2026 10:39:01 +0500
Subject: [PATCH 06/10] refactor `Dialog`

---
 src/Dialog.ts | 62 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/Dialog.ts b/src/Dialog.ts
index 91d5cda..401e97b 100644
--- a/src/Dialog.ts
+++ b/src/Dialog.ts
@@ -1,6 +1,5 @@
 import type * as BotApi from './BotApi.ts'
 import * as Brand from 'effect/Brand'
-import * as Data from 'effect/Data'
 import * as Match from 'effect/Match'
 import * as Option from 'effect/Option'
 import * as internal from './internal/dialog.ts'
@@ -20,21 +19,18 @@ export interface PrivateTopic {
   readonly user: User
   readonly topicId: number
 }
-export const PrivateTopic: Data.Case.Constructor<PrivateTopic, '_tag'> = Data.tagged<PrivateTopic>('PrivateTopic')
 
 export interface ForumTopic {
   readonly _tag: 'ForumTopic'
   readonly supergroup: Supergroup
   readonly topicId: number
 }
-export const ForumTopic: Data.Case.Constructor<ForumTopic, '_tag'> = Data.tagged<ForumTopic>('ForumTopic')
 
 export interface ChannelDm {
   readonly _tag: 'ChannelDm'
   readonly channel: Channel
   readonly topicId: number
 }
-export const ChannelDm: Data.Case.Constructor<ChannelDm, '_tag'> = Data.tagged<ChannelDm>('ChannelDm')
 
 // =============================================================================
 // Peer
@@ -50,25 +46,21 @@ export interface User {
   readonly _tag: 'User'
   readonly id: UserId
 }
-export const User: Data.Case.Constructor<User, '_tag'> = Data.tagged<User>('User')
 
 export interface Group {
   readonly _tag: 'Group'
   readonly id: GroupId
 }
-export const Group: Data.Case.Constructor<Group, '_tag'> = Data.tagged<Group>('Group')
 
 export interface Channel {
   readonly _tag: 'Channel'
   readonly id: ChannelId
 }
-export const Channel: Data.Case.Constructor<Channel, '_tag'> = Data.tagged<Channel>('Channel')
 
 export interface Supergroup {
   readonly _tag: 'Supergroup'
   readonly id: SupergroupId
 }
-export const Supergroup: Data.Case.Constructor<Supergroup, '_tag'> = Data.tagged<Supergroup>('Supergroup')
 
 // =============================================================================
 // Peer Functions
@@ -110,11 +102,6 @@ export const GroupId: Brand.Brand.Constructor<GroupId> = Brand.refined<GroupId>(
   n => Brand.error(`Invalid group ID: ${n}`),
 )
 
-/**
- * ID for channels (including supergroups).
- *
- * @see {@link https://core.telegram.org/api/bots/ids Telegram API • Bot API dialog IDs}
- */
 export type ChannelId = number & Brand.Brand<'@grom.js/effect-tg/ChannelId'>
 export const ChannelId: Brand.Brand.Constructor<ChannelId> = Brand.refined<ChannelId>(
   n => Option.isSome(internal.encodePeerId('channel', n)),
@@ -156,21 +143,40 @@ export const encodePeerId: (
 // Constructors
 // =============================================================================
 
-export const user: (id: number) => User = (id) => {
-  return User({ id: UserId(id) })
-}
-
-export const group: (id: number) => Group = (id) => {
-  return Group({ id: GroupId(id) })
-}
-
-export const channel: (id: number) => Channel = (id) => {
-  return Channel({ id: ChannelId(id) })
-}
-
-export const supergroup: (id: number) => Supergroup = (id) => {
-  return Supergroup({ id: ChannelId(id) })
-}
+export const user: (id: number) => User = id => ({ _tag: 'User', id: UserId(id) })
+
+export const group: (id: number) => Group = id => ({ _tag: 'Group', id: GroupId(id) })
+
+export const channel: (id: number) => Channel = id => ({ _tag: 'Channel', id: ChannelId(id) })
+
+export const supergroup: (id: number) => Supergroup = id => ({ _tag: 'Supergroup', id: ChannelId(id) })
+
+export const privateTopic: (
+  user: User,
+  topicId: number,
+) => PrivateTopic = (user, topicId) => ({
+  _tag: 'PrivateTopic',
+  user,
+  topicId,
+})
+
+export const forumTopic: (
+  supergroup: Supergroup,
+  topicId: number,
+) => ForumTopic = (supergroup, topicId) => ({
+  _tag: 'ForumTopic',
+  supergroup,
+  topicId,
+})
+
+export const channelDm: (
+  channel: Channel,
+  topicId: number,
+) => ChannelDm = (channel, topicId) => ({
+  _tag: 'ChannelDm',
+  channel,
+  topicId,
+})
 
 export const ofMessage: (
   message: BotApi.Types.Message,

From 54fbe51de0ef52508e213215c5616d6d6b204be9 Mon Sep 17 00:00:00 2001
From: evermake <vladeryabkin@gmail.com>
Date: Wed, 11 Mar 2026 10:44:49 +0500
Subject: [PATCH 07/10] fix usage

---
 src/internal/dialog.ts | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/internal/dialog.ts b/src/internal/dialog.ts
index 2a99d2e..473f6da 100644
--- a/src/internal/dialog.ts
+++ b/src/internal/dialog.ts
@@ -80,34 +80,26 @@ export const ofMessage: (
 ) => Dialog.Dialog = (m) => {
   switch (m.chat.type) {
     case 'private': {
-      const user = Dialog.User({
-        id: Option.getOrThrow(decodePeerId('user', m.chat.id)),
-      })
+      const user = Dialog.user(Option.getOrThrow(decodePeerId('user', m.chat.id)))
       if (m.message_thread_id != null) {
-        return Dialog.PrivateTopic({ user, topicId: m.message_thread_id })
+        return Dialog.privateTopic(user, m.message_thread_id)
       }
       return user
     }
     case 'group': {
-      return Dialog.Group({
-        id: Option.getOrThrow(decodePeerId('group', m.chat.id)),
-      })
+      return Dialog.group(Option.getOrThrow(decodePeerId('group', m.chat.id)))
     }
     case 'channel': {
-      const channel = Dialog.Channel({
-        id: Option.getOrThrow(decodePeerId('channel', m.chat.id)),
-      })
+      const channel = Dialog.channel(Option.getOrThrow(decodePeerId('channel', m.chat.id)))
       if (m.direct_messages_topic != null) {
-        return Dialog.ChannelDm({ channel, topicId: m.direct_messages_topic.topic_id })
+        return Dialog.channelDm(channel, m.direct_messages_topic.topic_id)
       }
       return channel
     }
     case 'supergroup': {
-      const supergroup = Dialog.Supergroup({
-        id: Option.getOrThrow(decodePeerId('channel', m.chat.id)),
-      })
+      const supergroup = Dialog.supergroup(Option.getOrThrow(decodePeerId('channel', m.chat.id)))
       if (m.message_thread_id != null) {
-        return Dialog.ForumTopic({ supergroup, topicId: m.message_thread_id })
+        return Dialog.forumTopic(supergroup, m.message_thread_id)
       }
       return supergroup
     }

From 7fc68944f4e85a5beafd34d8e58e4738dc32c4fd Mon Sep 17 00:00:00 2001
From: evermake <vladeryabkin@gmail.com>
Date: Wed, 11 Mar 2026 10:48:33 +0500
Subject: [PATCH 08/10] refactor content

---
 src/Content.ts | 54 ++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/src/Content.ts b/src/Content.ts
index c22dd38..161d72f 100644
--- a/src/Content.ts
+++ b/src/Content.ts
@@ -2,7 +2,6 @@ import type * as Duration from 'effect/Duration'
 import type * as File from './File.ts'
 import type * as LinkPreview from './LinkPreview.ts'
 import type * as Text_ from './Text.ts'
-import * as Data from 'effect/Data'
 import * as Option from 'effect/Option'
 
 /**
@@ -36,7 +35,6 @@ export interface Text {
   readonly text: Text_.Text
   readonly linkPreview: Option.Option<LinkPreview.LinkPreview>
 }
-export const Text: Data.Case.Constructor<Text, '_tag'> = Data.tagged<Text>('Text')
 
 /**
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_photo.html TDLib • td_api.inputMessagePhoto}
@@ -49,7 +47,6 @@ export interface Photo {
   readonly layout: 'caption-above' | 'caption-below'
   readonly spoiler: boolean
 }
-export const Photo: Data.Case.Constructor<Photo, '_tag'> = Data.tagged<Photo>('Photo')
 
 /**
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_audio.html TDLib • td_api.inputMessageAudio}
@@ -64,7 +61,6 @@ export interface Audio {
   readonly title: Option.Option<string>
   readonly thumbnail: Option.Option<File.InputFile>
 }
-export const Audio: Data.Case.Constructor<Audio, '_tag'> = Data.tagged<Audio>('Audio')
 
 /**
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_document.html TDLib • td_api.inputMessageDocument}
@@ -77,7 +73,6 @@ export interface Document {
   readonly thumbnail: Option.Option<File.InputFile>
   readonly contentTypeDetection: boolean
 }
-export const Document: Data.Case.Constructor<Document, '_tag'> = Data.tagged<Document>('Document')
 
 /**
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_video.html TDLib • td_api.inputMessageVideo}
@@ -97,7 +92,6 @@ export interface Video {
   readonly startAt: Option.Option<Duration.Duration>
   readonly supportsStreaming: boolean
 }
-export const Video: Data.Case.Constructor<Video, '_tag'> = Data.tagged<Video>('Video')
 
 /**
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_animation.html TDLib • td_api.inputMessageAnimation}
@@ -114,7 +108,6 @@ export interface Animation {
   readonly height: Option.Option<number>
   readonly thumbnail: Option.Option<File.InputFile>
 }
-export const Animation: Data.Case.Constructor<Animation, '_tag'> = Data.tagged<Animation>('Animation')
 
 /**
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_voice_note.html TDLib • td_api.inputMessageVoiceNote}
@@ -126,7 +119,6 @@ export interface Voice {
   readonly caption: Option.Option<Text_.Text>
   readonly duration: Option.Option<Duration.Duration>
 }
-export const Voice: Data.Case.Constructor<Voice, '_tag'> = Data.tagged<Voice>('Voice')
 
 /**
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_video_note.html TDLib • td_api.inputMessageVideoNote}
@@ -139,7 +131,6 @@ export interface VideoNote {
   readonly diameter: Option.Option<number>
   readonly thumbnail: Option.Option<File.InputFile>
 }
-export const VideoNote: Data.Case.Constructor<VideoNote, '_tag'> = Data.tagged<VideoNote>('VideoNote')
 
 /**
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_location.html TDLib • td_api.inputMessageLocation}
@@ -154,7 +145,6 @@ export interface Location {
   readonly heading: Option.Option<number>
   readonly proximityAlertRadius: Option.Option<number>
 }
-export const Location: Data.Case.Constructor<Location, '_tag'> = Data.tagged<Location>('Location')
 
 /**
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_venue.html TDLib • td_api.inputMessageVenue}
@@ -171,7 +161,6 @@ export interface Venue {
   readonly googlePlaceId: Option.Option<string>
   readonly googlePlaceType: Option.Option<string>
 }
-export const Venue: Data.Case.Constructor<Venue, '_tag'> = Data.tagged<Venue>('Venue')
 
 /**
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_contact.html TDLib • td_api.inputMessageContact}
@@ -184,7 +173,6 @@ export interface Contact {
   readonly lastName: Option.Option<string>
   readonly vcard: Option.Option<string>
 }
-export const Contact: Data.Case.Constructor<Contact, '_tag'> = Data.tagged<Contact>('Contact')
 
 /**
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_dice.html TDLib • td_api.inputMessageDice}
@@ -194,7 +182,6 @@ export interface Dice {
   readonly _tag: 'Dice'
   readonly emoji: '🎲' | '🎯' | '🏀' | '⚽' | '🎳' | '🎰'
 }
-export const Dice: Data.Case.Constructor<Dice, '_tag'> = Data.tagged<Dice>('Dice')
 
 /**
  * @see {@link https://core.telegram.org/tdlib/docs/classtd_1_1td__api_1_1input_message_sticker.html TDLib • td_api.inputMessageSticker}
@@ -205,7 +192,6 @@ export interface Sticker {
   readonly file: File.FileId | File.External | File.InputFile
   readonly emoji: Option.Option<string>
 }
-export const Sticker: Data.Case.Constructor<Sticker, '_tag'> = Data.tagged<Sticker>('Sticker')
 
 // ——— Constructors ——————————————————————————————————————————————————————————
 
@@ -214,7 +200,8 @@ export const text = (
   options?: {
     linkPreview?: LinkPreview.LinkPreview
   },
-): Text => Text({
+): Text => ({
+  _tag: 'Text',
   text,
   linkPreview: Option.fromNullable(options?.linkPreview),
 })
@@ -226,7 +213,8 @@ export const photo = (
     layout?: 'caption-above' | 'caption-below'
     spoiler?: boolean
   },
-): Photo => Photo({
+): Photo => ({
+  _tag: 'Photo',
   file,
   caption: Option.fromNullable(options.caption),
   layout: options.layout ?? 'caption-below',
@@ -242,7 +230,8 @@ export const audio = (
     title?: string
     thumbnail?: File.InputFile
   },
-): Audio => Audio({
+): Audio => ({
+  _tag: 'Audio',
   file,
   caption: Option.fromNullable(options.caption),
   duration: Option.fromNullable(options.duration),
@@ -258,7 +247,8 @@ export const document = (
     thumbnail?: File.InputFile
     contentTypeDetection?: boolean
   },
-): Document => Document({
+): Document => ({
+  _tag: 'Document',
   file,
   caption: Option.fromNullable(options.caption),
   thumbnail: Option.fromNullable(options.thumbnail),
@@ -279,7 +269,8 @@ export const video = (
     startAt?: Duration.Duration
     supportsStreaming?: boolean
   },
-): Video => Video({
+): Video => ({
+  _tag: 'Video',
   file,
   caption: Option.fromNullable(options.caption),
   layout: options.layout ?? 'caption-below',
@@ -304,7 +295,8 @@ export const animation = (
     height?: number
     thumbnail?: File.InputFile
   },
-): Animation => Animation({
+): Animation => ({
+  _tag: 'Animation',
   file,
   caption: Option.fromNullable(options.caption),
   layout: options.layout ?? 'caption-below',
@@ -321,7 +313,8 @@ export const voice = (
     caption?: Text_.Text
     duration?: Duration.Duration
   },
-): Voice => Voice({
+): Voice => ({
+  _tag: 'Voice',
   file,
   caption: Option.fromNullable(options.caption),
   duration: Option.fromNullable(options.duration),
@@ -334,7 +327,8 @@ export const videoNote = (
     diameter?: number
     thumbnail?: File.InputFile
   },
-): VideoNote => VideoNote({
+): VideoNote => ({
+  _tag: 'VideoNote',
   file,
   duration: Option.fromNullable(options.duration),
   diameter: Option.fromNullable(options.diameter),
@@ -345,7 +339,8 @@ export const location = (options: {
   latitude: number
   longitude: number
   uncertaintyRadius?: number
-}): Location => Location({
+}): Location => ({
+  _tag: 'Location',
   latitude: options.latitude,
   longitude: options.longitude,
   uncertaintyRadius: Option.fromNullable(options.uncertaintyRadius),
@@ -361,7 +356,8 @@ export const liveLocation = (options: {
   livePeriod: Duration.Duration
   heading?: number
   proximityAlertRadius?: number
-}): Location => Location({
+}): Location => ({
+  _tag: 'Location',
   latitude: options.latitude,
   longitude: options.longitude,
   uncertaintyRadius: Option.fromNullable(options.uncertaintyRadius),
@@ -379,7 +375,8 @@ export const venue = (options: {
   foursquareType?: string
   googlePlaceId?: string
   googlePlaceType?: string
-}): Venue => Venue({
+}): Venue => ({
+  _tag: 'Venue',
   latitude: options.latitude,
   longitude: options.longitude,
   title: options.title,
@@ -395,16 +392,17 @@ export const contact = (options: {
   firstName: string
   lastName?: string
   vcard?: string
-}): Contact => Contact({
+}): Contact => ({
+  _tag: 'Contact',
   phoneNumber: options.phoneNumber,
   firstName: options.firstName,
   lastName: Option.fromNullable(options.lastName),
   vcard: Option.fromNullable(options.vcard),
 })
 
-export const dice = (emoji: Dice['emoji']): Dice => Dice({ emoji })
+export const dice = (emoji: Dice['emoji']): Dice => ({ _tag: 'Dice', emoji })
 
 export const sticker = (
   file: File.FileId | File.External | File.InputFile,
   emoji?: string,
-): Sticker => Sticker({ file, emoji: Option.fromNullable(emoji) })
+): Sticker => ({ _tag: 'Sticker', file, emoji: Option.fromNullable(emoji) })

From 3cdf003619d87026f6343f951bbc93c8d53fc118 Mon Sep 17 00:00:00 2001
From: evermake <vladeryabkin@gmail.com>
Date: Wed, 11 Mar 2026 10:49:21 +0500
Subject: [PATCH 09/10] refactor `Text`

---
 src/Text.ts | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/Text.ts b/src/Text.ts
index 60d4826..3dfe141 100644
--- a/src/Text.ts
+++ b/src/Text.ts
@@ -1,6 +1,5 @@
 import type { TgxElement } from '@grom.js/tgx'
 import type { Types } from './BotApi.ts'
-import * as Data from 'effect/Data'
 
 /**
  * Formatted text.
@@ -16,35 +15,31 @@ export interface Plain {
   readonly text: string
   readonly entities?: Array<Types.MessageEntity>
 }
-export const Plain: Data.Case.Constructor<Plain, '_tag'> = Data.tagged<Plain>('Plain')
 
 export interface Html {
   readonly _tag: 'Html'
   readonly html: string
 }
-export const Html: Data.Case.Constructor<Html, '_tag'> = Data.tagged<Html>('Html')
 
 export interface Markdown {
   readonly _tag: 'Markdown'
   readonly markdown: string
 }
-export const Markdown: Data.Case.Constructor<Markdown, '_tag'> = Data.tagged<Markdown>('Markdown')
 
 export interface Tgx {
   readonly _tag: 'Tgx'
   readonly tgx: TgxElement
 }
-export const Tgx: Data.Case.Constructor<Tgx, '_tag'> = Data.tagged<Tgx>('Tgx')
 
 // ———— Constructors ———————————————————————————————————————————————————————————
 
 export const plain = (
   text: string,
   entities?: Array<Types.MessageEntity>,
-): Plain => Plain({ text, entities })
+): Plain => ({ _tag: 'Plain', text, entities })
 
-export const html = (html: string): Html => Html({ html })
+export const html = (html: string): Html => ({ _tag: 'Html', html })
 
-export const markdown = (markdown: string): Markdown => Markdown({ markdown })
+export const markdown = (markdown: string): Markdown => ({ _tag: 'Markdown', markdown })
 
-export const tgx = (tgx: TgxElement): Tgx => Tgx({ tgx })
+export const tgx = (tgx: TgxElement): Tgx => ({ _tag: 'Tgx', tgx })

From 7a5be03b254be55047451c41eb9ccd8c01180044 Mon Sep 17 00:00:00 2001
From: evermake <vladeryabkin@gmail.com>
Date: Wed, 11 Mar 2026 11:05:15 +0500
Subject: [PATCH 10/10] revert remaining change

---
 src/Bot.ts             |  6 +++--
 src/BotApi.ts          |  6 +++--
 src/BotApiError.ts     | 53 +++++++++++++++---------------------------
 src/BotApiTransport.ts |  6 +++--
 src/BotApiUrl.ts       |  6 +++--
 src/Send.ts            | 22 ++++++++++--------
 6 files changed, 47 insertions(+), 52 deletions(-)

diff --git a/src/Bot.ts b/src/Bot.ts
index bc9c74e..2029db5 100644
--- a/src/Bot.ts
+++ b/src/Bot.ts
@@ -4,8 +4,10 @@ import * as Context from 'effect/Context'
 
 export type Bot<E = never, R = never> = Effect.Effect<void, E, R | Update>
 
-export interface Update { readonly _: unique symbol }
-export const Update: Context.Tag<Update, BotApi.Types.Update> = Context.GenericTag<Update, BotApi.Types.Update>('@grom.js/effect-tg/Bot/Update')
+export class Update extends Context.Tag('@grom.js/effect-tg/Bot/Update')<
+  Update,
+  BotApi.Types.Update
+>() {}
 
 export interface Middleware {
   <E, R>(self: Bot<E, R>): Bot<any, any>
diff --git a/src/BotApi.ts b/src/BotApi.ts
index e189a1a..4addbe3 100644
--- a/src/BotApi.ts
+++ b/src/BotApi.ts
@@ -19,8 +19,10 @@ import * as internal from './internal/botApi.ts'
 
 export type { MethodParams, MethodResults, Service, Types }
 
-export interface BotApi { readonly _: unique symbol }
-export const BotApi: Context.Tag<BotApi, Service> = Context.GenericTag<BotApi, Service>('@grom.js/effect-tg/BotApi')
+export class BotApi extends Context.Tag('@grom.js/effect-tg/BotApi')<
+  BotApi,
+  Service
+>() {}
 
 export interface BotApiMethod<TMethod extends keyof MethodParams> {
   (...args: MethodArgs<TMethod>): Effect.Effect<
diff --git a/src/BotApiError.ts b/src/BotApiError.ts
index 25cb291..b0a0561 100644
--- a/src/BotApiError.ts
+++ b/src/BotApiError.ts
@@ -25,15 +25,13 @@ export type BotApiError =
 /**
  * Error caused by the transport when accessing Bot API.
  */
-const TransportError_base: ReturnType<typeof Data.TaggedError<'TransportError'>> = Data.TaggedError('TransportError')
-// eslint-disable-next-line ts/no-unsafe-declaration-merging
-export interface TransportError { readonly [TypeId]: TypeId }
-// eslint-disable-next-line ts/no-unsafe-declaration-merging
-export class TransportError extends TransportError_base<{
+export class TransportError extends Data.TaggedError('TransportError')<{
   cause:
     | HttpClientError.HttpClientError
     | HttpBody.HttpBodyError
 }> {
+  readonly [TypeId]: TypeId = TypeId
+
   override get message(): string {
     return Match.value(this.cause).pipe(
       Match.tagsExhaustive({
@@ -49,58 +47,45 @@ export class TransportError extends TransportError_base<{
     )
   }
 }
-Object.defineProperty(TransportError.prototype, TypeId, { value: TypeId })
 
-const MethodFailed_base: ReturnType<typeof Data.TaggedError<'MethodFailed'>> = Data.TaggedError('MethodFailed')
-// eslint-disable-next-line ts/no-unsafe-declaration-merging
-export interface MethodFailed { readonly [TypeId]: TypeId }
-// eslint-disable-next-line ts/no-unsafe-declaration-merging
-export class MethodFailed extends MethodFailed_base<{
+export class MethodFailed extends Data.TaggedError('MethodFailed')<{
   response: FailureResponse
   possibleReason: MethodFailureReason
 }> {
-  override get message(): string {
+  readonly [TypeId]: TypeId = TypeId
+
+  override get message() {
     return `(${this.response.error_code}) ${this.response.description}`
   }
 }
-Object.defineProperty(MethodFailed.prototype, TypeId, { value: TypeId })
 
-const GroupUpgraded_base: ReturnType<typeof Data.TaggedError<'GroupUpgraded'>> = Data.TaggedError('GroupUpgraded')
-// eslint-disable-next-line ts/no-unsafe-declaration-merging
-export interface GroupUpgraded { readonly [TypeId]: TypeId }
-// eslint-disable-next-line ts/no-unsafe-declaration-merging
-export class GroupUpgraded extends GroupUpgraded_base<{
+export class GroupUpgraded extends Data.TaggedError('GroupUpgraded')<{
   response: FailureResponse
   supergroup: Dialog.Supergroup
 }> {
-  override get message(): string {
+  readonly [TypeId]: TypeId = TypeId
+
+  override get message() {
     return `Group has been upgraded to a supergroup with ID ${this.supergroup.id}.`
   }
 }
-Object.defineProperty(GroupUpgraded.prototype, TypeId, { value: TypeId })
 
-const RateLimited_base: ReturnType<typeof Data.TaggedError<'RateLimited'>> = Data.TaggedError('RateLimited')
-// eslint-disable-next-line ts/no-unsafe-declaration-merging
-export interface RateLimited { readonly [TypeId]: TypeId }
-// eslint-disable-next-line ts/no-unsafe-declaration-merging
-export class RateLimited extends RateLimited_base<{
+export class RateLimited extends Data.TaggedError('RateLimited')<{
   response: FailureResponse
   retryAfter: Duration.Duration
 }> {
-  override get message(): string {
+  readonly [TypeId]: TypeId = TypeId
+
+  override get message() {
     return `Flood limit exceeded. Should wait for ${Duration.format(this.retryAfter)} before retrying.`
   }
 }
-Object.defineProperty(RateLimited.prototype, TypeId, { value: TypeId })
 
-const InternalServerError_base: ReturnType<typeof Data.TaggedError<'InternalServerError'>> = Data.TaggedError('InternalServerError')
-// eslint-disable-next-line ts/no-unsafe-declaration-merging
-export interface InternalServerError { readonly [TypeId]: TypeId }
-// eslint-disable-next-line ts/no-unsafe-declaration-merging
-export class InternalServerError extends InternalServerError_base<{
+export class InternalServerError extends Data.TaggedError('InternalServerError')<{
   response: FailureResponse
-}> {}
-Object.defineProperty(InternalServerError.prototype, TypeId, { value: TypeId })
+}> {
+  readonly [TypeId]: TypeId = TypeId
+}
 
 export const fromResponse = (response: FailureResponse): BotApiError => {
   if (response.error_code === 429 && response.parameters?.retry_after != null) {
diff --git a/src/BotApiTransport.ts b/src/BotApiTransport.ts
index 53af030..a1cfdae 100644
--- a/src/BotApiTransport.ts
+++ b/src/BotApiTransport.ts
@@ -7,8 +7,10 @@ import * as Layer from 'effect/Layer'
 import * as BotApiUrl from './BotApiUrl.ts'
 import * as internal from './internal/botApiTransport.ts'
 
-export interface BotApiTransport { readonly _: unique symbol }
-export const BotApiTransport: Context.Tag<BotApiTransport, Service> = Context.GenericTag<BotApiTransport, Service>('@grom.js/effect-tg/BotApiTransport')
+export class BotApiTransport extends Context.Tag('@grom.js/effect-tg/BotApiTransport')<
+  BotApiTransport,
+  Service
+>() {}
 
 export interface Service {
   sendRequest: (
diff --git a/src/BotApiUrl.ts b/src/BotApiUrl.ts
index 9e4d766..b70297b 100644
--- a/src/BotApiUrl.ts
+++ b/src/BotApiUrl.ts
@@ -1,7 +1,9 @@
 import * as Context from 'effect/Context'
 
-export interface BotApiUrl { readonly _: unique symbol }
-export const BotApiUrl: Context.Tag<BotApiUrl, Service> = Context.GenericTag<BotApiUrl, Service>('@grom.js/effect-tg/BotApiUrl')
+export class BotApiUrl extends Context.Tag('@grom.js/effect-tg/BotApiUrl')<
+  BotApiUrl,
+  Service
+>() {}
 
 export interface Service {
   toMethod: (method: string) => URL
diff --git a/src/Send.ts b/src/Send.ts
index 93a879c..0a5f04a 100644
--- a/src/Send.ts
+++ b/src/Send.ts
@@ -36,16 +36,6 @@ export const sendMessage: (params: {
   BotApi.BotApi
 > = internal.sendMessage
 
-// =============================================================================
-// TargetDialog
-// =============================================================================
-
-/**
- * Target dialog for sending messages.
- */
-export interface TargetDialog { readonly _: unique symbol }
-export const TargetDialog: Context.Tag<TargetDialog, Dialog.Dialog | Dialog.DialogId> = Context.GenericTag<TargetDialog, Dialog.Dialog | Dialog.DialogId>('@grom.js/effect-tg/Send/TargetDialog')
-
 // =============================================================================
 // MessageToSend
 // =============================================================================
@@ -119,6 +109,18 @@ export const message = (content: Content.Content, params?: {
   return self
 }
 
+// =============================================================================
+// TargetDialog
+// =============================================================================
+
+/**
+ * Target dialog for sending messages.
+ */
+export class TargetDialog extends Context.Tag('@grom.js/effect-tg/Send/TargetDialog')<
+  TargetDialog,
+  Dialog.Dialog | Dialog.DialogId
+>() {}
+
 /**
  * Provides the target dialog for sending messages.
  */