Migrate to new @welshman/domain + instance-based @welshman/app API

Adopts the rewritten welshman API: the removed @welshman/util helpers
(Profile/List/Room/Handler/Encryptable) are now Reader/Builder classes in
@welshman/domain, and @welshman/app dropped its global singletons for an App
instance + app.use(Plugin) registry.

- src/app/welshman.ts is now the app bootstrap + session-state module (one shared
  App instance, multi-account sessions/login, app-wide reactive views) rather than
  a compat shim re-exporting the old globals.
- Rewrote ~100 callers to use app.use(Plugin) directly (thunks, profiles, relays,
  rooms, zaps, tags, wot, feeds, sync); thunk helpers are now thunk methods.
- Added @welshman/domain dependency.
- Resolved residual gaps (storage hydration via plugin.onItem/wrapManager/Plaintext,
  relay-list mutators, search-relay list, outbox #d filter).

Best-effort: no toolchain/linking available, so this is not build- or
type-checked. Remaining judgment calls are flagged with TODO(welshman-migration).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BsMjvv7krpZeHK1Njeneru

package.json

@@ -74,6 +74,7 @@
     "@vite-pwa/sveltekit": "^1.1.0",
     "@welshman/app": "^0.8.16",
     "@welshman/content": "^0.8.16",
+    "@welshman/domain": "^0.8.16",
     "@welshman/editor": "^0.8.16",
     "@welshman/feeds": "^0.8.16",
     "@welshman/lib": "^0.8.16",

src/app/call/voice.ts

@@ -18,7 +18,7 @@ import {derived, get} from "svelte/store"
 import {map, not, nthEq, reject, removeUndefined, uniqBy} from "@welshman/lib"
 import type {TrustedEvent} from "@welshman/util"
 import {makeHttpAuth, makeHttpAuthHeader, getTags} from "@welshman/util"
-import {signer} from "@welshman/app"
+import {signer} from "@app/welshman"
 import {load} from "@welshman/net"
 import {getLivekitEndpoint} from "$lib/livekit"
 import {AbortError, TimeoutError, whenAborted, whenTimeout} from "$lib/util"

src/app/chats.ts

@@ -2,7 +2,8 @@ import {DELETE, PROFILE, getPubkeyTagValues} from "@welshman/util"
 import type {TrustedEvent} from "@welshman/util"
 import {append, call, on, reject, remove, sort, sortBy, spec, uniq, uniqBy} from "@welshman/lib"
 import type {Override} from "@welshman/lib"
-import {createSearch, displayProfileByPubkey, pubkey, repository} from "@welshman/app"
+import {Profiles} from "@welshman/app"
+import {app, createSearch, pubkey, repository} from "@app/welshman"
 import {derived, readable} from "svelte/store"
 import {DM_KINDS} from "@app/content"
 import type {RepositoryUpdate} from "@welshman/net"
@@ -35,6 +36,8 @@ export const chatsById = call(() => {
   const chatsByPubkey = new Map<string, string[]>()
 
   const addSearchText = (chat: Override<Chat, {search_text?: string}>) => {
+    const displayProfileByPubkey = (pk: string) => app.use(Profiles).display(pk).get()
+
     chat.search_text =
       chat.pubkeys.length === 1
         ? displayProfileByPubkey(chat.pubkeys[0]) + " note to self"

src/app/comments.ts

@@ -1,6 +1,7 @@
 import type {TrustedEvent} from "@welshman/util"
 import {COMMENT, makeEvent} from "@welshman/util"
-import {publishThunk, tagEventForComment} from "@welshman/app"
+import {Thunks, Tags} from "@welshman/app"
+import {app} from "@app/welshman"
 
 export type CommentParams = {
   event: TrustedEvent
@@ -10,7 +11,7 @@ export type CommentParams = {
 }
 
 export const makeComment = ({url, event, content, tags = []}: CommentParams) =>
-  makeEvent(COMMENT, {content, tags: [...tags, ...tagEventForComment(event, url)]})
+  makeEvent(COMMENT, {content, tags: [...tags, ...app.use(Tags).tagEventForComment(event, url)]})
 
 export const publishComment = ({relays, ...params}: CommentParams & {relays: string[]}) =>
-  publishThunk({event: makeComment({url: relays[0], ...params}), relays})
+  app.use(Thunks).publish({event: makeComment({url: relays[0], ...params}), relays})

src/app/components/AppContainer.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import type {Snippet} from "svelte"
-  import {pubkey} from "@welshman/app"
+  import {pubkey} from "@app/welshman"
   import Dialog from "@lib/components/Dialog.svelte"
   import Landing from "@app/components/Landing.svelte"
   import Toast from "@app/components/Toast.svelte"

src/app/components/CalendarEventActions.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import type {TrustedEvent, EventContent} from "@welshman/util"
   import {getTagValue, getAddress} from "@welshman/util"
-  import {pubkey} from "@welshman/app"
+  import {pubkey} from "@app/welshman"
   import Pen2 from "@assets/icons/pen-2.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"

src/app/components/CalendarEventForm.svelte

@@ -3,7 +3,8 @@
   import {writable} from "svelte/store"
   import {randomId, HOUR} from "@welshman/lib"
   import {makeEvent, EVENT_TIME} from "@welshman/util"
-  import {publishThunk, waitForThunkError} from "@welshman/app"
+  import {app} from "@app/welshman"
+  import {Thunks} from "@welshman/app"
   import {preventDefault} from "@lib/html"
   import {daysBetween} from "@lib/util"
   import GallerySend from "@assets/icons/gallery-send.svg?dataurl"
@@ -107,8 +108,8 @@
       }
 
       const event = makeEvent(EVENT_TIME, {content, tags})
-      const calendarThunk = publishThunk({event, relays: [url]})
+      const calendarThunk = app.use(Thunks).publish({event, relays: [url]})
-      const error = await waitForThunkError(calendarThunk)
+      const error = await calendarThunk.waitForError()
 
       if (error) {
         return pushToast({theme: "error", message: error})

src/app/components/Chat.svelte

@@ -26,14 +26,10 @@
     DIRECT_MESSAGE,
     DIRECT_MESSAGE_FILE,
   } from "@welshman/util"
-  import {
+  import {app, pubkey} from "@app/welshman"
-    pubkey,
+  import {Tags, Wraps, Thunks, MessagingRelayLists} from "@welshman/app"
-    tagPubkey,
+
-    sendWrapped,
+  const messagingRelayListsByPubkey = app.use(MessagingRelayLists).index.$
-    mergeThunks,
-    loadMessagingRelayList,
-    messagingRelayListsByPubkey,
-  } from "@welshman/app"
   import Danger from "@assets/icons/danger-triangle.svg?dataurl"
   import ArrowLeft from "@assets/icons/arrow-left.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
@@ -96,7 +92,7 @@
 
   const onSubmit = async (params: EventContent) => {
     try {
-      const ptags = remove($pubkey!, pubkeys).map(tagPubkey)
+      const ptags = remove($pubkey!, pubkeys).map(pk => app.use(Tags).tagPubkey(pk))
 
       // Remove p tags since they result in forking the conversation
       params.tags = params.tags.filter(nthNe(0, "p"))
@@ -109,7 +105,7 @@
           return
         }
 
-        await sendWrapped({
+        await app.use(Wraps).publish({
           event: makeDelete({event: eventToEdit, protect: false}),
           recipients: pubkeys,
           pow: 16,
@@ -158,7 +154,7 @@
       // Sleep 1 second between each one to make sure timestamps are distinct
       const thunks = await Promise.all(
         Array.from(enumerate(templates)).map(([i, event]) =>
-          sendWrapped({
+          app.use(Wraps).publish({
             event,
             recipients: pubkeys,
             delay: $userSettingsValues.send_delay + ms(i),
@@ -171,7 +167,7 @@
         timeout: 30_000,
         children: {
           component: ThunkToast,
-          props: {thunk: mergeThunks(thunks)},
+          props: {thunk: app.use(Thunks).merge(thunks)},
         },
       })
     } finally {
@@ -234,7 +230,7 @@
 
   onMount(() => {
     for (const pubkey of others) {
-      loadMessagingRelayList(pubkey)
+      app.use(MessagingRelayLists).load(pubkey)
     }
   })
 

src/app/components/ChatComposeParent.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import type {TrustedEvent} from "@welshman/util"
-  import {displayProfileByPubkey} from "@welshman/app"
+  import {app} from "@app/welshman"
+  import {Profiles} from "@welshman/app"
   import {slide} from "@lib/transition"
   import CloseCircle from "@assets/icons/close-circle.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
@@ -21,7 +22,7 @@
 <div
   class="relative border-l-2 border-solid border-primary bg-base-300 px-2 py-1 pr-8"
   transition:slide>
-  <p class="text-xs text-primary">{verb} @{displayProfileByPubkey(event.pubkey)}</p>
+  <p class="text-xs text-primary">{verb} @{app.use(Profiles).display(event.pubkey).get()}</p>
   {#key event.id}
     <NoteContentMinimal trimParent {event} />
   {/key}

src/app/components/ChatEnable.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
-  import {getRelaysFromList} from "@welshman/util"
+  import {app, userRelayList} from "@app/welshman"
-  import {waitForThunkError, setMessagingRelays, userRelayList, setRelays} from "@welshman/app"
+  import {RelayLists, MessagingRelayLists} from "@welshman/app"
   import {preventDefault} from "@lib/html"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
   import AltArrowRight from "@assets/icons/alt-arrow-right.svg?dataurl"
@@ -29,8 +29,10 @@
     loading = true
 
     try {
-      if (getRelaysFromList($userRelayList).length === 0) {
+      if (($userRelayList?.urls() ?? []).length === 0) {
-        const error = await waitForThunkError(await setRelays(DEFAULT_RELAYS.map(r => ["r", r])))
+        const error = await (
+          await app.use(RelayLists).setRelays(DEFAULT_RELAYS.map(r => ["r", r]))
+        ).waitForError()
 
         if (error) {
           pushToast({theme: "error", message: error})
@@ -38,7 +40,9 @@
         }
       }
 
-      const error = await waitForThunkError(await setMessagingRelays(DEFAULT_MESSAGING_RELAYS))
+      const error = await (
+        await app.use(MessagingRelayLists).setUrls(DEFAULT_MESSAGING_RELAYS)
+      ).waitForError()
 
       if (error) {
         pushToast({theme: "error", message: error})

src/app/components/ChatItem.svelte

@@ -3,7 +3,8 @@
   import {page} from "$app/stores"
   import {remove, uniq, formatTimestamp} from "@welshman/lib"
   import type {TrustedEvent} from "@welshman/util"
-  import {pubkey, loadMessagingRelayList} from "@welshman/app"
+  import {app, pubkey} from "@app/welshman"
+  import {MessagingRelayLists} from "@welshman/app"
   import {fade} from "@lib/transition"
   import Button from "@lib/components/Button.svelte"
   import ProfileName from "@app/components/ProfileName.svelte"
@@ -28,7 +29,7 @@
 
   onMount(() => {
     for (const pk of others) {
-      loadMessagingRelayList(pk)
+      app.use(MessagingRelayLists).load(pk)
     }
   })
 </script>

src/app/components/ChatMessage.svelte

@@ -2,7 +2,8 @@
   import {type Instance} from "tippy.js"
   import {hash, formatTimestampAsTime} from "@welshman/lib"
   import type {TrustedEvent, EventContent} from "@welshman/util"
-  import {thunks, mergeThunks, pubkey, deriveProfileDisplay, sendWrapped} from "@welshman/app"
+  import {app, thunks, pubkey} from "@app/welshman"
+  import {Thunks, Profiles, Wraps} from "@welshman/app"
   import {isMobile} from "@lib/html"
   import MenuDots from "@assets/icons/menu-dots.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
@@ -33,18 +34,18 @@
   const {event, replyTo, canEdit, onEdit, pubkeys, showPubkey = false}: Props = $props()
 
   const isOwn = event.pubkey === $pubkey
-  const profileDisplay = deriveProfileDisplay(event.pubkey)
+  const profileDisplay = app.use(Profiles).display(event.pubkey).$
-  const thunk = mergeThunks($thunks.filter(t => t.event.id === event.id))
+  const thunk = app.use(Thunks).merge($thunks.filter(t => t.event.id === event.id))
   const [_, colorValue] = colors[hash(event.pubkey) % colors.length]
 
   const reply = () => replyTo(event)
   const edit = canEdit?.(event) ? () => onEdit?.(event) : undefined
 
   const deleteReaction = (event: TrustedEvent) =>
-    sendWrapped({event: makeDelete({event, protect: false}), recipients: pubkeys, pow: 16})
+    app.use(Wraps).publish({event: makeDelete({event, protect: false}), recipients: pubkeys, pow: 16})
 
   const createReaction = (template: EventContent) =>
-    sendWrapped({
+    app.use(Wraps).publish({
       event: makeReaction({event, protect: false, ...template}),
       recipients: pubkeys,
       pow: 16,

src/app/components/ChatMessageEmojiButton.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import type {NativeEmoji} from "emoji-picker-element/shared"
   import type {TrustedEvent} from "@welshman/util"
-  import {sendWrapped} from "@welshman/app"
+  import {app} from "@app/welshman"
+  import {Wraps} from "@welshman/app"
   import SmileCircle from "@assets/icons/smile-circle.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import EmojiButton from "@lib/components/EmojiButton.svelte"
@@ -15,7 +16,7 @@
   const {event, pubkeys}: Props = $props()
 
   const onEmoji = (emoji: NativeEmoji) =>
-    sendWrapped({
+    app.use(Wraps).publish({
       event: makeReaction({event, content: emoji.unicode, protect: false}),
       recipients: pubkeys,
       pow: 16,

src/app/components/ChatMessageMenuMobile.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import type {NativeEmoji} from "emoji-picker-element/shared"
   import type {TrustedEvent} from "@welshman/util"
-  import {sendWrapped} from "@welshman/app"
+  import {app} from "@app/welshman"
+  import {Wraps} from "@welshman/app"
   import SmileCircle from "@assets/icons/smile-circle.svg?dataurl"
   import Pen from "@assets/icons/pen.svg?dataurl"
   import Reply from "@assets/icons/reply-2.svg?dataurl"
@@ -28,7 +29,7 @@
 
   const onEmoji = ((event: TrustedEvent, pubkeys: string[], emoji: NativeEmoji) => {
     history.back()
-    sendWrapped({
+    app.use(Wraps).publish({
       event: makeReaction({event, content: emoji.unicode, protect: false}),
       recipients: pubkeys,
       pow: 16,

src/app/components/ChatStart.svelte

@@ -4,7 +4,8 @@
   import {writable} from "svelte/store"
   import {tryCatch, uniq} from "@welshman/lib"
   import {fromNostrURI} from "@welshman/util"
-  import {loadMessagingRelayList} from "@welshman/app"
+  import {app} from "@app/welshman"
+  import {MessagingRelayLists} from "@welshman/app"
   import {preventDefault} from "@lib/html"
   import Field from "@lib/components/Field.svelte"
   import Button from "@lib/components/Button.svelte"
@@ -34,7 +35,7 @@
   let pubkeys: string[] = $state([])
 
   $effect(() => {
-    pubkeys.forEach(pubkey => loadMessagingRelayList(pubkey))
+    pubkeys.forEach(pubkey => app.use(MessagingRelayLists).load(pubkey))
   })
 
   onMount(() => {

src/app/components/ClassifiedActions.svelte

@@ -2,7 +2,7 @@
   import {uniq} from "@welshman/lib"
   import type {TrustedEvent, EventContent} from "@welshman/util"
   import {getTagValue, getTagValues, getAddress} from "@welshman/util"
-  import {pubkey} from "@welshman/app"
+  import {pubkey} from "@app/welshman"
   import Pen2 from "@assets/icons/pen-2.svg?dataurl"
   import {normalizeTopic} from "@lib/util"
   import Link from "@lib/components/Link.svelte"

src/app/components/ClassifiedForm.svelte

@@ -2,7 +2,8 @@
   import type {Snippet} from "svelte"
   import {removeUndefined, randomId, uniq} from "@welshman/lib"
   import {makeEvent, CLASSIFIED} from "@welshman/util"
-  import {publishThunk, waitForThunkError} from "@welshman/app"
+  import {app} from "@app/welshman"
+  import {Thunks} from "@welshman/app"
   import {isMobile, preventDefault} from "@lib/html"
   import {normalizeTopic} from "@lib/util"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
@@ -118,12 +119,12 @@
         }
       }
 
-      const classifiedThunk = publishThunk({
+      const classifiedThunk = app.use(Thunks).publish({
         relays: [url],
         event: makeEvent(CLASSIFIED, {content, tags}),
       })
 
-      const error = await waitForThunkError(classifiedThunk)
+      const error = await classifiedThunk.waitForError()
 
       if (error) {
         return pushToast({theme: "error", message: error})

src/app/components/ContentLinkBlockImage.svelte

@@ -9,7 +9,7 @@
     tagsFromIMeta,
     makeBlossomAuthEvent,
   } from "@welshman/util"
-  import {signer} from "@welshman/app"
+  import {signer} from "@app/welshman"
   import LinkRound from "@assets/icons/link-round.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
 

src/app/components/ContentMention.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import {removeUndefined} from "@welshman/lib"
   import type {ProfilePointer} from "@welshman/content"
-  import {deriveProfileDisplay} from "@welshman/app"
+  import {app} from "@app/welshman"
+  import {Profiles} from "@welshman/app"
   import Button from "@lib/components/Button.svelte"
   import ProfileDetail from "@app/components/ProfileDetail.svelte"
   import {pushModal} from "@app/modal"
@@ -13,7 +14,7 @@
 
   const {value, url}: Props = $props()
 
-  const display = deriveProfileDisplay(value.pubkey, removeUndefined([url]))
+  const display = app.use(Profiles).display(value.pubkey, removeUndefined([url])).$
 
   const openProfile = () => pushModal(ProfileDetail, {pubkey: value.pubkey, url})
 </script>

src/app/components/ContentQuote.svelte

@@ -6,6 +6,7 @@
   import Button from "@lib/components/Button.svelte"
   import Spinner from "@lib/components/Spinner.svelte"
   import NoteCard from "@app/components/NoteCard.svelte"
+  import NoteContent from "@app/components/NoteContent.svelte"
   import NoteContentMinimal from "@app/components/NoteContentMinimal.svelte"
   import {deriveEvent} from "@app/repository"
   import {entityLink} from "@app/env"
@@ -43,7 +44,9 @@
 
 <Button class="my-2 block w-full max-w-full text-left" {onclick}>
   {#if $quote}
-    {#if $quote.kind === MESSAGE}
+    {#if $quote.content.trim().match(/^(nostr:)?nevent1[a-z0-9]+$/)}
+      <NoteContent {url} event={$quote} />
+    {:else if $quote.kind === MESSAGE}
       <div
         class="border-l-2 border-solid border-l-primary py-1 pl-2 opacity-90"
         style="background-color: color-mix(in srgb, var(--color-primary) 10%, var(--color-base-300) 90%);">

src/app/components/CurrencyInput.svelte

@@ -4,7 +4,7 @@
   import type {Writable} from "svelte/store"
   import type {Instance} from "tippy.js"
   import {preventDefault} from "@lib/html"
-  import {createSearch} from "@welshman/app"
+  import {createSearch} from "@app/welshman"
   import {currencyOptions, displayCurrency} from "@lib/currency"
   import Suggestions from "@lib/components/Suggestions.svelte"
   import CurrencySuggestion from "@app/components/CurrencySuggestion.svelte"

src/app/components/EventActivity.svelte

@@ -5,7 +5,7 @@
   import {load} from "@welshman/net"
   import {deriveArray, deriveEventsById} from "@welshman/store"
   import type {TrustedEvent} from "@welshman/util"
-  import {repository} from "@welshman/app"
+  import {repository} from "@app/welshman"
   import {deriveChecked} from "@app/notifications"
   import Reply from "@assets/icons/reply-2.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"

src/app/components/EventInfo.svelte

@@ -4,7 +4,7 @@
   import {LOCALE, secondsToDate} from "@welshman/lib"
   import type {TrustedEvent} from "@welshman/util"
   import {displayRelayUrl} from "@welshman/util"
-  import {tracker} from "@welshman/app"
+  import {tracker} from "@app/welshman"
   import FileText from "@assets/icons/file-text.svg?dataurl"
   import Copy from "@assets/icons/copy.svg?dataurl"
   import UserCircle from "@assets/icons/user-circle.svg?dataurl"

src/app/components/EventMenu.svelte

@@ -4,7 +4,8 @@
   import {goto} from "$app/navigation"
   import type {TrustedEvent} from "@welshman/util"
   import {COMMENT, ManagementMethod} from "@welshman/util"
-  import {pubkey, repository, relaysByUrl, manageRelay} from "@welshman/app"
+  import {app, pubkey, repository, relaysByUrl} from "@app/welshman"
+  import {RelayManagement} from "@welshman/app"
   import ShareCircle from "@assets/icons/share-circle.svg?dataurl"
   import Code2 from "@assets/icons/code-2.svg?dataurl"
   import TrashBin2 from "@assets/icons/trash-bin-2.svg?dataurl"
@@ -56,7 +57,7 @@
       title: `Delete ${noun}`,
       message: `Are you sure you want to delete this ${noun.toLowerCase()} from the space?`,
       confirm: async () => {
-        const {error} = await manageRelay(url, {
+        const {error} = await app.use(RelayManagement).post(url, {
           method: ManagementMethod.BanEvent,
           params: [event.id],
         })

src/app/components/EventReply.svelte

@@ -1,15 +1,17 @@
 <script lang="ts">
   import {onMount} from "svelte"
   import {writable} from "svelte/store"
+  import type {TrustedEvent} from "@welshman/util"
   import {isMobile, preventDefault} from "@lib/html"
   import {fly} from "@lib/transition"
   import Paperclip from "@assets/icons/paperclip-2.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import EditorContent from "@app/editor/EditorContent.svelte"
+  import ChatComposeParent from "@app/components/ChatComposeParent.svelte"
   import {publishComment} from "@app/comments"
   import {canEnforceNip70} from "@app/relays"
-  import {PROTECTED} from "@app/groups"
+  import {PROTECTED, prependParent} from "@app/groups"
   import {makeEditor} from "@app/editor"
   import {DraftKey} from "@app/drafts"
   import {pushToast} from "@app/toast"
@@ -18,8 +20,17 @@
     content?: string | object
   }
 
-  const {url, event, onClose, onSubmit} = $props()
+  type Props = {
-  const draftKey = new DraftKey<Values>(`reply:${event.id}`)
+    url: string
+    event: TrustedEvent
+    parent?: TrustedEvent
+    onClose: () => void
+    onClearParent?: () => void
+    onSubmit: (thunk: unknown) => void
+  }
+
+  const {url, event, parent, onClose, onClearParent, onSubmit}: Props = $props()
+  const draftKey = new DraftKey<Values>(`reply:${event.id}:${parent?.id || ""}`)
   const initialValues = draftKey.get()
   const shouldProtect = canEnforceNip70(url)
   const uploading = writable(false)
@@ -31,8 +42,8 @@
     if ($uploading) return
 
     const ed = await editor
-    const content = ed.getText({blockSeparator: "\n"}).trim()
+    let content = ed.getText({blockSeparator: "\n"}).trim()
-    const tags = ed.storage.nostr.getEditorTags()
+    let tags = ed.storage.nostr.getEditorTags()
 
     if (await shouldProtect) {
       tags.push(PROTECTED)
@@ -45,6 +56,10 @@
       })
     }
 
+    if (parent) {
+      ;({content, tags} = prependParent(parent, {content, tags}, url))
+    }
+
     draftKey.clear()
     onSubmit(publishComment({event, content, tags, relays: [url]}))
   }
@@ -87,6 +102,9 @@
   onsubmit={preventDefault(submit)}
   class="left-content bottom-sai right-sai fixed z-feature mb-14 md:mb-0 w-full md:w-auto pr-2">
   <div class="card2 mx-2 my-2 bg-alt shadow-md">
+    {#if parent}
+      <ChatComposeParent event={parent} clear={() => onClearParent?.()} verb="Replying to" />
+    {/if}
     <div class="relative">
       <div class="note-editor grow overflow-hidden">
         <EditorContent {autofocus} {editor} />

src/app/components/GoalCreate.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import {writable} from "svelte/store"
   import {makeEvent, ZAP_GOAL} from "@welshman/util"
-  import {publishThunk, waitForThunkError} from "@welshman/app"
+  import {app} from "@app/welshman"
+  import {Thunks} from "@welshman/app"
   import {isMobile, preventDefault} from "@lib/html"
   import Paperclip from "@assets/icons/paperclip-2.svg?dataurl"
   import Bolt from "@assets/icons/bolt.svg?dataurl"
@@ -93,12 +94,12 @@
         tags.push(["h", h])
       }
 
-      const goalThunk = publishThunk({
+      const goalThunk = app.use(Thunks).publish({
         relays: [url],
         event: makeEvent(ZAP_GOAL, {content: title, tags}),
       })
 
-      const error = await waitForThunkError(goalThunk)
+      const error = await goalThunk.waitForError()
 
       if (error) {
         return pushToast({theme: "error", message: error})

src/app/components/GoalSummary.svelte

@@ -2,8 +2,10 @@
   import {now, DAY, uniq, sum} from "@welshman/lib"
   import type {Zap, TrustedEvent} from "@welshman/util"
   import {getTagValue, fromMsats, ZAP_RESPONSE} from "@welshman/util"
-  import {deriveItemsByKey, deriveArray} from "@welshman/store"
+  import {derived} from "svelte/store"
-  import {repository, getValidZap} from "@welshman/app"
+  import {deriveEvents} from "@welshman/store"
+  import {app, repository} from "@app/welshman"
+  import {Zappers} from "@welshman/app"
   import Bolt from "@assets/icons/bolt.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import ZapButton from "@app/components/ZapButton.svelte"
@@ -16,13 +18,15 @@
 
   const {url, event, ...props}: Props = $props()
 
-  const zaps = deriveArray(
+  // Validated zaps for this goal. `validZapReceipts` is a reactive Projection
-    deriveItemsByKey<Zap>({
+  // (resolves recipient zappers from loaded profiles); we re-derive it whenever
-      repository,
+  // the set of ZAP_RESPONSE events in the repository changes.
-      getKey: zap => zap.response.id,
+  const zapReceipts = deriveEvents({repository, filters: [{kinds: [ZAP_RESPONSE], "#e": [event.id]}]})
-      filters: [{kinds: [ZAP_RESPONSE], "#e": [event.id]}],
+  const zaps = derived(
-      eventToItem: (response: TrustedEvent) => getValidZap(response, event),
+    zapReceipts,
-    }),
+    ($receipts: TrustedEvent[], set) =>
+      app.use(Zappers).validZapReceipts($receipts, event).$.subscribe(set),
+    [] as Zap[],
   )
 
   const goalAmount = parseInt(getTagValue("amount", event.tags) || "0")

src/app/components/IconPicker.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {createSearch} from "@welshman/app"
+  import {createSearch} from "@app/welshman"
   import Icon from "@lib/components/Icon.svelte"
   import Magnifier from "@assets/icons/magnifier.svg?dataurl"
 

src/app/components/InfoKeys.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {session} from "@welshman/app"
+  import {session} from "@app/welshman"
   import Link from "@lib/components/Link.svelte"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
   import CheckCircle from "@assets/icons/check-circle.svg?dataurl"

src/app/components/InfoZapperError.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
-  import {deriveZapperForPubkey} from "@welshman/app"
+  import {app} from "@app/welshman"
+  import {Zappers} from "@welshman/app"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
@@ -12,7 +13,7 @@
 
   const {pubkey} = $props()
 
-  const zapper = deriveZapperForPubkey(pubkey)
+  const zapper = app.use(Zappers).forPubkey(pubkey).$
 
   const back = () => history.back()
 </script>

src/app/components/KeyRecoveryConfirm.svelte

@@ -1,8 +1,14 @@
 <script lang="ts">
   import {Client} from "@pomade/core"
   import {getPubkey} from "@welshman/util"
-  import type {SessionPomade} from "@welshman/app"
+  import {session} from "@app/welshman"
-  import {session} from "@welshman/app"
+  // TODO(welshman-migration): `SessionPomade` was removed from @welshman/app; the
+  // new generic Session nests its descriptor under `.data` ({clientOptions, email}),
+  // whereas this code destructures `email`/`clientOptions` from the top level.
+  // Confirm whether flotilla's FlotillaSession still surfaces these at the top
+  // level (loginWithPomade stores them under `.data` via toSession) and adjust the
+  // destructuring accordingly. Local type kept loose to avoid a broken import.
+  type SessionPomade = {email: string; clientOptions: {secret: string; peers: any}}
   import {preventDefault} from "@lib/html"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
   import AltArrowRight from "@assets/icons/alt-arrow-right.svg?dataurl"

src/app/components/KeyRecoveryRequest.svelte

@@ -1,7 +1,12 @@
 <script lang="ts">
   import {Client} from "@pomade/core"
-  import type {SessionPomade} from "@welshman/app"
+  import {session} from "@app/welshman"
-  import {session} from "@welshman/app"
+  // TODO(welshman-migration): `SessionPomade` was removed from @welshman/app; the
+  // new generic Session nests its descriptor under `.data` ({clientOptions, email}),
+  // whereas this code destructures from the top level. Confirm whether flotilla's
+  // FlotillaSession still surfaces these at the top level and adjust accordingly.
+  // Local type kept loose to avoid a broken import.
+  type SessionPomade = {email: string; clientOptions: {peers: any}}
   import {preventDefault} from "@lib/html"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
   import AltArrowRight from "@assets/icons/alt-arrow-right.svg?dataurl"

src/app/components/LogIn.svelte

@@ -2,7 +2,7 @@
   import {onMount} from "svelte"
   import {Capacitor} from "@capacitor/core"
   import {getNip07, getNip55, Nip55Signer} from "@welshman/signer"
-  import {addSession, type Session, makeNip07Session, makeNip55Session} from "@welshman/app"
+  import {addSession, type FlotillaSession, makeNip07Session, makeNip55Session} from "@app/welshman"
   import Widget from "@assets/icons/widget-4.svg?dataurl"
   import Letter from "@assets/icons/letter.svg?dataurl"
   import Cpu from "@assets/icons/cpu-bolt.svg?dataurl"
@@ -32,8 +32,8 @@
 
   const signUp = () => pushModal(SignUp)
 
-  const onSuccess = async (session: Session) => {
+  const onSuccess = async (session: FlotillaSession, pubkey: string) => {
-    addSession(session)
+    addSession({...session, pubkey})
     setChecked("*")
     clearModals()
   }
@@ -45,7 +45,7 @@
       const pubkey = await getNip07()?.getPublicKey()
 
       if (pubkey) {
-        await onSuccess(makeNip07Session(pubkey))
+        await onSuccess(makeNip07Session(pubkey), pubkey)
       } else {
         pushToast({
           theme: "error",
@@ -65,7 +65,7 @@
       const pubkey = await signer.getPubkey()
 
       if (pubkey) {
-        await onSuccess(makeNip55Session(pubkey, app.packageName))
+        await onSuccess(makeNip55Session(pubkey, app.packageName), pubkey)
       } else {
         pushToast({
           theme: "error",

src/app/components/LogInBunker.svelte

@@ -4,7 +4,7 @@
   import type {Nip46ResponseWithResult} from "@welshman/signer"
   import {Nip46Broker} from "@welshman/signer"
   import {makeSecret} from "@welshman/util"
-  import {loginWithNip01, loginWithNip46} from "@welshman/app"
+  import {loginWithNip01, loginWithNip46} from "@app/welshman"
   import {preventDefault} from "@lib/html"
   import Spinner from "@lib/components/Spinner.svelte"
   import Button from "@lib/components/Button.svelte"

src/app/components/LogInKey.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import {bytesToHex} from "@welshman/lib"
-  import {loginWithNip01} from "@welshman/app"
+  import {loginWithNip01} from "@app/welshman"
   import {decrypt} from "nostr-tools/nip49"
   import {preventDefault} from "@lib/html"
   import {nsecDecode} from "@lib/util"
@@ -56,7 +56,7 @@
         })
       }
 
-      loginWithNip01(secret)
+      await loginWithNip01(secret)
       setChecked("*")
       clearModals()
     } catch (e) {

src/app/components/LogInSelect.svelte

@@ -76,7 +76,7 @@
           onclick={() => selectAccount(option)}
           disabled={loading}
           class="card2 bg-alt flex w-full items-center p-3 text-left">
-          <Profile pubkey={option.pubkey} />
+          <Profile inert pubkey={option.pubkey} />
         </Button>
       {/each}
     </div>

src/app/components/MenuSettings.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import {Capacitor} from "@capacitor/core"
-  import {pubkey} from "@welshman/app"
+  import {pubkey} from "@app/welshman"
   import Server from "@assets/icons/server.svg?dataurl"
   import GalleryMinimalistic from "@assets/icons/gallery-minimalistic.svg?dataurl"
   import Shield from "@assets/icons/shield-minimalistic.svg?dataurl"

src/app/components/NoteContentMinimalGoal.svelte

@@ -3,8 +3,10 @@
   import {sum} from "@welshman/lib"
   import type {Zap, TrustedEvent} from "@welshman/util"
   import {getTagValue, fromMsats, ZAP_RESPONSE} from "@welshman/util"
-  import {deriveItemsByKey, deriveArray} from "@welshman/store"
+  import {derived} from "svelte/store"
-  import {repository, getValidZap} from "@welshman/app"
+  import {deriveEvents} from "@welshman/store"
+  import {app, repository} from "@app/welshman"
+  import {Zappers} from "@welshman/app"
   import Bolt from "@assets/icons/bolt.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import ContentMinimal from "@app/components/ContentMinimal.svelte"
@@ -14,13 +16,14 @@
   const content = getTagValue("summary", props.event.tags)
   const fakeEvent = {content, tags: props.event.tags}
 
-  const zaps = deriveArray(
+  // Validated zaps for this goal (reactive Projection, re-derived as the set of
-    deriveItemsByKey<Zap>({
+  // ZAP_RESPONSE events in the repository changes).
-      repository,
+  const zapReceipts = deriveEvents({repository, filters: [{kinds: [ZAP_RESPONSE], "#e": [props.event.id]}]})
-      getKey: zap => zap.response.id,
+  const zaps = derived(
-      filters: [{kinds: [ZAP_RESPONSE], "#e": [props.event.id]}],
+    zapReceipts,
-      eventToItem: (response: TrustedEvent) => getValidZap(response, props.event),
+    ($receipts: TrustedEvent[], set) =>
-    }),
+      app.use(Zappers).validZapReceipts($receipts, props.event).$.subscribe(set),
+    [] as Zap[],
   )
 
   const goalAmount = parseInt(getTagValue("amount", props.event.tags) || "0")

src/app/components/PasswordReset.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import {Client} from "@pomade/core"
   import type {SessionPomade} from "@welshman/app"
-  import {session} from "@welshman/app"
+  import {session} from "@app/welshman"
   import {preventDefault} from "@lib/html"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
   import AltArrowRight from "@assets/icons/alt-arrow-right.svg?dataurl"

src/app/components/PasswordResetConfirm.svelte

@@ -1,7 +1,12 @@
 <script lang="ts">
   import {Client} from "@pomade/core"
-  import {session} from "@welshman/app"
+  import {session} from "@app/welshman"
-  import type {SessionPomade} from "@welshman/app"
+  // TODO(welshman-migration): `SessionPomade` was removed from @welshman/app; the
+  // new generic Session nests its descriptor under `.data` ({clientOptions, email}),
+  // whereas this code destructures `email` from the top level. Confirm whether
+  // flotilla's FlotillaSession still surfaces `email` at the top level and adjust.
+  // Local type kept loose to avoid a broken import.
+  type SessionPomade = {email: string}
   import {preventDefault} from "@lib/html"
   import Key from "@assets/icons/key.svg?dataurl"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"

src/app/components/PollCreate.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import {insertAt, now, randomId, removeAt, removeUndefined} from "@welshman/lib"
   import {makeEvent, POLL} from "@welshman/util"
-  import {publishThunk, waitForThunkError} from "@welshman/app"
+  import {Thunks} from "@welshman/app"
+  import {app} from "@app/welshman"
   import {isMobile, preventDefault} from "@lib/html"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
   import HamburgerMenu from "@assets/icons/hamburger-menu.svg?dataurl"
@@ -142,12 +143,12 @@
         tags.push(PROTECTED)
       }
 
-      const pollThunk = publishThunk({
+      const pollThunk = app.use(Thunks).publish({
         relays: [url],
         event: makeEvent(POLL, {content: title.trim(), tags}),
       })
 
-      const error = await waitForThunkError(pollThunk)
+      const error = await pollThunk.waitForError()
 
       if (error) {
         return pushToast({theme: "error", message: error})

src/app/components/PollVotes.svelte

@@ -2,7 +2,9 @@
   import {onDestroy} from "svelte"
   import type {TrustedEvent} from "@welshman/util"
   import {POLL_RESPONSE} from "@welshman/util"
-  import {pubkey, publishThunk, abortThunk} from "@welshman/app"
+  import type {Thunk} from "@welshman/app"
+  import {Thunks} from "@welshman/app"
+  import {pubkey, app} from "@app/welshman"
   import {formatTimestampRelative} from "@welshman/lib"
   import {deriveEvents} from "@app/repository"
   import {pushToast} from "@app/toast"
@@ -50,7 +52,7 @@
 
   const publishSelection = (selection: string[]) => {
     if (activeThunk) {
-      abortThunk(activeThunk)
+      activeThunk.abort()
     }
 
     if (selection.length === 0) {
@@ -58,7 +60,7 @@
       return
     }
 
-    activeThunk = publishThunk({
+    activeThunk = app.use(Thunks).publish({
       relays: [url],
       event: makePollResponse({event, selectedIds: selection}),
       delay: publishDelay,
@@ -92,7 +94,7 @@
   }
 
   let selectedIds = $state<string[]>([])
-  let activeThunk: ReturnType<typeof publishThunk> | undefined
+  let activeThunk: Thunk | undefined
 
   $effect(() => {
     if (ownResponse) {
@@ -102,7 +104,7 @@
 
   onDestroy(() => {
     if (activeThunk) {
-      abortThunk(activeThunk)
+      activeThunk.abort()
     }
   })
 </script>

src/app/components/PomadeSessions.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import {onMount} from "svelte"
   import {Client} from "@pomade/core"
-  import {session, isPomadeSession} from "@welshman/app"
+  import {session, isPomadeSession} from "@app/welshman"
   import MenuDots from "@assets/icons/menu-dots.svg?dataurl"
   import {fly} from "@lib/transition"
   import Icon from "@lib/components/Icon.svelte"

src/app/components/PrimaryNav.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import type {Snippet} from "svelte"
-  import {userProfile} from "@welshman/app"
+  import {userProfile} from "@app/welshman"
   import Letter from "@assets/icons/letter.svg?dataurl"
   import Magnifier from "@assets/icons/magnifier.svg?dataurl"
   import Widget from "@assets/icons/widget-4.svg?dataurl"
@@ -41,8 +41,8 @@
     {/if}
     <div class="flex flex-col">
       <PrimaryNavItem title="Settings" href="/settings/profile" prefix="/settings">
-        {#if $userProfile?.picture}
+        {#if $userProfile?.picture()}
-          <ImageIcon alt="Settings" src={$userProfile?.picture} class="rounded-full" size={10} />
+          <ImageIcon alt="Settings" src={$userProfile?.picture()} class="rounded-full" size={10} />
         {:else}
           <ImageIcon alt="Settings" src={UserRounded} class="rounded-full" size={8} />
         {/if}
@@ -86,8 +86,8 @@
       {/if}
     </div>
     <PrimaryNavItem title="Settings" onclick={showSettingsMenu}>
-      {#if $userProfile?.picture}
+      {#if $userProfile?.picture()}
-        <ImageIcon alt="Settings" src={$userProfile?.picture} size={10} class="rounded-full" />
+        <ImageIcon alt="Settings" src={$userProfile?.picture()} size={10} class="rounded-full" />
       {:else}
         <ImageIcon alt="Settings" src={Settings} size={8} class="rounded-full" />
       {/if}

src/app/components/PrimaryNavItemSpace.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
-  import {deriveRelayDisplay} from "@welshman/app"
+  import {Relays} from "@welshman/app"
+  import {app} from "@app/welshman"
   import PrimaryNavItem from "@lib/components/PrimaryNavItem.svelte"
   import RelayIcon from "@app/components/RelayIcon.svelte"
   import {makeSpacePath, goToSpace} from "@app/routes"
@@ -15,7 +16,7 @@
 
   const path = makeSpacePath(url)
 
-  const display = $derived(deriveRelayDisplay(url))
+  const display = $derived(app.use(Relays).display(url).$)
 </script>
 
 <PrimaryNavItem

src/app/components/Profile.svelte

@@ -1,8 +1,9 @@
 <script lang="ts">
   import * as nip19 from "nostr-tools/nip19"
   import {removeUndefined} from "@welshman/lib"
-  import {displayPubkey} from "@welshman/util"
+  import {displayPubkey, displayNip05} from "@welshman/util"
-  import {deriveHandleForPubkey, displayHandle, deriveProfileDisplay} from "@welshman/app"
+  import {Handles, Profiles} from "@welshman/app"
+  import {app} from "@app/welshman"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import ProfileCircle from "@app/components/ProfileCircle.svelte"
@@ -23,8 +24,8 @@
   const {pubkey, url, showPubkey, inert, avatarSize = 10}: Props = $props()
 
   const relays = removeUndefined([url])
-  const profileDisplay = deriveProfileDisplay(pubkey, relays)
+  const profileDisplay = app.use(Profiles).display(pubkey, relays).$
-  const handle = deriveHandleForPubkey(pubkey)
+  const handle = app.use(Handles).forPubkey(pubkey).$
 
   const openProfile = () => {
     pushModal(ProfileDetail, {pubkey, url})
@@ -58,7 +59,7 @@
     </div>
     {#if $handle}
       <div class="overflow-hidden text-ellipsis text-sm opacity-75">
-        {displayHandle($handle)}
+        {displayNip05($handle?.nip05)}
       </div>
     {/if}
     {#if showPubkey}

src/app/components/ProfileBadges.svelte

@@ -6,7 +6,8 @@
   import {deriveEventsDesc, deriveEventsById} from "@welshman/store"
   import {formatTimestampRelative} from "@welshman/lib"
   import {NOTE, ROOMS, COMMENT, MESSAGE} from "@welshman/util"
-  import {repository, loadRelayList} from "@welshman/app"
+  import {RelayLists} from "@welshman/app"
+  import {repository, app} from "@app/welshman"
   import Button from "@lib/components/Button.svelte"
   import ProfileSpaces from "@app/components/ProfileSpaces.svelte"
   import {deriveGroupList, getSpaceUrlsFromGroupList} from "@app/groups"
@@ -30,7 +31,7 @@
 
   onMount(async () => {
     // Make sure we have their relay selections before we load their posts
-    await loadRelayList(pubkey)
+    await app.use(RelayLists).load(pubkey)
 
     // Load groups and at least one note, regardless of time frame
     load({

src/app/components/ProfileCircle.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import cx from "classnames"
   import {removeUndefined} from "@welshman/lib"
-  import {deriveProfile} from "@welshman/app"
+  import {Profiles} from "@welshman/app"
+  import {app} from "@app/welshman"
   import UserRounded from "@assets/icons/user-rounded.svg?dataurl"
   import ImageIcon from "@lib/components/ImageIcon.svelte"
 
@@ -14,11 +15,11 @@
 
   const {pubkey, url, size = 7, ...props}: Props = $props()
 
-  const profile = deriveProfile(pubkey, removeUndefined([url]))
+  const profile = app.use(Profiles).one(pubkey, removeUndefined([url]))
 </script>
 
 <ImageIcon
   {size}
   alt=""
   class={cx(props.class, "rounded-full")}
-  src={$profile?.picture || UserRounded} />
+  src={$profile?.picture() || UserRounded} />

src/app/components/ProfileCircles.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import cx from "classnames"
-  import {getProfile, loadProfile} from "@welshman/app"
+  import {Profiles} from "@welshman/app"
+  import {app} from "@app/welshman"
   import {isMobile} from "@lib/html"
   import ProfileCircle from "@app/components/ProfileCircle.svelte"
 
@@ -23,11 +24,11 @@
   )
 
   for (const pubkey of pubkeys) {
-    loadProfile(pubkey)
+    app.use(Profiles).load(pubkey)
   }
 
   const visiblePubkeys = $derived.by(() => {
-    const filtered = pubkeys.filter(pubkey => getProfile(pubkey)?.picture)
+    const filtered = pubkeys.filter(pubkey => app.use(Profiles).get(pubkey)?.picture())
 
     return filtered.length > 0 ? filtered : pubkeys.slice(0, 1)
   })

src/app/components/ProfileDelete.svelte

@@ -1,15 +1,9 @@
 <script lang="ts">
   import {chunk, sleep, uniq} from "@welshman/lib"
-  import {
+  import {makeEvent, DELETE, isReplaceable, getAddress} from "@welshman/util"
-    makeEvent,
+  import {ProfileBuilder} from "@welshman/domain"
-    createProfile,
+  import {Thunks, RelayLists} from "@welshman/app"
-    PROFILE,
+  import {pubkey, repository, app} from "@app/welshman"
-    DELETE,
-    isReplaceable,
-    getAddress,
-    RelayMode,
-  } from "@welshman/util"
-  import {pubkey, publishThunk, repository, derivePubkeyRelays} from "@welshman/app"
   import {preventDefault} from "@lib/html"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
   import AltArrowRight from "@assets/icons/alt-arrow-right.svg?dataurl"
@@ -31,7 +25,7 @@
   let confirmText = $state("")
 
   const CONFIRM_TEXT = "permanently delete my nostr account"
-  const userWriteRelays = derivePubkeyRelays($pubkey!, RelayMode.Write)
+  const userWriteRelays = app.use(RelayLists).writeUrls($pubkey!).$
   const confirmOk = $derived(confirmText.toLowerCase().trim() === CONFIRM_TEXT)
   const showProgress = $derived(progress !== undefined)
 
@@ -44,7 +38,7 @@
     }
 
     const chunks = chunk(500, repository.query([{authors: [$pubkey!]}]))
-    const profileEvent = makeEvent(PROFILE, createProfile({name: "[deleted]"}))
+    const profileEvent = await new ProfileBuilder().update({name: "[deleted]"}).toTemplate()
     const vanishEvent = makeEvent(62, {tags: [["relay", "ALL_RELAYS"]]})
     const denominator = chunks.length + 2
     const relays = uniq([...INDEXER_RELAYS, ...$userWriteRelays, ...$userSpaceUrls])
@@ -58,12 +52,12 @@
     }
 
     // First, blank out their profile in case relays don't support deletion by address
-    await publishThunk({relays, event: profileEvent})
+    await app.use(Thunks).publish({relays, event: profileEvent})
 
     await incrementProgress()
 
     // Next, send a "right to vanish" event to all relays
-    await publishThunk({relays, event: vanishEvent})
+    await app.use(Thunks).publish({relays, event: vanishEvent})
 
     await incrementProgress()
 
@@ -79,7 +73,7 @@
         }
       }
 
-      await publishThunk({relays, event: makeEvent(DELETE, {tags})})
+      await app.use(Thunks).publish({relays, event: makeEvent(DELETE, {tags})})
 
       await incrementProgress()
     }

src/app/components/ProfileDetail.svelte

@@ -2,12 +2,8 @@
   import {onMount} from "svelte"
   import {removeUndefined} from "@welshman/lib"
   import {ManagementMethod} from "@welshman/util"
-  import {
+  import {RelayManagement, Profiles, MessagingRelayLists} from "@welshman/app"
-    manageRelay,
+  import {app} from "@app/welshman"
-    deriveProfile,
-    displayProfileByPubkey,
-    loadMessagingRelayList,
-  } from "@welshman/app"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
   import Code2 from "@assets/icons/code-2.svg?dataurl"
   import Letter from "@assets/icons/letter-opened.svg?dataurl"
@@ -41,7 +37,7 @@
 
   const {pubkey, url}: Props = $props()
 
-  const profile = deriveProfile(pubkey, removeUndefined([url]))
+  const profile = app.use(Profiles).one(pubkey, removeUndefined([url]))
 
   const userIsAdmin = deriveUserIsSpaceAdmin(url)
 
@@ -66,9 +62,9 @@
   const banMember = () =>
     pushModal(Confirm, {
       title: "Ban User",
-      message: `Are you sure you want to ban @${displayProfileByPubkey(pubkey)} from the space?`,
+      message: `Are you sure you want to ban @${app.use(Profiles).display(pubkey).get()} from the space?`,
       confirm: async () => {
-        const {error} = await manageRelay(url!, {
+        const {error} = await app.use(RelayManagement).post(url!, {
           method: ManagementMethod.BanPubkey,
           params: [pubkey],
         })
@@ -96,7 +92,7 @@
   let showMenu = $state(false)
 
   onMount(() => {
-    loadMessagingRelayList(pubkey)
+    app.use(MessagingRelayLists).load(pubkey)
   })
 </script>
 

src/app/components/ProfileEdit.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
-  import type {Profile} from "@welshman/util"
+  import {Profile, ProfileBuilder} from "@welshman/domain"
-  import {makeProfile} from "@welshman/util"
+  import {pubkey, profilesByPubkey} from "@app/welshman"
-  import {pubkey, profilesByPubkey, waitForThunkError} from "@welshman/app"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
   import {errorMessage} from "@lib/util"
   import Icon from "@lib/components/Icon.svelte"
@@ -12,16 +11,28 @@
   import {pushToast} from "@app/toast"
   import {updateProfile} from "@app/profiles"
 
-  const profile = $profilesByPubkey.get($pubkey!) || makeProfile()
+  // The edit form binds to plain mutable fields (name/about/nip05/picture), so we
+  // hand it a plain values object rather than a Profile Reader. A Reader exposes its
+  // raw parsed content as `.values`; a fresh profile starts from an empty builder.
+  const reader = $profilesByPubkey.get($pubkey!)
+  const profile = reader instanceof Profile ? {...reader.values} : new ProfileBuilder().update({}).values
   const initialValues = {profile}
 
   const back = () => history.back()
 
+  // TODO(welshman-migration): `profile` here is a plain values object (the form binds
+  // mutable fields), not a Profile Reader. It is typed Profile to match ProfileEditForm's
+  // Values type and updateProfile's signature, both of which still say Profile; updateProfile
+  // routes a non-Reader through `new ProfileBuilder().update(profile)`. Confirm the intended
+  // values vs Reader contract once the shared types settle.
   const onsubmit = async ({profile}: {profile: Profile}) => {
     loading = true
 
     try {
-      const error = await waitForThunkError(updateProfile({profile}))
+      // TODO(welshman-migration): updateProfile is async (returns Promise<Thunk>); the old
+      // waitForThunkError shim did not await its arg. Awaiting the thunk first before
+      // .waitForError() — confirm this matches intended behavior.
+      const error = await (await updateProfile({profile})).waitForError()
 
       if (error) {
         pushToast({

src/app/components/ProfileFeed.svelte

@@ -4,7 +4,8 @@
   import {feedFromFilter, makeIntersectionFeed, makeRelayFeed} from "@welshman/feeds"
   import {NOTE, getReplyTags} from "@welshman/util"
   import type {TrustedEvent} from "@welshman/util"
-  import {makeFeedController} from "@welshman/app"
+  import {Feeds} from "@welshman/app"
+  import {app} from "@app/welshman"
   import {createScroller} from "@lib/html"
   import {fly} from "@lib/transition"
   import Spinner from "@lib/components/Spinner.svelte"
@@ -19,7 +20,7 @@
 
   let {url, pubkey, events = $bindable([]), hideLoading = false}: Props = $props()
 
-  const ctrl = makeFeedController({
+  const ctrl = app.use(Feeds).makeFeedController({
     useWindowing: true,
     feed: makeIntersectionFeed(
       makeRelayFeed(url),

src/app/components/ProfileInfo.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import {removeUndefined} from "@welshman/lib"
-  import {deriveProfile} from "@welshman/app"
+  import {Profiles} from "@welshman/app"
+  import {app} from "@app/welshman"
   import ContentMinimal from "@app/components/ContentMinimal.svelte"
 
   export type Props = {
@@ -10,9 +11,9 @@
 
   const {pubkey, url}: Props = $props()
 
-  const profile = deriveProfile(pubkey, removeUndefined([url]))
+  const profile = app.use(Profiles).one(pubkey, removeUndefined([url]))
 </script>
 
 {#if $profile}
-  <ContentMinimal event={{content: $profile.about || "", tags: []}} />
+  <ContentMinimal event={{content: $profile.about() || "", tags: []}} />
 {/if}

src/app/components/ProfileMultiSelect.svelte

@@ -4,7 +4,7 @@
   import type {Writable} from "svelte/store"
   import {type Instance} from "tippy.js"
   import {append, remove, uniq} from "@welshman/lib"
-  import {profileSearch} from "@welshman/app"
+  import {profileSearch} from "@app/welshman"
   import Suggestions from "@lib/components/Suggestions.svelte"
   import CloseCircle from "@assets/icons/close-circle.svg?dataurl"
   import Magnifier from "@assets/icons/magnifier.svg?dataurl"

src/app/components/ProfileName.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import {removeUndefined} from "@welshman/lib"
-  import {deriveProfileDisplay} from "@welshman/app"
+  import {Profiles} from "@welshman/app"
+  import {app} from "@app/welshman"
 
   type Props = {
     pubkey: string
@@ -9,7 +10,7 @@
 
   const {pubkey, url}: Props = $props()
 
-  const profileDisplay = deriveProfileDisplay(pubkey, removeUndefined([url]))
+  const profileDisplay = app.use(Profiles).display(pubkey, removeUndefined([url])).$
 </script>
 
 {$profileDisplay}

src/app/components/ReactionSummary.svelte

@@ -17,7 +17,8 @@
   import type {TrustedEvent, EventContent, Zap} from "@welshman/util"
   import {deriveArray, deriveEventsById, deriveItemsByKey} from "@welshman/store"
   import {load} from "@welshman/net"
-  import {pubkey, repository, getValidZap, displayProfileByPubkey} from "@welshman/app"
+  import {Zappers, Profiles} from "@welshman/app"
+  import {pubkey, repository, app} from "@app/welshman"
   import {isMobile, preventDefault, stopPropagation} from "@lib/html"
   import Danger from "@assets/icons/danger-triangle.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
@@ -64,15 +65,15 @@
       repository,
       getKey: zap => zap.response.id,
       filters: [{kinds: [ZAP_RESPONSE], "#e": eventIds}],
-      eventToItem: (response: TrustedEvent) => {
+      eventToItem: async (response: TrustedEvent) => {
-        const zap = getValidZap(response, event)
+        const zap = await app.use(Zappers).validateZapReceipt(response, event)
 
         if (zap) {
           return zap
         }
 
         if (innerEvent) {
-          return getValidZap(response, innerEvent)
+          return await app.use(Zappers).validateZapReceipt(response, innerEvent)
         }
       },
     }),
@@ -150,7 +151,7 @@
       {@const amount = fromMsats(sum(zaps.map(zap => zap.invoiceAmount)))}
       {@const pubkeys = uniq(zaps.map(zap => zap.request.pubkey))}
       {@const isOwn = $pubkey && pubkeys.includes($pubkey)}
-      {@const info = displayList(pubkeys.map(pubkey => displayProfileByPubkey(pubkey)))}
+      {@const info = displayList(pubkeys.map(pubkey => app.use(Profiles).display(pubkey).get()))}
       {@const tooltip = `${info} zapped`}
       <button
         type="button"
@@ -171,7 +172,7 @@
     {#each groupedReactions.entries() as [key, events]}
       {@const pubkeys = events.map(e => e.pubkey)}
       {@const isOwn = $pubkey && pubkeys.includes($pubkey)}
-      {@const info = displayList(pubkeys.map(pubkey => displayProfileByPubkey(pubkey)))}
+      {@const info = displayList(pubkeys.map(pubkey => app.use(Profiles).display(pubkey).get()))}
       {@const tooltip = `${info} reacted`}
       {@const onClick = () => onReactionClick(events)}
       <button

src/app/components/RelayAdd.svelte

@@ -5,7 +5,7 @@
   import {tryCatch} from "@welshman/lib"
   import {isShareableRelayUrl, isIPAddress, normalizeRelayUrl} from "@welshman/util"
   import type {Thunk} from "@welshman/app"
-  import {waitForThunkError, relaySearch} from "@welshman/app"
+  import {relaySearch} from "@app/welshman"
   import {createScroller} from "@lib/html"
   import {errorMessage} from "@lib/util"
   import Magnifier from "@assets/icons/magnifier.svg?dataurl"
@@ -34,7 +34,7 @@
     loading.add(url)
 
     try {
-      const error = await waitForThunkError(await addRelay(url))
+      const error = await (await addRelay(url)).waitForError()
 
       if (error) {
         pushToast({

src/app/components/RelayDescription.svelte

@@ -1,9 +1,10 @@
 <script lang="ts">
-  import {deriveRelay} from "@welshman/app"
+  import {Relays} from "@welshman/app"
+  import {app} from "@app/welshman"
 
   const {...props} = $props()
 
-  const relay = deriveRelay(props.url)
+  const relay = app.use(Relays).one(props.url)
 </script>
 
 {#if $relay?.description}

src/app/components/RelayIcon.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
-  import {deriveRelay} from "@welshman/app"
+  import {Relays} from "@welshman/app"
+  import {app} from "@app/welshman"
   import RemoteControllerMinimalistic from "@assets/icons/remote-controller-minimalistic.svg?dataurl"
   import ImageIcon from "@lib/components/ImageIcon.svelte"
 
@@ -11,7 +12,7 @@
 
   const {url, size = 7, ...props}: Props = $props()
 
-  const relay = deriveRelay(url)
+  const relay = app.use(Relays).one(url)
 </script>
 
 {#if $relay?.icon}

src/app/components/RelayItem.svelte

@@ -4,12 +4,13 @@
   import Link from "@lib/components/Link.svelte"
   import {displayUrl} from "@welshman/lib"
   import {displayRelayUrl} from "@welshman/util"
-  import {deriveRelay, deriveRelayStats} from "@welshman/app"
+  import {Relays, RelayStats} from "@welshman/app"
+  import {app} from "@app/welshman"
 
   const {url, children} = $props()
 
-  const relay = deriveRelay(url)
+  const relay = app.use(Relays).one(url)
-  const relayStats = deriveRelayStats(url)
+  const relayStats = app.use(RelayStats).one(url)
   const connections = $derived($relayStats?.open_count || 0)
 </script>
 

src/app/components/RelayList.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
   import type {Readable} from "svelte/store"
   import {SvelteSet} from "svelte/reactivity"
-  import {waitForThunkError} from "@welshman/app"
   import type {Thunk} from "@welshman/app"
   import CloseCircle from "@assets/icons/close-circle.svg?dataurl"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
@@ -37,7 +36,7 @@
     loading.add(url)
 
     try {
-      const error = await waitForThunkError(await removeRelay(url))
+      const error = await (await removeRelay(url)).waitForError()
 
       if (error) {
         pushToast({

src/app/components/RelayName.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
-  import {deriveRelayDisplay} from "@welshman/app"
+  import {Relays} from "@welshman/app"
+  import {app} from "@app/welshman"
 
   type Props = {
     url: string
@@ -8,7 +9,7 @@
 
   const {url, ...props}: Props = $props()
 
-  const display = $derived(deriveRelayDisplay(url))
+  const display = $derived(app.use(Relays).display(url).$)
 </script>
 
 <span class={props.class}>

src/app/components/ReportDetails.svelte

@@ -2,7 +2,7 @@
   import {REPORT} from "@welshman/util"
   import type {TrustedEvent} from "@welshman/util"
   import {deriveEventsById} from "@welshman/store"
-  import {repository} from "@welshman/app"
+  import {repository} from "@app/welshman"
   import ModalHeader from "@lib/components/ModalHeader.svelte"
   import ModalTitle from "@lib/components/ModalTitle.svelte"
   import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"

src/app/components/ReportMenu.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import {getTag, ManagementMethod} from "@welshman/util"
   import type {TrustedEvent} from "@welshman/util"
-  import {pubkey, manageRelay, repository, displayProfileByPubkey} from "@welshman/app"
+  import {RelayManagement, Profiles} from "@welshman/app"
+  import {pubkey, repository, app} from "@app/welshman"
   import InboxOut from "@assets/icons/inbox-out.svg?dataurl"
   import MenuDots from "@assets/icons/menu-dots.svg?dataurl"
   import MinusCircle from "@assets/icons/minus-circle.svg?dataurl"
@@ -45,7 +46,7 @@
   }
 
   const dismissReport = async () => {
-    const {error} = await manageRelay(url, {
+    const {error} = await app.use(RelayManagement).post(url, {
       method: ManagementMethod.BanEvent,
       params: [event.id, "Dismissed by admin"],
     })
@@ -66,7 +67,7 @@
       title: `Remove Content`,
       message: `Are you sure you want to delete this content from the space?`,
       confirm: async () => {
-        const {error} = await manageRelay(url, {
+        const {error} = await app.use(RelayManagement).post(url, {
           method: ManagementMethod.BanEvent,
           params: [id, reason],
         })
@@ -89,9 +90,9 @@
 
     pushModal(Confirm, {
       title: "Ban User",
-      message: `Are you sure you want to ban @${displayProfileByPubkey(pubkey)} from the space?`,
+      message: `Are you sure you want to ban @${app.use(Profiles).display(pubkey).get()} from the space?`,
       confirm: async () => {
-        const {error} = await manageRelay(url, {
+        const {error} = await app.use(RelayManagement).post(url, {
           method: ManagementMethod.BanPubkey,
           params: [pubkey, reason],
         })

src/app/components/RoomComposeParent.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import type {TrustedEvent} from "@welshman/util"
-  import {displayProfileByPubkey} from "@welshman/app"
+  import {Profiles} from "@welshman/app"
+  import {app} from "@app/welshman"
   import {slide} from "@lib/transition"
   import CloseCircle from "@assets/icons/close-circle.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
@@ -21,7 +22,7 @@
 <div
   class="relative border-l-2 border-solid border-primary bg-base-300 px-2 py-1 pr-8"
   transition:slide>
-  <p class="text-xs text-primary">{verb} @{displayProfileByPubkey(event.pubkey)}</p>
+  <p class="text-xs text-primary">{verb} @{app.use(Profiles).display(event.pubkey).get()}</p>
   {#key event.id}
     <NoteContentMinimal trimParent {event} />
   {/key}

src/app/components/RoomDetail.svelte

@@ -1,9 +1,9 @@
 <script lang="ts">
   import {goto} from "$app/navigation"
-  import type {RoomMeta} from "@welshman/util"
+  import {displayRelayUrl} from "@welshman/util"
-  import {displayRelayUrl, makeRoomMeta} from "@welshman/util"
   import type {Thunk} from "@welshman/app"
-  import {deleteRoom, waitForThunkError, repository, joinRoom, leaveRoom} from "@welshman/app"
+  import {Rooms} from "@welshman/app"
+  import {repository, app} from "@app/welshman"
   import Pen from "@assets/icons/pen.svg?dataurl"
   import TrashBin2 from "@assets/icons/trash-bin-2.svg?dataurl"
   import Login3 from "@assets/icons/login-3.svg?dataurl"
@@ -71,11 +71,13 @@
 
   const startEdit = () => pushModal(RoomEdit, {url, h})
 
-  const handleLoading = async (f: (url: string, room: RoomMeta) => Thunk) => {
+  const handleLoading = async (
+    f: (url: string, room: {h: string}) => Promise<Thunk>,
+  ) => {
     loading = true
 
     try {
-      const message = await waitForThunkError(f(url, makeRoomMeta({h})))
+      const message = await (await f(url, {h})).waitForError()
 
       if (message && !message.startsWith("duplicate:")) {
         pushToast({theme: "error", message})
@@ -85,9 +87,9 @@
     }
   }
 
-  const join = () => handleLoading(joinRoom)
+  const join = () => handleLoading((url, room) => app.use(Rooms).join(url, room))
 
-  const leave = () => handleLoading(leaveRoom)
+  const leave = () => handleLoading((url, room) => app.use(Rooms).leave(url, room))
 
   const showMembers = () => pushModal(RoomMembers, {url, h})
 
@@ -109,8 +111,8 @@
       message:
         "This room will no longer be accessible to space members, and all messages posted to it will be deleted.",
       confirm: async () => {
-        const thunk = deleteRoom(url, $room)
+        const thunk = await app.use(Rooms).delete(url, $room)
-        const message = await waitForThunkError(thunk)
+        const message = await thunk.waitForError()
 
         if (message) {
           repository.removeEvent(thunk.event.id)

src/app/components/RoomForm.svelte

@@ -1,8 +1,7 @@
 <script lang="ts">
   import type {Snippet} from "svelte"
-  import type {RoomMeta} from "@welshman/util"
+  import {Rooms} from "@welshman/app"
-  import {makeRoomMeta} from "@welshman/util"
+  import {app} from "@app/welshman"
-  import {waitForThunkError, createRoom, editRoom, joinRoom} from "@welshman/app"
   import StickerSmileSquare from "@assets/icons/sticker-smile-square.svg?dataurl"
   import Hashtag from "@assets/icons/hashtag.svg?dataurl"
   import Volume from "@assets/icons/volume.svg?dataurl"
@@ -19,6 +18,56 @@
   import {deriveHasLivekit} from "@app/relays"
   import {getRoomType, RoomType} from "@app/groups"
 
+  // Plain mutable form object (the old @welshman/util `RoomMeta` plain-object
+  // type, removed in the migration). The new domain `RoomMeta` is an async
+  // method-accessor Reader, which doesn't fit a `$state` object bound to inputs,
+  // so we keep a plain object here and let `app.use(Rooms).create/edit/join`
+  // (which accept a plain object) build the events at submit time.
+  type RoomMeta = {
+    h: string
+    name?: string
+    about?: string
+    picture?: string
+    pictureMeta?: string[]
+    isClosed?: boolean
+    isHidden?: boolean
+    isPrivate?: boolean
+    isRestricted?: boolean
+    livekit?: boolean
+  }
+
+  // TODO(welshman-migration): reimplemented inline from the removed
+  // @welshman/util `generateH`/`makeRoomMeta` (room-id generator). Verify the
+  // generated id still matches the expected `^[a-z]+[1-9]$` shape and that no
+  // shared generator should be used instead.
+  const vowels = "a,e,i,o,u,ay,ey,oy,ou,ia,ea,ough,oo,ee,argh".split(",")
+
+  const consonants =
+    "p,b,t,d,k,g,ch,sh,th,f,v,s,z,l,r,m,n,pl,bl,cl,gl,pr,br,tr,dr,kr,gr,fl,sl,fr,thr,str,sk,sp,st".split(
+      ",",
+    )
+
+  const generateH = () => {
+    const n = (6 + Math.random() * 2) | 0
+    const s = [consonants.slice(), vowels.slice()]
+
+    if (Math.random() < 0.5) {
+      s.reverse()
+    }
+
+    return (
+      Array.from({length: n}, (_, i) =>
+        s[i % 2].splice((Math.random() * s[i % 2].length) | 0, 1),
+      ).join("") +
+      (1 + Math.floor(Math.random() * 9))
+    )
+  }
+
+  const makeRoomMeta = (room: Partial<RoomMeta> = {}): RoomMeta => ({
+    h: room.h ?? generateH(),
+    ...room,
+  })
+
   type Props = {
     url: string
     header: Snippet
@@ -58,19 +107,22 @@
       room.pictureMeta = result.tags
     }
 
-    const createMessage = await waitForThunkError(createRoom(url, room))
+    // TODO(welshman-migration): app.use(Rooms).create/edit/join are async
+    // (return Promise<Thunk>); the old code passed the un-awaited result to
+    // waitForThunkError. Awaiting the thunk first before .waitForError().
+    const createMessage = await (await app.use(Rooms).create(url, room)).waitForError()
 
     if (createMessage && !createMessage.includes("already")) {
       return pushToast({theme: "error", message: createMessage})
     }
 
-    const editMessage = await waitForThunkError(editRoom(url, room))
+    const editMessage = await (await app.use(Rooms).edit(url, room)).waitForError()
 
     if (editMessage) {
       return pushToast({theme: "error", message: editMessage})
     }
 
-    const joinMessage = await waitForThunkError(joinRoom(url, room))
+    const joinMessage = await (await app.use(Rooms).join(url, room)).waitForError()
 
     if (joinMessage && !joinMessage.includes("already")) {
       return pushToast({theme: "error", message: joinMessage})

src/app/components/RoomItem.svelte

@@ -11,13 +11,8 @@
   } from "@welshman/lib"
   import type {TrustedEvent, EventContent} from "@welshman/util"
   import {MESSAGE, COMMENT, getTag} from "@welshman/util"
-  import {
+  import {Thunks, Profiles} from "@welshman/app"
-    thunks,
+  import {thunks, pubkey, app} from "@app/welshman"
-    pubkey,
-    mergeThunks,
-    deriveProfileDisplay,
-    displayProfileByPubkey,
-  } from "@welshman/app"
   import {isMobile} from "@lib/html"
   import Pen from "@assets/icons/pen.svg?dataurl"
   import Reply from "@assets/icons/reply-2.svg?dataurl"
@@ -58,8 +53,8 @@
   const path = getRoomItemPath(url, event)
   const shouldProtect = canEnforceNip70(url)
   const today = formatTimestampAsDate(now())
-  const profileDisplay = deriveProfileDisplay(event.pubkey, [url])
+  const profileDisplay = app.use(Profiles).display(event.pubkey, [url]).$
-  const thunk = mergeThunks($thunks.filter(t => t.event.id === event.id))
+  const thunk = app.use(Thunks).merge($thunks.filter(t => t.event.id === event.id))
   const [_, colorValue] = colors[hash(event.pubkey) % colors.length]
 
   const qTag = getTag("q", event.tags)
@@ -138,7 +133,7 @@
     {#if path && $innerComments.length > 0}
       {@const pubkeys = $innerComments.map(e => e.pubkey)}
       {@const isOwn = $pubkey && pubkeys.includes($pubkey)}
-      {@const info = displayList(pubkeys.map(pubkey => displayProfileByPubkey(pubkey)))}
+      {@const info = displayList(pubkeys.map(pubkey => app.use(Profiles).display(pubkey).get()))}
       {@const tooltip = `${info} commented`}
       <div data-tip={tooltip} class="tooltip tooltip-right flex">
         <Link

src/app/components/RoomItemMenu.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import type {TrustedEvent} from "@welshman/util"
   import {ManagementMethod} from "@welshman/util"
-  import {pubkey, manageRelay, repository} from "@welshman/app"
+  import {RelayManagement} from "@welshman/app"
+  import {pubkey, repository, app} from "@app/welshman"
   import Code2 from "@assets/icons/code-2.svg?dataurl"
   import TrashBin2 from "@assets/icons/trash-bin-2.svg?dataurl"
   import Danger from "@assets/icons/danger.svg?dataurl"
@@ -45,7 +46,7 @@
       title: `Delete Message`,
       message: `Are you sure you want to delete this message from the space?`,
       confirm: async () => {
-        const {error} = await manageRelay(url, {
+        const {error} = await app.use(RelayManagement).post(url, {
           method: ManagementMethod.BanEvent,
           params: [event.id],
         })

src/app/components/RoomItemMenuMobile.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import type {NativeEmoji} from "emoji-picker-element/shared"
   import type {TrustedEvent} from "@welshman/util"
-  import {pubkey} from "@welshman/app"
+  import {pubkey} from "@app/welshman"
   import Bolt from "@assets/icons/bolt.svg?dataurl"
   import Reply from "@assets/icons/reply-2.svg?dataurl"
   import Code2 from "@assets/icons/code-2.svg?dataurl"

src/app/components/RoomJoinItem.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import {getTagValue, ManagementMethod} from "@welshman/util"
-  import type {TrustedEvent, PublishedRoomMeta} from "@welshman/util"
+  import type {TrustedEvent} from "@welshman/util"
-  import {repository, manageRelay} from "@welshman/app"
+  import {RelayManagement} from "@welshman/app"
+  import {app, repository} from "@app/welshman"
   import Button from "@lib/components/Button.svelte"
   import ProfileName from "@app/components/ProfileName.svelte"
   import ProfileDetail from "@app/components/ProfileDetail.svelte"
@@ -28,7 +29,7 @@
     loading = true
 
     try {
-      const {error} = await manageRelay(url, {
+      const {error} = await app.use(RelayManagement).post(url, {
         method: ManagementMethod.BanEvent,
         params: [event.id, "Join request dismissed"],
       })
@@ -49,7 +50,11 @@
     loading = true
 
     try {
-      const error = await addRoomMembers(url, $room as PublishedRoomMeta, [event.pubkey])
+      // TODO(welshman-migration): addRoomMembers now expects a RoomMeta domain
+      // Reader, but deriveRoom yields the plain `Room` object. Passing it through
+      // as `any` preserves prior runtime behavior; verify Rooms.addMember accepts
+      // the plain Room shape (url/h/...) or resolve a real RoomMeta reader here.
+      const error = await addRoomMembers(url, $room as any, [event.pubkey])
 
       if (error) {
         pushToast({theme: "error", message: error})

src/app/components/RoomMembers.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
-  import {waitForThunkError, removeRoomMember} from "@welshman/app"
+  import {Rooms} from "@welshman/app"
+  import {app} from "@app/welshman"
   import MenuDots from "@assets/icons/menu-dots.svg?dataurl"
   import MinusCircle from "@assets/icons/minus-circle.svg?dataurl"
   import AddCircle from "@assets/icons/add-circle.svg?dataurl"
@@ -51,7 +52,8 @@
       title: "Remove Member",
       message: "Are you sure you want to remove this user from the room?",
       confirm: async () => {
-        const error = await waitForThunkError(removeRoomMember(url, $room, pubkey))
+        const thunk = await app.use(Rooms).removeMember(url, $room, pubkey)
+        const error = await thunk.waitForError()
 
         if (error) {
           pushToast({theme: "error", message: error})

src/app/components/RoomMembersAdd.svelte

@@ -2,8 +2,8 @@
   import {onMount} from "svelte"
   import {setKey, popKey} from "@lib/implicit"
   import {sleep} from "@welshman/lib"
-  import {displayProfileByPubkey} from "@welshman/app"
+  import {Profiles} from "@welshman/app"
-  import type {PublishedRoomMeta} from "@welshman/util"
+  import {app} from "@app/welshman"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
   import Spinner from "@lib/components/Spinner.svelte"
   import Button from "@lib/components/Button.svelte"
@@ -42,7 +42,11 @@
       // Show loading for auto submit callback
       await sleep(500)
 
-      const error = await addRoomMembers(url, $room as PublishedRoomMeta, pubkeys)
+      // TODO(welshman-migration): addRoomMembers now expects a RoomMeta domain
+      // Reader, but deriveRoom yields the plain `Room` object. Passing it through
+      // as `any` preserves prior runtime behavior; verify Rooms.addMember accepts
+      // the plain Room shape (url/h/...) or resolve a real RoomMeta reader here.
+      const error = await addRoomMembers(url, $room as any, pubkeys)
 
       if (error) {
         pushToast({theme: "error", message: error})
@@ -72,7 +76,7 @@
         subtitle: "Automatically add members to space",
         message:
           nonSpaceMembers.length === 1
-            ? `${displayProfileByPubkey(nonSpaceMembers[0])} is not a member of this space. Add them?`
+            ? `${app.use(Profiles).display(nonSpaceMembers[0]).get()} is not a member of this space. Add them?`
             : `${nonSpaceMembers.length} people are not members of this space. Add them?`,
         confirm: async () => {
           setKey("RoomMembersAdd.confirm", true)

src/app/components/SignUp.svelte

@@ -1,8 +1,10 @@
 <script lang="ts">
   import type {ClientOptions} from "@pomade/core"
-  import type {Profile} from "@welshman/util"
+  import type {Profile} from "@welshman/domain"
-  import {makeProfile, makeSecret, RELAYS, MESSAGING_RELAYS, makeEvent} from "@welshman/util"
+  import {makeSecret, RELAYS, MESSAGING_RELAYS, makeEvent} from "@welshman/util"
-  import {loginWithNip01, publishThunk} from "@welshman/app"
+  import {ProfileBuilder} from "@welshman/domain"
+  import {Thunks} from "@welshman/app"
+  import {app, loginWithNip01} from "@app/welshman"
   import Key from "@assets/icons/key-minimalistic.svg?dataurl"
   import Letter from "@assets/icons/letter.svg?dataurl"
   import {getKey, setKey} from "@lib/implicit"
@@ -31,7 +33,7 @@
 
   setKey("signup.email", "")
   setKey("signup.secret", makeSecret())
-  setKey("signup.profile", makeProfile())
+  setKey("signup.profile", new ProfileBuilder().values)
   setKey("signup.clientOptions", undefined)
 
   const hasPomade = POMADE_SIGNERS.length >= 3
@@ -40,13 +42,13 @@
 
   const completeSignup = () => {
     // Add default outbox/inbox relays
-    publishThunk({
+    app.use(Thunks).publish({
       event: makeEvent(RELAYS, {tags: DEFAULT_RELAYS.map(url => ["r", url])}),
       relays: [...INDEXER_RELAYS, ...DEFAULT_RELAYS],
     })
 
     // Add default messaging relays
-    publishThunk({
+    app.use(Thunks).publish({
       event: makeEvent(MESSAGING_RELAYS, {tags: DEFAULT_MESSAGING_RELAYS.map(url => ["r", url])}),
       relays: DEFAULT_RELAYS,
     })
@@ -83,10 +85,10 @@
       key: () => pushModal(SignUpKey, {next: flows.nostr.complete, step: 2, totalSteps: 3}),
       complete: () =>
         pushModal(SignUpComplete, {next: flows.nostr.finalize, step: 3, totalSteps: 3}),
-      finalize: () => {
+      finalize: async () => {
         const secret = getKey<string>("signup.secret")!
 
-        loginWithNip01(secret)
+        await loginWithNip01(secret)
         completeSignup()
       },
     },

src/app/components/SignerStatus.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import {spec, avg} from "@welshman/lib"
-  import {session, SessionMethod, signerLog} from "@welshman/app"
+  import {session, SessionMethod, signerLog} from "@app/welshman"
   import CloseCircle from "@assets/icons/close-circle.svg?dataurl"
   import Danger from "@assets/icons/danger-triangle.svg?dataurl"
   import ClockCircle from "@assets/icons/clock-circle.svg?dataurl"

src/app/components/SpaceBar.svelte

@@ -29,20 +29,22 @@
     <Button onclick={back} class="place-self-start pr-3 md:hidden">
       <Icon icon={ArrowLeft} size={7} />
     </Button>
-    <div class="ellipsize whitespace-nowrap flex grow items-center justify-between gap-4">
+    <div class="flex grow items-center justify-between gap-4">
-      <div class="flex flex-col">
+      <div class="flex min-w-0 flex-col">
-        <div class="flex gap-2 items-center">
+        <div class="flex min-w-0 items-start gap-2">
-          <RelayIcon {url} size={5} class="rounded-full md:hidden" />
+          <RelayIcon {url} size={5} class="shrink-0 rounded-full md:hidden" />
-          <div class="hidden md:contents">
+          <div class="hidden shrink-0 md:flex md:items-center">
             {@render leading?.()}
           </div>
+          <div class="min-w-0">
             {@render title?.()}
           </div>
-        <div class="text-xs text-primary md:hidden">
+        </div>
+        <div class="text-xs text-primary pl-7 md:hidden">
           {displayRelayUrl(url)}
         </div>
       </div>
-      <div class="flex gap-2 items-start">
+      <div class="flex shrink-0 items-center gap-2">
         {@render action?.()}
       </div>
     </div>

src/app/components/SpaceDetail.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import {displayRelayUrl} from "@welshman/util"
-  import {deriveRelay} from "@welshman/app"
+  import {Relays} from "@welshman/app"
+  import {app} from "@app/welshman"
   import UserRounded from "@assets/icons/user-rounded.svg?dataurl"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
   import Pen from "@assets/icons/pen.svg?dataurl"
@@ -26,7 +27,7 @@
   }
 
   const {url}: Props = $props()
-  const relay = deriveRelay(url)
+  const relay = app.use(Relays).one(url)
   const owner = $derived($relay?.pubkey)
   const userIsAdmin = deriveUserIsSpaceAdmin(url)
 

src/app/components/SpaceEdit.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import type {RelayProfile} from "@welshman/util"
   import {displayRelayUrl, ManagementMethod} from "@welshman/util"
-  import {manageRelay, forceLoadRelay} from "@welshman/app"
+  import {RelayManagement, Relays} from "@welshman/app"
+  import {app} from "@app/welshman"
   import StickerSmileSquare from "@assets/icons/sticker-smile-square.svg?dataurl"
   import Widget from "@assets/icons/widget-4.svg?dataurl"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
@@ -36,7 +37,7 @@
 
   const submit = async () => {
     if (values.name != initialValues.name) {
-      const res = await manageRelay(url, {
+      const res = await app.use(RelayManagement).post(url, {
         method: ManagementMethod.ChangeRelayName,
         params: [values.name || ""],
       })
@@ -47,7 +48,7 @@
     }
 
     if (values.description != initialValues.description) {
-      const res = await manageRelay(url, {
+      const res = await app.use(RelayManagement).post(url, {
         method: ManagementMethod.ChangeRelayDescription,
         params: [values.description || ""],
       })
@@ -64,7 +65,7 @@
         return pushToast({theme: "error", message: error})
       }
 
-      const res = await manageRelay(url, {
+      const res = await app.use(RelayManagement).post(url, {
         method: ManagementMethod.ChangeRelayIcon,
         params: [result.url],
       })
@@ -75,7 +76,7 @@
     }
 
     pushToast({message: "Your changes have been saved!"})
-    forceLoadRelay(url)
+    app.use(Relays).forceLoad(url)
     clearModals()
   }
 

src/app/components/SpaceInviteAccept.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
   import {debounce} from "throttle-debounce"
   import {dissoc, maybe} from "@welshman/lib"
-  import {goto} from "$app/navigation"
   import {preventDefault} from "@lib/html"
   import {slideAndFade} from "@lib/transition"
   import Spinner from "@lib/components/Spinner.svelte"
@@ -22,7 +21,7 @@
   import RelaySummary from "@app/components/RelaySummary.svelte"
   import SpaceJoinSettings from "@app/components/SpaceJoinSettings.svelte"
   import {pushToast} from "@app/toast"
-  import {makeSpacePath} from "@app/routes"
+  import {goToSpace} from "@app/routes"
   import {relaysMostlyRestricted} from "@app/policies"
   import {notificationSettings, setSpaceNotifications} from "@app/settings"
   import {parseInviteLink} from "@app/invites"
@@ -68,7 +67,7 @@
       }
 
       await addSpace(url)
-      await goto(makeSpacePath(url), {replaceState: true})
+      await goToSpace(url)
 
       broadcastUserData([url])
       relaysMostlyRestricted.update(dissoc(url))

src/app/components/SpaceJoin.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
   import {onMount} from "svelte"
-  import {goto} from "$app/navigation"
   import {dissoc, maybe} from "@welshman/lib"
   import {preventDefault} from "@lib/html"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
@@ -22,7 +21,7 @@
   import {notificationSettings} from "@app/settings"
   import {pushModal} from "@app/modal"
   import {pushToast} from "@app/toast"
-  import {makeSpacePath} from "@app/routes"
+  import {goToSpace} from "@app/routes"
   import {Push} from "@app/push"
 
   type Props = {
@@ -56,7 +55,7 @@
       }
 
       await addSpace(url)
-      await goto(makeSpacePath(url), {replaceState: true})
+      await goToSpace(url)
 
       broadcastUserData([url])
       relaysMostlyRestricted.update(dissoc(url))

src/app/components/SpaceMembers.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import {ManagementMethod} from "@welshman/util"
-  import {manageRelay, displayProfileByPubkey} from "@welshman/app"
+  import {RelayManagement, Profiles} from "@welshman/app"
+  import {app} from "@app/welshman"
   import MenuDots from "@assets/icons/menu-dots.svg?dataurl"
   import UserMinus from "@assets/icons/user-minus.svg?dataurl"
   import MinusCircle from "@assets/icons/minus-circle.svg?dataurl"
@@ -60,9 +61,9 @@
   const unallowMember = (pubkey: string) =>
     pushModal(Confirm, {
       title: "Remove User",
-      message: `Are you sure you want to remove @${displayProfileByPubkey(pubkey)} from the space?`,
+      message: `Are you sure you want to remove @${app.use(Profiles).display(pubkey).get()} from the space?`,
       confirm: async () => {
-        const {error} = await manageRelay(url, {
+        const {error} = await app.use(RelayManagement).post(url, {
           method: ManagementMethod.UnallowPubkey,
           params: [pubkey],
         })
@@ -79,9 +80,9 @@
   const banMember = (pubkey: string) =>
     pushModal(Confirm, {
       title: "Ban User",
-      message: `Are you sure you want to ban @${displayProfileByPubkey(pubkey)} from the space?`,
+      message: `Are you sure you want to ban @${app.use(Profiles).display(pubkey).get()} from the space?`,
       confirm: async () => {
-        const {error} = await manageRelay(url, {
+        const {error} = await app.use(RelayManagement).post(url, {
           method: ManagementMethod.BanPubkey,
           params: [pubkey],
         })

src/app/components/SpaceMembersBanned.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import {displayRelayUrl, ManagementMethod} from "@welshman/util"
-  import {manageRelay} from "@welshman/app"
+  import {RelayManagement} from "@welshman/app"
+  import {app} from "@app/welshman"
   import MenuDots from "@assets/icons/menu-dots.svg?dataurl"
   import Restart from "@assets/icons/restart.svg?dataurl"
   import CloseCircle from "@assets/icons/close-circle.svg?dataurl"
@@ -42,7 +43,7 @@
   }
 
   const unbanMember = async (pubkey: string) => {
-    const {error} = await manageRelay(url, {
+    const {error} = await app.use(RelayManagement).post(url, {
       method: ManagementMethod.UnbanPubkey,
       params: [pubkey],
     })

src/app/components/SpaceMenu.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import {derived} from "svelte/store"
   import {displayRelayUrl, EVENT_TIME, ZAP_GOAL, THREAD, CLASSIFIED, POLL} from "@welshman/util"
-  import {deriveRelay, createSearch, pubkey} from "@welshman/app"
+  import {Relays} from "@welshman/app"
+  import {app, createSearch, pubkey} from "@app/welshman"
   import {fly} from "@lib/transition"
   import Magnifier from "@assets/icons/magnifier.svg?dataurl"
   import AltArrowDown from "@assets/icons/alt-arrow-down.svg?dataurl"
@@ -60,7 +61,7 @@
 
   const {url} = $props()
 
-  const relay = deriveRelay(url)
+  const relay = app.use(Relays).one(url)
   const chatPath = makeSpacePath(url, "chat")
   const goalsPath = makeSpacePath(url, "goals")
   const threadsPath = makeSpacePath(url, "threads")

src/app/components/SpaceRelayStatus.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
-  import {deriveRelay} from "@welshman/app"
+  import {Relays} from "@welshman/app"
+  import {app} from "@app/welshman"
   import Server from "@assets/icons/server.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import ProfileLink from "@app/components/ProfileLink.svelte"
@@ -11,7 +12,7 @@
 
   const {url}: Props = $props()
 
-  const relay = deriveRelay(url)
+  const relay = app.use(Relays).one(url)
 </script>
 
 <div class="card2 bg-alt flex flex-col gap-4">

src/app/components/SpaceSearch.svelte

@@ -2,7 +2,7 @@
   import {tick} from "svelte"
   import {debounce} from "throttle-debounce"
   import {request} from "@welshman/net"
-  import {repository, tracker} from "@welshman/app"
+  import {repository, tracker} from "@app/welshman"
   import {formatTimestampAsDate, groupBy, uniqBy, now, MINUTE, HOUR, DAY, WEEK} from "@welshman/lib"
   import type {TrustedEvent, Filter} from "@welshman/util"
   import {MESSAGE, sortEventsDesc} from "@welshman/util"

src/app/components/ThreadBoard.svelte

@@ -0,0 +1,40 @@
+<script lang="ts">
+  import type {TrustedEvent} from "@welshman/util"
+  import RoomName from "@app/components/RoomName.svelte"
+  import ThreadBoardItem from "@app/components/ThreadBoardItem.svelte"
+
+  type Props = {
+    url: string
+    h: string
+    threads: TrustedEvent[]
+  }
+
+  const {url, h, threads}: Props = $props()
+</script>
+
+<section class="overflow-hidden rounded-box border border-base-content/15 bg-base-100 shadow-sm">
+  <header
+    class="flex items-center justify-between gap-2 border-b border-base-content/15 bg-base-200/70 px-4 py-2.5">
+    <h2 class="text-sm font-bold sm:text-base">
+      {#if h}
+        #<RoomName {url} {h} />
+      {:else}
+        General
+      {/if}
+    </h2>
+    <span class="text-xs opacity-60">
+      {threads.length}
+      {threads.length === 1 ? "topic" : "topics"}
+    </span>
+  </header>
+  <div
+    class="hidden border-b border-base-content/10 bg-base-200/40 px-4 py-2 text-xs font-bold uppercase tracking-wide opacity-60 sm:grid sm:grid-cols-[1fr_8rem_5rem_8rem] sm:gap-x-4">
+    <span>Topic</span>
+    <span>Author</span>
+    <span class="text-center">Replies</span>
+    <span class="text-right">Last post</span>
+  </div>
+  {#each threads as event (event.id)}
+    <ThreadBoardItem {url} {event} />
+  {/each}
+</section>

src/app/components/ThreadBoardItem.svelte

@@ -0,0 +1,48 @@
+<script lang="ts">
+  import {formatTimestamp, max} from "@welshman/lib"
+  import type {TrustedEvent} from "@welshman/util"
+  import {COMMENT, getTagValue} from "@welshman/util"
+  import Link from "@lib/components/Link.svelte"
+  import ProfileCircle from "@app/components/ProfileCircle.svelte"
+  import ProfileName from "@app/components/ProfileName.svelte"
+  import {deriveEventsForUrl} from "@app/repository"
+  import {makeThreadPath} from "@app/routes"
+
+  type Props = {
+    url: string
+    event: TrustedEvent
+  }
+
+  const {url, event}: Props = $props()
+
+  const filters = [{kinds: [COMMENT], "#E": [event.id]}]
+  const replies = deriveEventsForUrl(url, filters)
+  const replyCount = $derived($replies.length)
+  const lastActive = $derived(max([...$replies, event].map(e => e.created_at)))
+  const title = getTagValue("title", event.tags)
+</script>
+
+<Link
+  href={makeThreadPath(url, event.id)}
+  class="grid grid-cols-[1fr_auto] gap-x-3 gap-y-1 border-b border-base-content/10 px-3 py-3 transition-colors hover:bg-base-200/50 sm:grid-cols-[1fr_8rem_5rem_8rem] sm:items-center sm:gap-x-4 sm:px-4">
+  <div class="col-span-2 min-w-0 sm:col-span-1">
+    <p class="ellipsize text-sm font-bold sm:text-base">{title || "Untitled thread"}</p>
+    <p class="ellipsize mt-0.5 text-xs opacity-60 sm:hidden">
+      by <ProfileName pubkey={event.pubkey} {url} />
+    </p>
+  </div>
+  <div class="hidden items-center gap-2 sm:flex">
+    <ProfileCircle pubkey={event.pubkey} {url} size={6} />
+    <span class="ellipsize text-sm">
+      <ProfileName pubkey={event.pubkey} {url} />
+    </span>
+  </div>
+  <p class="text-right text-xs opacity-75 sm:text-center sm:text-sm">
+    <span class="opacity-60 sm:hidden">Replies · </span>
+    {replyCount}
+  </p>
+  <p class="text-right text-xs opacity-75 sm:text-sm">
+    <span class="opacity-60 sm:hidden">Last · </span>
+    {formatTimestamp(lastActive)}
+  </p>
+</Link>

src/app/components/ThreadCreate.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import {writable} from "svelte/store"
   import {makeEvent, THREAD} from "@welshman/util"
-  import {publishThunk, waitForThunkError} from "@welshman/app"
+  import {Thunks} from "@welshman/app"
+  import {app} from "@app/welshman"
   import {isMobile, preventDefault} from "@lib/html"
   import Paperclip from "@assets/icons/paperclip-2.svg?dataurl"
   import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
@@ -79,12 +80,12 @@
         tags.push(["h", h])
       }
 
-      const threadThunk = publishThunk({
+      const threadThunk = app.use(Thunks).publish({
         relays: [url],
         event: makeEvent(THREAD, {content, tags}),
       })
 
-      const error = await waitForThunkError(threadThunk)
+      const error = await threadThunk.waitForError()
 
       if (error) {
         return pushToast({theme: "error", message: error})

src/app/components/ThreadPagination.svelte

@@ -0,0 +1,66 @@
+<script lang="ts">
+  import cx from "classnames"
+  import AltArrowLeft from "@assets/icons/alt-arrow-left.svg?dataurl"
+  import AltArrowRight from "@assets/icons/alt-arrow-right.svg?dataurl"
+  import DoubleAltArrowLeft from "@assets/icons/double-alt-arrow-left.svg?dataurl"
+  import DoubleAltArrowRight from "@assets/icons/double-alt-arrow-right.svg?dataurl"
+  import Icon from "@lib/components/Icon.svelte"
+  import Button from "@lib/components/Button.svelte"
+
+  type Props = {
+    page: number
+    pageCount: number
+    onPage: (page: number) => void
+  }
+
+  const {page, pageCount, onPage}: Props = $props()
+
+  const goFirst = () => onPage(1)
+  const goPrev = () => onPage(page - 1)
+  const goNext = () => onPage(page + 1)
+  const goLast = () => onPage(pageCount)
+  const goToPage = (target: number) => onPage(target)
+
+  const pages = $derived.by(() => {
+    if (pageCount <= 7) {
+      return Array.from({length: pageCount}, (_, i) => i + 1)
+    }
+
+    const result = new Set<number>([1, pageCount, page])
+
+    if (page > 2) result.add(page - 1)
+    if (page < pageCount - 1) result.add(page + 1)
+    if (page > 3) result.add(page - 2)
+    if (page < pageCount - 2) result.add(page + 2)
+
+    return Array.from(result).sort((a, b) => a - b)
+  })
+</script>
+
+<div class="flex flex-col items-center gap-3 border-t border-base-content/10 py-4">
+  <p class="text-sm opacity-75">Page {page} of {pageCount}</p>
+  <div class="join">
+    <Button class="btn join-item btn-sm" disabled={page <= 1} onclick={goFirst}>
+      <Icon icon={DoubleAltArrowLeft} size={4} />
+    </Button>
+    <Button class="btn join-item btn-sm" disabled={page <= 1} onclick={goPrev}>
+      <Icon icon={AltArrowLeft} size={4} />
+    </Button>
+    {#each pages as p, i (p)}
+      {#if i > 0 && p - pages[i - 1] > 1}
+        <Button class="btn join-item btn-sm btn-disabled" disabled>…</Button>
+      {/if}
+      <Button
+        class={cx("btn join-item btn-sm", page === p && "btn-primary")}
+        onclick={() => goToPage(p)}>
+        {p}
+      </Button>
+    {/each}
+    <Button class="btn join-item btn-sm" disabled={page >= pageCount} onclick={goNext}>
+      <Icon icon={AltArrowRight} size={4} />
+    </Button>
+    <Button class="btn join-item btn-sm" disabled={page >= pageCount} onclick={goLast}>
+      <Icon icon={DoubleAltArrowRight} size={4} />
+    </Button>
+  </div>
+</div>

src/app/components/ThreadPost.svelte

@@ -0,0 +1,94 @@
+<script lang="ts">
+  import {formatTimestamp} from "@welshman/lib"
+  import type {TrustedEvent} from "@welshman/util"
+  import {COMMENT, displayNip05} from "@welshman/util"
+  import {Handles, Profiles} from "@welshman/app"
+  import {app} from "@app/welshman"
+  import Reply from "@assets/icons/reply-2.svg?dataurl"
+  import LinkRound from "@assets/icons/link-round.svg?dataurl"
+  import Icon from "@lib/components/Icon.svelte"
+  import Button from "@lib/components/Button.svelte"
+  import ProfileCircle from "@app/components/ProfileCircle.svelte"
+  import ProfileDetail from "@app/components/ProfileDetail.svelte"
+  import NoteContent from "@app/components/NoteContent.svelte"
+  import Content from "@app/components/Content.svelte"
+  import CommentActions from "@app/components/CommentActions.svelte"
+  import ThreadActions from "@app/components/ThreadActions.svelte"
+  import {makeEventPermalink} from "@app/routes"
+  import {pushModal} from "@app/modal"
+  import {clip} from "@app/toast"
+
+  type Props = {
+    url: string
+    event: TrustedEvent
+    threadPubkey: string
+    onReply: (event: TrustedEvent) => void
+  }
+
+  const {url, event, threadPubkey, onReply}: Props = $props()
+
+  const profileDisplay = app.use(Profiles).display(event.pubkey, [url]).$
+  const handle = app.use(Handles).forPubkey(event.pubkey).$
+  const isOp = event.pubkey === threadPubkey
+  const isComment = event.kind === COMMENT
+
+  const openProfile = () => pushModal(ProfileDetail, {pubkey: event.pubkey, url})
+
+  const copyPermalink = () => clip(makeEventPermalink(event, url))
+
+  const reply = () => onReply(event)
+</script>
+
+<article
+  id="post-{event.id}"
+  data-event={event.id}
+  class="border-b border-base-content/15 bg-base-100">
+  <div class="flex flex-col md:flex-row">
+    <aside
+      class="flex shrink-0 flex-row items-center gap-3 border-b border-base-content/10 bg-base-200/50 p-3 md:w-40 md:flex-col md:items-center md:border-b-0 md:border-r md:p-4 md:text-center">
+      <Button onclick={openProfile}>
+        <ProfileCircle pubkey={event.pubkey} {url} size={10} class="md:size-14" />
+      </Button>
+      <div class="flex min-w-0 flex-col gap-1 md:items-center">
+        <Button onclick={openProfile} class="text-bold ellipsize text-sm">
+          {$profileDisplay}
+        </Button>
+        {#if $handle}
+          <span class="ellipsize text-xs opacity-75">{displayNip05($handle?.nip05)}</span>
+        {/if}
+        {#if isOp}
+          <span class="badge badge-primary badge-sm">OP</span>
+        {/if}
+      </div>
+    </aside>
+    <div class="flex min-w-0 grow flex-col">
+      <div
+        class="flex flex-wrap items-center justify-between gap-2 border-b border-base-content/10 bg-base-200/40 px-3 py-2 text-xs sm:px-4 sm:text-sm">
+        <span class="opacity-75">{formatTimestamp(event.created_at)}</span>
+        <Button class="btn btn-ghost btn-xs h-auto min-h-0 gap-1 px-1 py-0" onclick={copyPermalink}>
+          <Icon icon={LinkRound} size={3} />
+          Permalink
+        </Button>
+      </div>
+      <div class="px-3 py-4 sm:px-4">
+        {#if isComment}
+          <Content showEntire {event} {url} />
+        {:else}
+          <NoteContent showEntire {event} {url} />
+        {/if}
+      </div>
+      <div
+        class="flex shrink-0 flex-col gap-2 border-t border-base-content/10 bg-base-200/20 px-3 py-3 sm:flex-row sm:items-center sm:justify-between sm:px-4">
+        <Button class="btn btn-neutral btn-xs w-fit gap-1" onclick={reply}>
+          <Icon icon={Reply} size={4} />
+          Reply
+        </Button>
+        {#if isComment}
+          <CommentActions segment="threads" {event} {url} />
+        {:else}
+          <ThreadActions {event} {url} />
+        {/if}
+      </div>
+    </div>
+  </div>
+</article>

src/app/components/ThunkFailure.svelte

@@ -2,7 +2,8 @@
   import {stopPropagation} from "svelte/legacy"
   import {noop} from "@welshman/lib"
   import type {AbstractThunk} from "@welshman/app"
-  import {flattenThunks, getFailedThunkUrls, publishThunk, thunkIsComplete} from "@welshman/app"
+  import {Thunks} from "@welshman/app"
+  import {app} from "@app/welshman"
   import Danger from "@assets/icons/danger-triangle.svg?dataurl"
   import Icon from "@lib/components/Icon.svelte"
   import Tippy from "@lib/components/Tippy.svelte"
@@ -18,15 +19,15 @@
 
   const {thunk, showToastOnRetry, ...restProps}: Props = $props()
 
-  const showFailure = $derived(thunkIsComplete($thunk) && getFailedThunkUrls($thunk).length > 0)
+  const showFailure = $derived($thunk.isComplete() && $thunk.getFailedUrls().length > 0)
 
   const retry = (url: string) => {
-    for (const child of flattenThunks([thunk])) {
+    for (const child of app.use(Thunks).flatten([thunk])) {
       if (!child.options.relays.includes(url)) {
         continue
       }
 
-      const retried = publishThunk({...child.options, relays: [url]})
+      const retried = app.use(Thunks).publish({...child.options, relays: [url]})
 
       if (showToastOnRetry) {
         pushToast({

src/app/components/ThunkPending.svelte

@@ -2,7 +2,6 @@
   import {stopPropagation} from "svelte/legacy"
   import {PublishStatus} from "@welshman/net"
   import type {AbstractThunk} from "@welshman/app"
-  import {abortThunk, thunkHasStatus} from "@welshman/app"
 
   interface Props {
     thunk: AbstractThunk
@@ -11,9 +10,9 @@
 
   const {thunk, ...restProps}: Props = $props()
 
-  const abort = () => abortThunk(thunk)
+  const abort = () => thunk.abort()
 
-  const isSending = $derived(thunkHasStatus(PublishStatus.Sending, $thunk))
+  const isSending = $derived($thunk.hasStatus(PublishStatus.Sending))
 </script>
 
 <div class="flex w-full justify-end px-1 text-xs {restProps.class}">

src/app/components/ThunkStatus.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
   import type {AbstractThunk} from "@welshman/app"
-  import {thunkIsComplete, getFailedThunkUrls} from "@welshman/app"
   import ThunkFailure from "@app/components/ThunkFailure.svelte"
   import ThunkPending from "@app/components/ThunkPending.svelte"
 
@@ -12,8 +11,8 @@
 
   const {thunk, showToastOnRetry, ...restProps}: Props = $props()
 
-  const showFailure = $derived(thunkIsComplete($thunk) && getFailedThunkUrls($thunk).length > 0)
+  const showFailure = $derived($thunk.isComplete() && $thunk.getFailedUrls().length > 0)
-  const showPending = $derived(!thunkIsComplete($thunk))
+  const showPending = $derived(!$thunk.isComplete())
 </script>
 
 {#if showFailure}

src/app/components/ThunkStatusDetail.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
   import {stopPropagation} from "svelte/legacy"
   import type {AbstractThunk} from "@welshman/app"
-  import {getFailedThunkUrls, getThunkUrlsWithStatus} from "@welshman/app"
   import {PublishStatus} from "@welshman/net"
   import {displayRelayUrl} from "@welshman/util"
   import CheckCircle from "@assets/icons/check-circle.svg?dataurl"
@@ -17,8 +16,8 @@
 
   const {thunk, retry}: Props = $props()
 
-  const successUrls = $derived(getThunkUrlsWithStatus(PublishStatus.Success, $thunk))
+  const successUrls = $derived($thunk.getUrlsWithStatus(PublishStatus.Success))
-  const failedUrls = $derived(getFailedThunkUrls($thunk))
+  const failedUrls = $derived($thunk.getFailedUrls())
   const total = $derived(successUrls.length + failedUrls.length)
   const isPartial = $derived(successUrls.length > 0 && failedUrls.length > 0)
 

src/app/components/ThunkStatusOrDeleted.svelte

@@ -3,7 +3,8 @@
   import type {TrustedEvent} from "@welshman/util"
   import {PublishStatus} from "@welshman/net"
   import {deriveIsDeleted} from "@welshman/store"
-  import {thunks, mergeThunks, thunkHasStatus, repository} from "@welshman/app"
+  import {Thunks} from "@welshman/app"
+  import {app, thunks, repository} from "@app/welshman"
   import ThunkStatus from "@app/components/ThunkStatus.svelte"
 
   type Props = {
@@ -14,12 +15,12 @@
   const {event, children}: Props = $props()
 
   const deleted = deriveIsDeleted(repository, event)
-  const thunk = $derived(mergeThunks($thunks.filter(t => t.event.id === event.id)))
+  const thunk = $derived(app.use(Thunks).merge($thunks.filter(t => t.event.id === event.id)))
 </script>
 
 {#if $deleted}
   <div class="btn btn-error btn-xs rounded-full">Deleted</div>
-{:else if thunk.thunks.length > 0 && !thunkHasStatus(PublishStatus.Success, thunk)}
+{:else if thunk.thunks.length > 0 && !thunk.hasStatus(PublishStatus.Success)}
   <ThunkStatus {thunk} />
 {:else if children}
   {@render children?.()}

src/app/components/ThunkToast.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
   import type {AbstractThunk} from "@welshman/app"
-  import {thunkHasStatus, thunkIsComplete} from "@welshman/app"
   import {PublishStatus} from "@welshman/net"
   import ThunkPending from "@app/components/ThunkPending.svelte"
   import type {Toast} from "@app/toast"
@@ -16,8 +15,8 @@
   const id = toast.id
   const thunk = props.thunk
   const {Aborted, Timeout, Failure} = PublishStatus
-  const isFailure = $derived(thunkHasStatus([Aborted, Timeout, Failure], $thunk))
+  const isFailure = $derived($thunk.hasStatus([Aborted, Timeout, Failure]))
-  const isComplete = $derived(thunkIsComplete($thunk))
+  const isComplete = $derived($thunk.isComplete())
 
   $effect(() => {
     if (isFailure) {

src/app/components/TopicMultiSelect.svelte

@@ -3,7 +3,7 @@
   import type {Writable} from "svelte/store"
   import type {Instance} from "tippy.js"
   import {remove, reject, spec, uniq} from "@welshman/lib"
-  import {createSearch, topics} from "@welshman/app"
+  import {createSearch, topics} from "@app/welshman"
   import {normalizeTopic} from "@lib/util"
   import Suggestions from "@lib/components/Suggestions.svelte"
   import CloseCircle from "@assets/icons/close-circle.svg?dataurl"

src/app/components/VideoCallContent.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import cx from "classnames"
   import {Track} from "livekit-client"
-  import {displayProfileByPubkey, loadProfile} from "@welshman/app"
+  import {Profiles} from "@welshman/app"
+  import {app} from "@app/welshman"
   import Pin from "@assets/icons/pin.svg?dataurl"
   import Button from "@lib/components/Button.svelte"
   import Icon from "@lib/components/Icon.svelte"
@@ -184,13 +185,13 @@
   $effect(() => {
     for (const t of videoTiles) {
       const pk = pubkeyFromLiveKitIdentity(t.identity)
-      if (pk) loadProfile(pk)
+      if (pk) app.use(Profiles).load(pk)
     }
   })
 
   const labelFor = (identity: string, source: VideoTileData["source"]) => {
     const pk = pubkeyFromLiveKitIdentity(identity)
-    const name = pk ? displayProfileByPubkey(pk) : "Unknown"
+    const name = pk ? app.use(Profiles).display(pk).get() : "Unknown"
     return source === Track.Source.ScreenShare ? `${name} · screen` : name
   }
 

src/app/components/VoiceRoomItem.svelte

@@ -1,7 +1,8 @@
 <script lang="ts">
   import cx from "classnames"
   import {goto} from "$app/navigation"
-  import {loadProfile, displayProfileByPubkey} from "@welshman/app"
+  import {Profiles} from "@welshman/app"
+  import {app} from "@app/welshman"
   import SecondaryNavItem from "@lib/components/SecondaryNavItem.svelte"
   import ProfileCircle from "@app/components/ProfileCircle.svelte"
   import ProfileCircles from "@app/components/ProfileCircles.svelte"
@@ -65,7 +66,7 @@
 
   $effect(() => {
     for (const p of $participants) {
-      if (p.pubkey) loadProfile(p.pubkey)
+      if (p.pubkey) app.use(Profiles).load(p.pubkey)
     }
   })
 </script>
@@ -98,7 +99,7 @@
               <ProfileCircle pubkey={p.pubkey} size={5} class="h-5 w-5" />
             </div>
             <span class="ellipsize min-w-0 flex-1 text-xs opacity-70">
-              {p.pubkey ? displayProfileByPubkey(p.pubkey) : "Unknown"}
+              {p.pubkey ? app.use(Profiles).display(p.pubkey).get() : "Unknown"}
             </span>
             <VoiceParticipantMediaBadges
               muted={media.muted}