0.4.0

Merge pull request #65 from simplex-chat/v4
v0.4.0
2021-09-11 20:44:01 +01:00 · 2021-09-11 20:18:53 +01:00 · 2021-09-11 19:50:00 +01:00 · 2021-09-11 17:00:59 +01:00 · 2021-09-11 13:45:22 +01:00 · 2021-09-07 01:08:29 +10:00
40 changed files with 6464 additions and 786 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,6 +4,7 @@ on:
  push:
    branches:
      - master
+      - v4
    tags:
      - "v*"
  pull_request:
@@ -49,24 +50,24 @@ jobs:
          - os: ubuntu-20.04
            cache_path: ~/.stack
            stack_args: "--test"
-            artifact_rel_path: /bin/dog-food
-            asset_name: dog-food-ubuntu-20_04-x86-64
+            artifact_rel_path: /bin/simplex-chat
+            asset_name: simplex-chat-ubuntu-20_04-x86-64
          - os: ubuntu-18.04
            cache_path: ~/.stack
            stack_args: "--test"
-            artifact_rel_path: /bin/dog-food
-            asset_name: dog-food-ubuntu-18_04-x86-64
+            artifact_rel_path: /bin/simplex-chat
+            asset_name: simplex-chat-ubuntu-18_04-x86-64
          - os: macos-latest
            cache_path: ~/.stack
            stack_args: "--test"
-            artifact_rel_path: /bin/dog-food
-            asset_name: dog-food-macos-x86-64
+            artifact_rel_path: /bin/simplex-chat
+            asset_name: simplex-chat-macos-x86-64
          # TODO enable tests for windows once fixed (remove stack_args altogether)
          - os: windows-latest
            cache_path: C:/sr
            stack_args: ""
-            artifact_rel_path: /bin/dog-food.exe
-            asset_name: dog-food-windows-x86-64
+            artifact_rel_path: /bin/simplex-chat.exe
+            asset_name: simplex-chat-windows-x86-64
    steps:
      - name: Clone project
        uses: actions/checkout@v2
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@ stack.yaml.lock

 # chat database
 *.db
+*.db.bak
--- a/6
+++ b/6
@@ -1,10 +1,10 @@
-FROM haskell:8.8.4 AS build-stage
+FROM haskell:8.10.4 AS build-stage
 # if you encounter "version `GLIBC_2.28' not found" error when running
 # chat client executable, build with the following base image instead:
-# FROM haskell:8.8.4-stretch AS build-stage
+# FROM haskell:8.10.4-stretch AS build-stage
 COPY . /project
 WORKDIR /project
 RUN stack install

 FROM scratch AS export-stage
-COPY --from=build-stage /root/.local/bin/dog-food /
+COPY --from=build-stage /root/.local/bin/simplex-chat /
--- a/README.md
+++ b/README.md
@@ -2,20 +2,26 @@

 # SimpleX chat

-## Federated, private, secure, decentralized
+## Private, secure, decentralized

 [![GitHub build](https://github.com/simplex-chat/simplex-chat/workflows/build/badge.svg)](https://github.com/simplex-chat/simplex-chat/actions?query=workflow%3Abuild)
 [![GitHub release](https://img.shields.io/github/v/release/simplex-chat/simplex-chat)](https://github.com/simplex-chat/simplex-chat/releases)

-The motivation for SimpleX chat is [presented here](./simplex.md)
+> **NEW in v0.4: [groups](#groups) and [sending files](#sending-files)!**
+
+The motivation for SimpleX chat is [presented here](./simplex.md).

 SimpleX chat prototype is a thin terminal UI on top of [SimpleXMQ](https://github.com/simplex-chat/simplexmq) message broker that uses [SMP protocols](https://github.com/simplex-chat/simplexmq/blob/master/protocol).

 See [simplex.chat](https://simplex.chat) website for chat demo and the explanations of the system and how SMP protocol works.

+![simplex-chat](./images/connection.gif)
+
 ## Table of contents

- [Features](#features)
+- [Disclaimer](#disclaimer)
+- [Network topology](#network-topology)
+- [Terminal chat features](#terminal-chat-features)
 - [Installation](#installation)
  - [Download chat client](#download-chat-client)
  - [Build from source](#build-from-source)
@@ -24,16 +30,37 @@ See [simplex.chat](https://simplex.chat) website for chat demo and the explanati
 - [Usage](#usage)
  - [Running the chat client](#running-the-chat-client)
  - [How to use SimpleX chat](#how-to-use-simplex-chat)
+  - [Groups](#groups)
+  - [Sending files](#sending-files)
  - [Access chat history](#access-chat-history)
- [Roadmap](#roadmap)
- [Disclaimer](#disclaimer)
+- [Future roadmap](#future-roadmap)
 - [License](#license)

-## Features
+## Disclaimer
+
+This is WIP implementation of SimpleX chat that implements a new network topology for asynchronous communication combining the advantages and avoiding the disadvantages of federated and P2P networks.
+
+If you expect a software being reliable most of the time and doing something useful, then this is probably not ready for you yet. We do use it for terminal chat though, and it seems to work most of the time - we would really appreciate if you try it and give us your feedback.
+
+**Please note:** The main differentiation of SimpleX network is the approach to internet message routing rather than encryption; for that reason no sufficient attention was paid to either TCP transport level encryption or to E2E encryption protocols - they are implemented in an ad hoc way based on RSA and AES algorithms. See [SMP protocol](https://github.com/simplex-chat/simplexmq/blob/master/protocol/simplex-messaging.md#appendix-a) on TCP transport encryption protocol (AEAD-GCM scheme, with an AES key negotiation based on RSA key hash known to the client in advance) and [this section](https://github.com/simplex-chat/simplexmq/blob/master/rfcs/2021-01-26-crypto.md#e2e-encryption) on E2E encryption protocol (an ad hoc hybrid scheme a la PGP). These protocols will change in a consumer ready version to something more robust.
+
+## Network topology
+
+SimpleX is a decentralized client-server network that uses redundant, disposable nodes to asynchronously pass the messages via message queues, providing receiver and sender anonymity.
+
+Unlike P2P networks, all messages are passed through one or several (for redundancy) servers, that do not even need to have persistence (in fact, the current [SMP server implementation](https://github.com/simplex-chat/simplexmq#smp-server) uses in-memory message storage, persisting only the queue records) - it provides better metadata protection than P2P designs, as no global participant ID is required, and avoids many [problems of P2P networks](https://github.com/simplex-chat/simplex-chat/blob/master/simplex.md#comparison-with-p2p-messaging-protocols).
+
+Unlike federated networks, the participating server nodes do NOT have records of the users, do NOT communicate with each other, do NOT store messages after they are delivered to the recipients, and there is no way to discover the full list of participating servers - it avoids the problem of metadata visibility that federated networks suffer from and better protects the network, as servers do not communicate with each other. Each server node provides unidirectional "dumb pipes" to the users, that do authorization without authentication, having no knowledge of the the users or their contacts. Each queue is assigned two RSA keys - one for receiver and one for sender - and each queue access is authorized with a signature created using a respective key's private counterpart.
+
+The routing of messages relies on the knowledge of client devices how user contacts and groups map at any given moment of time to these disposable queues on server nodes.
+
+## Terminal chat features

 - 1-to-1 chat with multiple people in the same terminal window.
+- Group messaging.
+- Sending files to contacts and groups.
 - Auto-populated recipient name - just type your messages to reply to the sender once the connection is established.
- Demo SMP server available at `smp1.simplex.im:5223` - you can deploy your own server (`smp-server` executable in [simplexmq](https://github.com/simplex-chat/simplexmq) repo).
+- Demo SMP servers available and pre-configured in the app - or you can [deploy your own server](https://github.com/simplex-chat/simplexmq#using-smp-server-and-smp-agent).
 - No global identity or any names visible to the server(s), ensuring full privacy of your contacts and conversations.
 - E2E encryption, with RSA public key that has to be passed out-of-band (see [How to use SimpleX chat](#how-to-use-simplex-chat)).
 - Message signing and verification with automatically generated RSA keys.
@@ -41,7 +68,7 @@ See [simplex.chat](https://simplex.chat) website for chat demo and the explanati
 - Authentication of each command/message by SMP servers with automatically generated RSA key pairs.
 - TCP transport encryption using SMP transport protocol.

-RSA keys are not used as identity, they are randomly generated for each contact. 2048 bit keys are used, it can be changed to 4096-bit in code via [rsaKeySize setting](https://github.com/simplex-chat/simplex-chat/blob/master/apps/dog-food/Main.hs).
+RSA keys are not used as identity, they are randomly generated for each contact.

 ## Installation

@@ -53,7 +80,7 @@ Download the chat binary for your system from the [latest stable release](https:

 ```sh
 chmod +x <binary>
-mv <binary> ~/.local/bin/dog-food
+mv <binary> ~/.local/bin/simplex-chat
 ```

 (or any other preferred location on PATH).
@@ -63,7 +90,7 @@ On MacOS you also need to [allow Gatekeeper to run it](https://support.apple.com
 #### Windows

 ```sh
-move <binary> %APPDATA%/local/bin/dog-food.exe
+move <binary> %APPDATA%/local/bin/simplex-chat.exe
 ```

 ### Build from source
@@ -100,54 +127,72 @@ $ stack install

 ### Running the chat client

-To start the chat client, run `dog-food` (as in [eating your own dog food](https://en.wikipedia.org/wiki/Eating_your_own_dog_food)) from the terminal.
+To start the chat client, run `simplex-chat` from the terminal.

-By default, app data directory is created in the home directory (`~/.simplex`, or `%APPDATA%/simplex` on Windows), and SQLite database file `smp-chat.db` is initialized in it.
+By default, app data directory is created in the home directory (`~/.simplex`, or `%APPDATA%/simplex` on Windows), and two SQLite database files `simplex.chat.db` and `simplex.agent.db` are initialized in it.

-The default SMP server is `smp1.simplex.im#pLdiGvm0jD1CMblnov6Edd/391OrYsShw+RgdfR0ChA=` (base-64 encoded string after server host is the transport key digest) - it is pre-configured in the app.
-
-To specify a different file path for the chat database use `-d` command line option:
+To specify a different file path prefix for the database files use `-d` command line option:

 ```shell
-$ dog-food -d my-chat.db
+$ simplex-chat -d alice
 ```

+Running above, for example, would create `alice.chat.db` and `alice.agent.db` database files in current directory.
+
+Default SMP servers are hosted on Linode (London, UK and Fremont, CA) - they are [pre-configured in the app](https://github.com/simplex-chat/simplex-chat/blob/master/src/Simplex/Chat/Options.hs#L40). Base-64 encoded string after server host is the transport key digest.
+
 If you deployed your own SMP server(s) you can configure client via `-s` option:

 ```shell
-$ dog-food -s smp.example.com:5223#KXNE1m2E1m0lm92WGKet9CL6+lO742Vy5G6nsrkvgs8=
+$ simplex-chat -s smp.example.com:5223#KXNE1m2E1m0lm92WGKet9CL6+lO742Vy5G6nsrkvgs8=
 ```

 The base-64 encoded string in server address is the digest of RSA transport handshake key that the server will generate on the first run and output its digest.

 You can still talk to people using default or any other server - it only affects the location of the message queue when you initiate the connection (and the reply queue can be on another server, as set by the other party's client).

-Run `dog-food --help` to see all available options.
+Run `simplex-chat -h` to see all available options.

 ### How to use SimpleX chat

+Once you have started the chat, you will be prompted to specify your "display name" and an optional "full name" to create a local chat profile. Your display name is an alias for your contacts to refer to you by - it is not unique and does not serve as a global identity. In case different contacts chose the same display name, the chat client adds a numeric suffix to their local display names.
+
 This diagram shows how to connect and message a contact:

 <div align="center">
  <img align="center" src="images/how-to-use-simplex.svg">
 </div>

-Once you have started the chat, use `/add <name1>` to create a new connection and generate an invitation (`<name1>` is any name you want to use for that contact). The add command will output an invitation. Send this invitation to your contact via any other channel.
+Once you've set up your local profile, enter `/c` (for `/connect`) to create a new connection and generate an invitation. Send this invitation to your contact via any other channel.

 The invitation has the format `smp::<server>::<queue_id>::<rsa_public_key_for_this_queue_only>`. The invitation can only be used once and even if this is intercepted, the attacker would not be able to use it to send you the messages via this queue once your contact confirms that the connection is established.

-The contact who received the invitation should use `/connect <name2> <invitation>` to accept the connection (`<name2>` is any name that the accepting contact wants to use for you).
+The contact who received the invitation should enter `/c <invitation>` to accept the connection. This establishes the connection, and both parties are notified.

-Once the contact has used the `/connect` command, a connection is established and both parties are notified.
-
-They would then use `@<name> <message>` commands to send messages. One may also press Space or just start typing a message to send a message to the contact that was the last.
-
-If your contact is disconnected, restart the chat client - it may happen if you lose internet connection.
+They would then use `@<name> <message>` commands to send messages. You may also just start typing a message to send it to the contact that was the last.

 Use `/help` in chat to see the list of available commands.

+### Groups
+
+To create a group use `/g <group>`, the add contacts to it with `/a <group> <name>`and send messages with `#<group> <message>`. Use `/help groups` for other commands.
+
+![simplex-chat](./images/groups.gif)
+
+> **Please note**: the groups are not stored on any server, they are maintained as a list of members in the app database to whom the messages will be sent.
+
+### Sending files
+
+You can send a file to your contact with `/f @<contact> <file_path>` - the recipient will have to accept it before it is sent. Use `/help files` for other commands.
+
+![simplex-chat](./images/file-transfer.gif)
+
+You can send files to a group with `/f #<group> <file_path>`.
+
 ### Access chat history

+> 🚧 **Section currently out of date - will be updated soon** 🏗
+
 SimpleX chat stores all your contacts and conversations in a local database file, making it private and portable by design, fully owned and controlled by you.

 You can search your chat history via SQLite database file:
@@ -167,22 +212,18 @@ order by internal_id desc;

 > **Please note:** SQLite foreign key constraints are disabled by default, and must be **[enabled separately for each database connection](https://sqlite.org/foreignkeys.html#fk_enable)**. The latter can be achieved by running `PRAGMA foreign_keys = ON;` command on an open database connection. By running data altering queries without enabling foreign keys prior to that, you may risk putting your database in an inconsistent state.

-## Roadmap
+## Future roadmap

-1. Switch to application level chat protocol. This will allow to separate physical server connection management from logical chat contacts, and to support all common chat functions.
-2. SMP queue redundancy and rotation in SMP agent protocol.
-3. Symmetric groups support in SMP agent protocol, as a foundation for chat groups.
-4. Delivery confirmation in SMP agent protocol.
-5. Multi-agent/device data synchronisation - to use chat on multiple devices.
-6. Synchronous streams support in SMP and SMP agent protocols, to support file transfer.
-7. Terminal chat UI and mobile apps.
-8. Scripts for simple SMP server deployment to hosting providers: Linode, Digital Ocean and Heroku.
-9. Public broadcast channels.
-10. Optional public contact/group addresses using DNS to establish connections, but not using it to send and receive messages - in this way you will keep all your contacts and groups even if you lose the control of the domain.
-
-## Disclaimer
-
-System and protocol security have not been audited yet. As such, it is not advised to use SimpleX chat for high security communications.
+1. Mobile and desktop apps (in progress).
+2. SMP protocol improvements:
+  - SMP queue redundancy and rotation.
+  - Message delivery confirmation.
+  - Support multiple devices.
+3. Privacy-preserving identity server for optional DNS-based contact/group addresses to simplify connection and discovery, but not used to deliver messages:
+  - keep all your contacts and groups even if you lose the domain.
+  - the server doesn't have information about your contacts and groups.
+4. Media server to optimize sending large files to groups.
+5. Channels server for large groups and broadcast channels.

 ## License

--- a/apps/dog-food/ChatTerminal.hs
+++ b/apps/dog-food/ChatTerminal.hs
@@ -1,108 +0,0 @@
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-
-module ChatTerminal
-  ( ChatTerminal (..),
-    newChatTerminal,
-    chatTerminal,
-    ttyContact,
-    ttyFromContact,
-  )
-where
-
-import ChatTerminal.Basic
-import ChatTerminal.Core
-import ChatTerminal.Editor
-import Control.Concurrent (threadDelay)
-import Control.Concurrent.Async (race_)
-import Control.Monad
-import Control.Monad.IO.Class (liftIO)
-import Data.Time.Format (defaultTimeLocale, formatTime)
-import Data.Time.LocalTime (getZonedTime)
-import Numeric.Natural
-import Styled
-import System.Terminal
-import Types
-import UnliftIO.STM
-
-newChatTerminal :: Natural -> TermMode -> IO ChatTerminal
-newChatTerminal qSize termMode = do
-  inputQ <- newTBQueueIO qSize
-  outputQ <- newTBQueueIO qSize
-  activeContact <- newTVarIO Nothing
-  termSize <- withTerminal . runTerminalT $ getWindowSize
-  let lastRow = height termSize - 1
-  termState <- newTVarIO newTermState
-  termLock <- newTMVarIO ()
-  nextMessageRow <- newTVarIO lastRow
-  threadDelay 500000 -- this delay is the same as timeout in getTerminalSize
-  return ChatTerminal {inputQ, outputQ, activeContact, termMode, termState, termSize, nextMessageRow, termLock}
-
-newTermState :: TerminalState
-newTermState =
-  TerminalState
-    { inputString = "",
-      inputPosition = 0,
-      inputPrompt = "> ",
-      previousInput = ""
-    }
-
-chatTerminal :: ChatTerminal -> IO ()
-chatTerminal ct
-  | termSize ct == Size 0 0 || termMode ct == TermModeBasic =
-    run basicReceiveFromTTY basicSendToTTY
-  | otherwise = do
-    withTerminal . runTerminalT $ updateInput ct
-    run receiveFromTTY sendToTTY
-  where
-    run receive send = race_ (receive ct) (send ct)
-
-basicReceiveFromTTY :: ChatTerminal -> IO ()
-basicReceiveFromTTY ct =
-  forever $ getLn >>= atomically . writeTBQueue (inputQ ct)
-
-basicSendToTTY :: ChatTerminal -> IO ()
-basicSendToTTY ct = forever $ readOutputQ ct >>= mapM_ putStyledLn
-
-withTermLock :: MonadTerminal m => ChatTerminal -> m () -> m ()
-withTermLock ChatTerminal {termLock} action = do
-  _ <- atomically $ takeTMVar termLock
-  action
-  atomically $ putTMVar termLock ()
-
-receiveFromTTY :: ChatTerminal -> IO ()
-receiveFromTTY ct@ChatTerminal {inputQ, activeContact, termSize, termState} =
-  withTerminal . runTerminalT . forever $
-    getKey >>= processKey >> withTermLock ct (updateInput ct)
-  where
-    processKey :: MonadTerminal m => (Key, Modifiers) -> m ()
-    processKey = \case
-      (EnterKey, _) -> submitInput
-      key -> atomically $ do
-        ac <- readTVar activeContact
-        modifyTVar termState $ updateTermState ac (width termSize) key
-
-    submitInput :: MonadTerminal m => m ()
-    submitInput = do
-      msg <- atomically $ do
-        ts <- readTVar termState
-        let s = inputString ts
-        writeTVar termState $ ts {inputString = "", inputPosition = 0, previousInput = s}
-        writeTBQueue inputQ s
-        return s
-      withTermLock ct $ do
-        localTime <- liftIO getZonedTime
-        let localTimeStr = formatTime defaultTimeLocale "%H:%M" localTime
-        printMessage ct [styleMessage localTimeStr msg]
-
-sendToTTY :: ChatTerminal -> IO ()
-sendToTTY ct = forever $ do
-  -- `readOutputQ` should be outside of `withTerminal` (see #94)
-  msg <- readOutputQ ct
-  withTerminal . runTerminalT . withTermLock ct $ do
-    printMessage ct msg
-    updateInput ct
-
-readOutputQ :: ChatTerminal -> IO [StyledString]
-readOutputQ = atomically . readTBQueue . outputQ
--- a/apps/dog-food/ChatTerminal/Basic.hs
+++ b/apps/dog-food/ChatTerminal/Basic.hs
@@ -1,89 +0,0 @@
-{-# LANGUAGE LambdaCase #-}
-
-module ChatTerminal.Basic where
-
-import Control.Monad.IO.Class (liftIO)
-import Styled
-import System.Console.ANSI.Types
-import System.Exit (exitSuccess)
-import System.Terminal as C
-
-getLn :: IO String
-getLn = withTerminal $ runTerminalT getTermLine
-
-putStyledLn :: StyledString -> IO ()
-putStyledLn s =
-  withTerminal . runTerminalT $
-    putStyled s >> C.putLn >> flush
-
-- Currently it is assumed that the message does not have internal line breaks.
-- Previous implementation "kind of" supported them,
-- but it was not determining the number of printed lines correctly
-- because of accounting for control sequences in length
-putStyled :: MonadTerminal m => StyledString -> m ()
-putStyled (s1 :<>: s2) = putStyled s1 >> putStyled s2
-putStyled (Styled [] s) = putString s
-putStyled (Styled sgr s) = setSGR sgr >> putString s >> resetAttributes
-
-setSGR :: MonadTerminal m => [SGR] -> m ()
-setSGR = mapM_ $ \case
-  Reset -> resetAttributes
-  SetConsoleIntensity BoldIntensity -> setAttribute bold
-  SetConsoleIntensity _ -> resetAttribute bold
-  SetItalicized True -> setAttribute italic
-  SetItalicized _ -> resetAttribute italic
-  SetUnderlining NoUnderline -> resetAttribute underlined
-  SetUnderlining _ -> setAttribute underlined
-  SetSwapForegroundBackground True -> setAttribute inverted
-  SetSwapForegroundBackground _ -> resetAttribute inverted
-  SetColor l i c -> setAttribute . layer l . intensity i $ color c
-  SetBlinkSpeed _ -> pure ()
-  SetVisible _ -> pure ()
-  SetRGBColor _ _ -> pure ()
-  SetPaletteColor _ _ -> pure ()
-  SetDefaultColor _ -> pure ()
-  where
-    layer = \case
-      Foreground -> foreground
-      Background -> background
-    intensity = \case
-      Dull -> id
-      Vivid -> bright
-    color = \case
-      Black -> black
-      Red -> red
-      Green -> green
-      Yellow -> yellow
-      Blue -> blue
-      Magenta -> magenta
-      Cyan -> cyan
-      White -> white
-
-getKey :: MonadTerminal m => m (Key, Modifiers)
-getKey =
-  flush >> awaitEvent >>= \case
-    Left Interrupt -> liftIO exitSuccess
-    Right (KeyEvent key ms) -> pure (key, ms)
-    _ -> getKey
-
-getTermLine :: MonadTerminal m => m String
-getTermLine = getChars ""
-  where
-    getChars s =
-      getKey >>= \(key, ms) -> case key of
-        CharKey c
-          | ms == mempty || ms == shiftKey -> do
-            C.putChar c
-            flush
-            getChars (c : s)
-          | otherwise -> getChars s
-        EnterKey -> do
-          C.putLn
-          flush
-          pure $ reverse s
-        BackspaceKey -> do
-          moveCursorBackward 1
-          eraseChars 1
-          flush
-          getChars $ if null s then s else tail s
-        _ -> getChars s
--- a/apps/dog-food/ChatTerminal/Editor.hs
+++ b/apps/dog-food/ChatTerminal/Editor.hs
@@ -1,61 +0,0 @@
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-
-module ChatTerminal.Editor where
-
-import ChatTerminal.Basic
-import ChatTerminal.Core
-import Styled
-import System.Terminal
-import UnliftIO.STM
-
-- debug :: MonadTerminal m => String -> m ()
-- debug s = do
--   saveCursor
--   setCursorPosition $ Position 0 0
--   putString s
--   restoreCursor
-
-updateInput :: forall m. MonadTerminal m => ChatTerminal -> m ()
-updateInput ct@ChatTerminal {termSize = Size {height, width}, termState, nextMessageRow} = do
-  hideCursor
-  ts <- readTVarIO termState
-  nmr <- readTVarIO nextMessageRow
-  let ih = inputHeight ts ct
-      iStart = height - ih
-      prompt = inputPrompt ts
-      Position {row, col} = positionRowColumn width $ length prompt + inputPosition ts
-  if nmr >= iStart
-    then atomically $ writeTVar nextMessageRow iStart
-    else clearLines nmr iStart
-  setCursorPosition $ Position {row = max nmr iStart, col = 0}
-  putString $ prompt <> inputString ts <> " "
-  eraseInLine EraseForward
-  setCursorPosition $ Position {row = iStart + row, col}
-  showCursor
-  flush
-  where
-    clearLines :: Int -> Int -> m ()
-    clearLines from till
-      | from >= till = return ()
-      | otherwise = do
-        setCursorPosition $ Position {row = from, col = 0}
-        eraseInLine EraseForward
-        clearLines (from + 1) till
-
-printMessage :: forall m. MonadTerminal m => ChatTerminal -> [StyledString] -> m ()
-printMessage ChatTerminal {termSize = Size {height, width}, nextMessageRow} msg = do
-  nmr <- readTVarIO nextMessageRow
-  setCursorPosition $ Position {row = nmr, col = 0}
-  mapM_ printStyled msg
-  flush
-  let lc = sum $ map lineCount msg
-  atomically . writeTVar nextMessageRow $ min (height - 1) (nmr + lc)
-  where
-    lineCount :: StyledString -> Int
-    lineCount s = sLength s `div` width + 1
-    printStyled :: StyledString -> m ()
-    printStyled s = do
-      putStyled s
-      eraseInLine EraseForward
-      putLn
--- a/apps/dog-food/Main.hs
+++ b/apps/dog-food/Main.hs
@@ -1,313 +0,0 @@
-{-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE GADTs #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-
-module Main where
-
-import ChatOptions
-import ChatTerminal
-import ChatTerminal.Core
-import Control.Applicative ((<|>))
-import Control.Concurrent.STM
-import Control.Logger.Simple
-import Control.Monad.Reader
-import Data.Attoparsec.ByteString.Char8 (Parser)
-import qualified Data.Attoparsec.ByteString.Char8 as A
-import Data.ByteString.Char8 (ByteString)
-import qualified Data.ByteString.Char8 as B
-import Data.Functor (($>))
-import Data.List (intersperse)
-import qualified Data.Text as T
-import Data.Text.Encoding
-import Data.Time.Clock (DiffTime, UTCTime)
-import Data.Time.Format (defaultTimeLocale, formatTime)
-import Data.Time.LocalTime
-import Numeric.Natural
-import Simplex.Chat.Markdown
-import Simplex.Messaging.Agent (getSMPAgentClient, runSMPAgentClient)
-import Simplex.Messaging.Agent.Client (AgentClient (..))
-import Simplex.Messaging.Agent.Env.SQLite
-import Simplex.Messaging.Agent.Protocol
-import Simplex.Messaging.Client (smpDefaultConfig)
-import Simplex.Messaging.Parsers (parseAll)
-import Simplex.Messaging.Util (raceAny_)
-import Styled
-import System.Console.ANSI.Types
-import System.Directory (getAppUserDataDirectory)
-import Types
-
-cfg :: AgentConfig
-cfg =
-  AgentConfig
-    { tcpPort = undefined, -- agent does not listen to TCP
-      smpServers = undefined, -- filled in from options
-      rsaKeySize = 2048 `div` 8,
-      connIdBytes = 12,
-      tbqSize = 16,
-      dbFile = "smp-chat.db",
-      smpCfg = smpDefaultConfig
-    }
-
-logCfg :: LogConfig
-logCfg = LogConfig {lc_file = Nothing, lc_stderr = True}
-
-data ChatClient = ChatClient
-  { inQ :: TBQueue ChatCommand,
-    outQ :: TBQueue ChatResponse
-  }
-
-- | GroupMessage ChatGroup ByteString
-- | AddToGroup Contact
-data ChatCommand
-  = ChatHelp
-  | MarkdownHelp
-  | AddConnection Contact
-  | Connect Contact SMPQueueInfo
-  | DeleteConnection Contact
-  | SendMessage Contact ByteString
-
-chatCommandP :: Parser ChatCommand
-chatCommandP =
-  ("/help" <|> "/h") $> ChatHelp
-    <|> ("/markdown" <|> "/m") $> MarkdownHelp
-    <|> ("/add " <|> "/a ") *> (AddConnection <$> contact)
-    <|> ("/connect " <> "/c ") *> connect
-    <|> ("/delete " <> "/d ") *> (DeleteConnection <$> contact)
-    <|> "@" *> sendMessage
-  where
-    connect = Connect <$> contact <* A.space <*> smpQueueInfoP
-    sendMessage = SendMessage <$> contact <* A.space <*> A.takeByteString
-    contact = Contact <$> A.takeTill (== ' ')
-
-data ChatResponse
-  = ChatHelpInfo
-  | MarkdownInfo
-  | Invitation SMPQueueInfo
-  | Connected Contact
-  | Confirmation Contact
-  | ReceivedMessage Contact UTCTime ByteString MsgIntegrity
-  | Disconnected Contact
-  | YesYes
-  | ContactError ConnectionErrorType Contact
-  | ErrorInput ByteString
-  | ChatError AgentErrorType
-  | NoChatResponse
-
-serializeChatResponse :: ChatOpts -> TimeZone -> ZonedTime -> ChatResponse -> [StyledString]
-serializeChatResponse _ localTz currentTime = \case
-  ChatHelpInfo -> chatHelpInfo
-  MarkdownInfo -> markdownInfo
-  Invitation qInfo ->
-    [ "pass this invitation to your contact (via any channel): ",
-      "",
-      (bPlain . serializeSmpQueueInfo) qInfo,
-      "",
-      "and ask them to connect: /c <name_for_you> <invitation_above>"
-    ]
-  Connected c -> [ttyContact c <> " connected"]
-  Confirmation c -> [ttyContact c <> " ok"]
-  ReceivedMessage c utcTime t mi ->
-    prependFirst (formatUTCTime utcTime <> " " <> ttyFromContact c) (msgPlain t)
-      ++ showIntegrity mi
-  Disconnected c -> ["disconnected from " <> ttyContact c <> " - restart chat"]
-  YesYes -> ["you got it!"]
-  ContactError e c -> case e of
-    UNKNOWN -> ["no contact " <> ttyContact c]
-    DUPLICATE -> ["contact " <> ttyContact c <> " already exists"]
-    SIMPLEX -> ["contact " <> ttyContact c <> " did not accept invitation yet"]
-  ErrorInput t -> ["invalid input: " <> bPlain t]
-  ChatError e -> ["chat error: " <> plain (show e)]
-  NoChatResponse -> [""]
-  where
-    prependFirst :: StyledString -> [StyledString] -> [StyledString]
-    prependFirst s [] = [s]
-    prependFirst s (s' : ss) = (s <> s') : ss
-    formatUTCTime :: UTCTime -> StyledString
-    formatUTCTime utcTime = do
-      let localTime = utcToLocalTime localTz utcTime
-          format =
-            if (localDay localTime < localDay (zonedTimeToLocalTime currentTime))
-              && (timeOfDayToTime (localTimeOfDay localTime) > (6 * 60 * 60 :: DiffTime))
-              then "%m-%d" -- if message is from yesterday or before and 6 hours has passed since midnight
-              else "%H:%M"
-      styleTime $ formatTime defaultTimeLocale format localTime
-    msgPlain :: ByteString -> [StyledString]
-    msgPlain = map styleMarkdownText . T.lines . safeDecodeUtf8
-    showIntegrity :: MsgIntegrity -> [StyledString]
-    showIntegrity MsgOk = []
-    showIntegrity (MsgError err) = msgError $ case err of
-      MsgSkipped fromId toId ->
-        "skipped message ID " <> show fromId
-          <> if fromId == toId then "" else ".." <> show toId
-      MsgBadId msgId -> "unexpected message ID " <> show msgId
-      MsgBadHash -> "incorrect message hash"
-      MsgDuplicate -> "duplicate message ID"
-    msgError :: String -> [StyledString]
-    msgError s = [styled (Colored Red) s]
-
-chatHelpInfo :: [StyledString]
-chatHelpInfo =
-  map
-    styleMarkdown
-    [ Markdown (Colored Cyan) "Using Simplex chat prototype.",
-      "Follow these steps to set up a connection:",
-      "",
-      Markdown (Colored Green) "Step 1: " <> Markdown (Colored Cyan) "/add bob" <> " -- Alice adds her contact, Bob (she can use any name).",
-      indent <> "Alice should send the invitation printed by the /add command",
-      indent <> "to her contact, Bob, out-of-band, via any trusted channel.",
-      "",
-      Markdown (Colored Green) "Step 2: " <> Markdown (Colored Cyan) "/connect alice <invitation>" <> " -- Bob accepts the invitation.",
-      indent <> "Bob also can use any name for his contact, Alice,",
-      indent <> "followed by the invitation he received out-of-band.",
-      "",
-      Markdown (Colored Green) "Step 3: " <> "Bob and Alice are notified that the connection is set up,",
-      indent <> "both can now send messages:",
-      indent <> Markdown (Colored Cyan) "@bob Hello, Bob!" <> " -- Alice messages Bob.",
-      indent <> Markdown (Colored Cyan) "@alice Hey, Alice!" <> " -- Bob replies to Alice.",
-      "",
-      Markdown (Colored Green) "Other commands:",
-      indent <> Markdown (Colored Cyan) "/delete" <> " -- deletes contact and all messages with them.",
-      indent <> Markdown (Colored Cyan) "/markdown" <> " -- prints the supported markdown syntax.",
-      "",
-      "The commands may be abbreviated to a single letter: " <> listCommands ["/a", "/c", "/d", "/m"]
-    ]
-  where
-    listCommands = mconcat . intersperse ", " . map highlight
-    highlight = Markdown (Colored Cyan)
-    indent = "        "
-
-markdownInfo :: [StyledString]
-markdownInfo =
-  map
-    styleMarkdown
-    [ "Markdown:",
-      "  *bold*          - " <> Markdown Bold "bold text",
-      "  _italic_        - " <> Markdown Italic "italic text" <> " (shown as underlined)",
-      "  +underlined+    - " <> Markdown Underline "underlined text",
-      "  ~strikethrough~ - " <> Markdown StrikeThrough "strikethrough text" <> " (shown as inverse)",
-      "  `code snippet`  - " <> Markdown Snippet "a + b // no *markdown* here",
-      "  !1 text!        - " <> red "red text" <> " (1-6: red, green, blue, yellow, cyan, magenta)",
-      "  #secret#        - " <> Markdown Secret "secret text" <> " (can be copy-pasted)"
-    ]
-  where
-    red = Markdown (Colored Red)
-
-main :: IO ()
-main = do
-  opts@ChatOpts {dbFile, smpServers, termMode} <- welcomeGetOpts
-  t <- atomically $ newChatClient (tbqSize cfg)
-  ct <- newChatTerminal (tbqSize cfg) termMode
-  -- setLogLevel LogInfo -- LogError
-  -- withGlobalLogging logCfg $ do
-  env <- newSMPAgentEnv cfg {dbFile, smpServers}
-  dogFoodChat t ct env opts
-
-welcomeGetOpts :: IO ChatOpts
-welcomeGetOpts = do
-  appDir <- getAppUserDataDirectory "simplex"
-  opts@ChatOpts {dbFile} <- getChatOpts appDir
-  putStrLn "SimpleX chat prototype v0.3.0"
-  putStrLn $ "db: " <> dbFile
-  putStrLn "type \"/help\" or \"/h\" for usage info"
-  pure opts
-
-dogFoodChat :: ChatClient -> ChatTerminal -> Env -> ChatOpts -> IO ()
-dogFoodChat t ct env opts = do
-  c <- runReaderT getSMPAgentClient env
-  localTz <- liftIO getCurrentTimeZone
-  raceAny_
-    [ runReaderT (runSMPAgentClient c) env,
-      sendToAgent t ct c,
-      sendToChatTerm t ct opts localTz,
-      receiveFromAgent t ct c,
-      receiveFromChatTerm t ct,
-      chatTerminal ct
-    ]
-
-newChatClient :: Natural -> STM ChatClient
-newChatClient qSize = do
-  inQ <- newTBQueue qSize
-  outQ <- newTBQueue qSize
-  return ChatClient {inQ, outQ}
-
-receiveFromChatTerm :: ChatClient -> ChatTerminal -> IO ()
-receiveFromChatTerm t ct = forever $ do
-  atomically (readTBQueue $ inputQ ct)
-    >>= processOrError . parseAll chatCommandP . encodeUtf8 . T.pack
-  where
-    processOrError = \case
-      Left err -> writeOutQ . ErrorInput $ B.pack err
-      Right ChatHelp -> writeOutQ ChatHelpInfo
-      Right MarkdownHelp -> writeOutQ MarkdownInfo
-      Right cmd -> atomically $ writeTBQueue (inQ t) cmd
-    writeOutQ = atomically . writeTBQueue (outQ t)
-
-sendToChatTerm :: ChatClient -> ChatTerminal -> ChatOpts -> TimeZone -> IO ()
-sendToChatTerm ChatClient {outQ} ChatTerminal {outputQ} opts localTz = forever $ do
-  atomically (readTBQueue outQ) >>= \case
-    NoChatResponse -> return ()
-    resp -> do
-      currentTime <- liftIO getZonedTime
-      atomically . writeTBQueue outputQ $ serializeChatResponse opts localTz currentTime resp
-
-sendToAgent :: ChatClient -> ChatTerminal -> AgentClient -> IO ()
-sendToAgent ChatClient {inQ} ct AgentClient {rcvQ} = do
-  atomically $ writeTBQueue rcvQ ("1", "", SUBALL) -- hack for subscribing to all
-  forever . atomically $ do
-    cmd <- readTBQueue inQ
-    writeTBQueue rcvQ `mapM_` agentTransmission cmd
-    setActiveContact cmd
-  where
-    setActiveContact :: ChatCommand -> STM ()
-    setActiveContact = \case
-      SendMessage a _ -> setActive ct a
-      DeleteConnection a -> unsetActive ct a
-      _ -> pure ()
-    agentTransmission :: ChatCommand -> Maybe (ATransmission 'Client)
-    agentTransmission = \case
-      AddConnection a -> transmission a NEW
-      Connect a qInfo -> transmission a $ JOIN qInfo $ ReplyMode On
-      DeleteConnection a -> transmission a DEL
-      SendMessage a msg -> transmission a $ SEND msg
-      ChatHelp -> Nothing
-      MarkdownHelp -> Nothing
-    transmission :: Contact -> ACommand 'Client -> Maybe (ATransmission 'Client)
-    transmission (Contact a) cmd = Just ("1", a, cmd)
-
-receiveFromAgent :: ChatClient -> ChatTerminal -> AgentClient -> IO ()
-receiveFromAgent t ct c = forever . atomically $ do
-  resp <- chatResponse <$> readTBQueue (sndQ c)
-  writeTBQueue (outQ t) resp
-  setActiveContact resp
-  where
-    chatResponse :: ATransmission 'Agent -> ChatResponse
-    chatResponse (_, a, resp) = case resp of
-      INV qInfo -> Invitation qInfo
-      CON -> Connected contact
-      END -> Disconnected contact
-      MSG {msgBody, msgIntegrity, brokerMeta} -> ReceivedMessage contact (snd brokerMeta) msgBody msgIntegrity
-      SENT _ -> NoChatResponse
-      OK -> Confirmation contact
-      ERR (CONN e) -> ContactError e contact
-      ERR e -> ChatError e
-      where
-        contact = Contact a
-    setActiveContact :: ChatResponse -> STM ()
-    setActiveContact = \case
-      Connected a -> setActive ct a
-      ReceivedMessage a _ _ _ -> setActive ct a
-      Disconnected a -> unsetActive ct a
-      _ -> pure ()
-
-setActive :: ChatTerminal -> Contact -> STM ()
-setActive ct = writeTVar (activeContact ct) . Just
-
-unsetActive :: ChatTerminal -> Contact -> STM ()
-unsetActive ct a = modifyTVar (activeContact ct) unset
-  where
-    unset a' = if Just a == a' then Nothing else a'
--- a/apps/dog-food/Types.hs
+++ b/apps/dog-food/Types.hs
@@ -1,14 +0,0 @@
-{-# LANGUAGE LambdaCase #-}
-
-module Types where
-
-import Data.ByteString.Char8 (ByteString)
-
-newtype Contact = Contact {toBs :: ByteString} deriving (Eq)
-
-data TermMode = TermModeBasic | TermModeEditor deriving (Eq)
-
-termModeName :: TermMode -> String
-termModeName = \case
-  TermModeBasic -> "basic"
-  TermModeEditor -> "editor"
--- a/apps/simplex-chat/Demo.hs
+++ b/apps/simplex-chat/Demo.hs
@@ -0,0 +1,119 @@
+{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Demo where
+
+import Simplex.Chat.Styled
+import System.Console.ANSI.Types
+import System.Terminal
+
+someViewUpdate :: Monad m => m ()
+someViewUpdate = pure ()
+
+chatLayoutDemo :: MonadTerminal m => m ()
+chatLayoutDemo =
+  mapM_
+    putStyledLn
+    [ "  search " <> Styled gray "(ctrl-s)   " <> lineV <> Styled toContact " @bob " <> "Bob Roberts                                    " <> Styled greenColor "@john" <> "",
+      "                    " <> lineV <> Styled gray " 14:15 online                             profile (ctrl-p)",
+      lineH 20 <> crossover <> lineH 59,
+      "* " <> Styled [SetConsoleIntensity BoldIntensity] "all chats   " <> "      " <> lineV <> "",
+      Styled gray "  (ctrl-a)          " <> lineV <> "",
+      "*" <> Styled toContact " @alice      " <> Styled darkGray "14:37 " <> lineV <> "",
+      Styled gray "  Hello there!  ... " <> lineV <> "",
+      Styled selected " " <> Styled (toContact <> selected) " @bob        " <> Styled (selected <> gray) "12:35 " <> lineV <> "",
+      Styled selected "  All good, John... " <> lineV <> "",
+      "*" <> Styled group " #team       " <> Styled darkGray "10:55 " <> lineV <> "",
+      Styled gray "  What's up ther... " <> lineV <> "",
+      " " <> Styled toContact " @tom          " <> Styled darkGray "Wed " <> lineV <> "",
+      Styled gray "  Have you seen ... " <> lineV <> "",
+      "                    " <> lineV,
+      "                    " <> lineV,
+      "                    " <> lineV,
+      "                    " <> lineV,
+      "                    " <> lineV,
+      "                    " <> lineV <> Styled greenColor " ✔︎" <> Styled darkGray " 12:30" <> Styled toContact " @bob" <> " hey bob - how is it going?",
+      "                    " <> lineV <> Styled greenColor " ✔︎" <> Styled darkGray "      " <> Styled toContact "     " <> " let's meet soon!",
+      "                    " <> lineV <> " *" <> Styled darkGray " 12:35" <> Styled contact " bob>" <> " All good, John! How are you?",
+      "                    " <> teeL <> lineH 59,
+      "                    " <> lineV <> " > " <> Styled toContact "@bob" <> " 😀 This is the message that will be sent to @bob"
+    ]
+    >> putStyled (Styled ctrlKeys " help (ctrl-h)  new contact (ctrl-n)  choose chat (ctrl-↓↑)  new group (ctrl-g) ")
+
+contact :: [SGR]
+contact = [SetConsoleIntensity BoldIntensity, SetColor Foreground Vivid Yellow]
+
+toContact :: [SGR]
+toContact = [SetConsoleIntensity BoldIntensity, SetColor Foreground Vivid Cyan]
+
+group :: [SGR]
+group = [SetConsoleIntensity BoldIntensity, SetColor Foreground Vivid Cyan]
+
+selected :: [SGR]
+selected = [SetColor Background Vivid Black]
+
+ctrlKeys :: [SGR]
+ctrlKeys = [SetColor Background Dull White, SetColor Foreground Dull Black]
+
+gray :: [SGR]
+gray = [SetColor Foreground Dull White]
+
+darkGray :: [SGR]
+darkGray = [SetColor Foreground Vivid Black]
+
+greenColor :: [SGR]
+greenColor = [SetColor Foreground Vivid Green]
+
+lineV :: StyledString
+lineV = Styled selected " " -- "\x2502"
+
+lineH :: Int -> StyledString
+lineH n = Styled darkGray $ replicate n '\x2500'
+
+teeL :: StyledString
+teeL = Styled selected " " -- "\x251C"
+
+crossover :: StyledString
+crossover = Styled selected " " -- "\x253C"
+
+putStyledLn :: MonadTerminal m => StyledString -> m ()
+putStyledLn s = putStyled s >> putLn
+
+putStyled :: MonadTerminal m => StyledString -> m ()
+putStyled (s1 :<>: s2) = putStyled s1 >> putStyled s2
+putStyled (Styled [] s) = putString s
+putStyled (Styled sgr s) = setSGR sgr >> putString s >> resetAttributes
+
+setSGR :: MonadTerminal m => [SGR] -> m ()
+setSGR = mapM_ $ \case
+  Reset -> resetAttributes
+  SetConsoleIntensity BoldIntensity -> setAttribute bold
+  SetConsoleIntensity _ -> resetAttribute bold
+  SetItalicized True -> setAttribute italic
+  SetItalicized _ -> resetAttribute italic
+  SetUnderlining NoUnderline -> resetAttribute underlined
+  SetUnderlining _ -> setAttribute underlined
+  SetSwapForegroundBackground True -> setAttribute inverted
+  SetSwapForegroundBackground _ -> resetAttribute inverted
+  SetColor l i c -> setAttribute . layer l . intensity i $ color c
+  SetBlinkSpeed _ -> pure ()
+  SetVisible _ -> pure ()
+  SetRGBColor _ _ -> pure ()
+  SetPaletteColor _ _ -> pure ()
+  SetDefaultColor _ -> pure ()
+  where
+    layer = \case
+      Foreground -> foreground
+      Background -> background
+    intensity = \case
+      Dull -> id
+      Vivid -> bright
+    color = \case
+      Black -> black
+      Red -> red
+      Green -> green
+      Yellow -> yellow
+      Blue -> blue
+      Magenta -> magenta
+      Cyan -> cyan
+      White -> white
--- a/apps/simplex-chat/Main.hs
+++ b/apps/simplex-chat/Main.hs
@@ -0,0 +1,58 @@
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Main where
+
+import Simplex.Chat
+import Simplex.Chat.Options
+import System.Directory (getAppUserDataDirectory)
+import System.Terminal (withTerminal)
+
+main :: IO ()
+main = do
+  opts <- welcomeGetOpts
+  t <- withTerminal pure
+  simplexChat defaultChatConfig opts t
+
+welcomeGetOpts :: IO ChatOpts
+welcomeGetOpts = do
+  appDir <- getAppUserDataDirectory "simplex"
+  opts@ChatOpts {dbFile} <- getChatOpts appDir
+  putStrLn "SimpleX chat prototype v0.3.1"
+  putStrLn $ "db: " <> dbFile <> ".chat.db, " <> dbFile <> ".agent.db"
+  putStrLn "type \"/help\" or \"/h\" for usage info"
+  pure opts
+
+-- defaultSettings :: C.Size -> C.VirtualTerminalSettings
+-- defaultSettings size =
+--   C.VirtualTerminalSettings
+--     { C.virtualType = "xterm",
+--       C.virtualWindowSize = pure size,
+--       C.virtualEvent = retry,
+--       C.virtualInterrupt = retry
+--     }
+
+-- main :: IO ()
+-- main = do
+--   void $ createStore "simplex-chat.db" 4
+
+--   hFlush stdout
+--   -- ChatTerminal {termSize} <- newChatTerminal
+--   -- pos <- C.withVirtualTerminal (defaultSettings termSize) $
+--   --   \t -> runTerminalT (C.setAlternateScreenBuffer True >> C.putString "a" >> C.flush >> C.getCursorPosition) t
+--   -- print pos
+--   -- race_ (printEvents t) (updateTerminal t)
+--   void . withTerminal . runTerminalT $ chatLayoutDemo >> C.flush >> C.awaitEvent
+
+-- printEvents :: C.VirtualTerminal -> IO ()
+-- printEvents t = forever $ do
+--   event <- withTerminal . runTerminalT $ C.flush >> C.awaitEvent
+--   runTerminalT (putStringLn $ show event) t
+
+-- updateTerminal :: C.VirtualTerminal -> IO ()
+-- updateTerminal t = forever $ do
+--   threadDelay 10000
+--   win <- readTVarIO $ C.virtualWindow t
+--   withTerminal . runTerminalT $ mapM_ C.putStringLn win >> C.flush
--- a/images/connection.gif
+++ b/images/connection.gif
--- a/images/file-transfer.gif
+++ b/images/file-transfer.gif
--- a/images/groups.gif
+++ b/images/groups.gif
--- a/images/how-to-use-simplex.svg
+++ b/images/how-to-use-simplex.svg
--- a/images/strapline.svg
+++ b/images/strapline.svg
--- a/migrations/20210612_initial.sql
+++ b/migrations/20210612_initial.sql
@@ -0,0 +1,278 @@
+CREATE TABLE contact_profiles ( -- remote user profile
+  contact_profile_id INTEGER PRIMARY KEY,
+  display_name TEXT NOT NULL, -- contact name set by remote user (not unique), this name must not contain spaces
+  full_name TEXT NOT NULL,
+  properties TEXT NOT NULL DEFAULT '{}' -- JSON with contact profile properties
+);
+
+CREATE INDEX contact_profiles_index ON contact_profiles (display_name, full_name);
+
+CREATE TABLE users (
+  user_id INTEGER PRIMARY KEY,
+  contact_id INTEGER NOT NULL UNIQUE REFERENCES contacts ON DELETE CASCADE
+    DEFERRABLE INITIALLY DEFERRED,
+  local_display_name TEXT NOT NULL UNIQUE,
+  active_user INTEGER NOT NULL DEFAULT 0, -- 1 for active user
+  FOREIGN KEY (user_id, local_display_name)
+    REFERENCES display_names (user_id, local_display_name)
+    ON DELETE RESTRICT
+    ON UPDATE CASCADE
+    DEFERRABLE INITIALLY DEFERRED
+);
+
+CREATE TABLE display_names (
+  user_id INTEGER NOT NULL REFERENCES users,
+  local_display_name TEXT NOT NULL,
+  ldn_base TEXT NOT NULL,
+  ldn_suffix INTEGER NOT NULL DEFAULT 0,
+  PRIMARY KEY (user_id, local_display_name) ON CONFLICT FAIL,
+  UNIQUE (user_id, ldn_base, ldn_suffix) ON CONFLICT FAIL
+) WITHOUT ROWID;
+
+CREATE TABLE contacts (
+  contact_id INTEGER PRIMARY KEY,
+  contact_profile_id INTEGER REFERENCES contact_profiles, -- NULL if it's an incognito profile
+  user_id INTEGER NOT NULL REFERENCES users,
+  local_display_name TEXT NOT NULL,
+  is_user INTEGER NOT NULL DEFAULT 0, -- 1 if this contact is a user
+  via_group INTEGER REFERENCES groups (group_id) ON DELETE SET NULL,
+  created_at TEXT NOT NULL DEFAULT (datetime('now')),
+  FOREIGN KEY (user_id, local_display_name)
+    REFERENCES display_names (user_id, local_display_name)
+    ON DELETE RESTRICT
+    ON UPDATE CASCADE,
+  UNIQUE (user_id, local_display_name),
+  UNIQUE (user_id, contact_profile_id)
+);
+
+CREATE TABLE sent_probes (
+  sent_probe_id INTEGER PRIMARY KEY,
+  contact_id INTEGER NOT NULL UNIQUE REFERENCES contacts ON DELETE CASCADE,
+  probe BLOB NOT NULL,
+  user_id INTEGER NOT NULL REFERENCES users,
+  UNIQUE (user_id, probe)
+);
+
+CREATE TABLE sent_probe_hashes (
+  sent_probe_hash_id INTEGER PRIMARY KEY,
+  sent_probe_id INTEGER NOT NULL REFERENCES sent_probes ON DELETE CASCADE,
+  contact_id INTEGER NOT NULL REFERENCES contacts ON DELETE CASCADE,
+  user_id INTEGER NOT NULL REFERENCES users,
+  UNIQUE (sent_probe_id, contact_id)
+);
+
+CREATE TABLE received_probes (
+  received_probe_id INTEGER PRIMARY KEY,
+  contact_id INTEGER NOT NULL REFERENCES contacts ON DELETE CASCADE,
+  probe BLOB,
+  probe_hash BLOB NOT NULL,
+  user_id INTEGER NOT NULL REFERENCES users
+);
+
+CREATE TABLE known_servers(
+  server_id INTEGER PRIMARY KEY,
+  host TEXT NOT NULL,
+  port TEXT NOT NULL,
+  key_hash BLOB,
+  user_id INTEGER NOT NULL REFERENCES users,
+  UNIQUE (user_id, host, port)
+) WITHOUT ROWID;
+
+CREATE TABLE group_profiles ( -- shared group profiles
+  group_profile_id INTEGER PRIMARY KEY,
+  display_name TEXT NOT NULL, -- this name must not contain spaces
+  full_name TEXT NOT NULL,
+  properties TEXT NOT NULL DEFAULT '{}' -- JSON with user or contact profile
+);
+
+CREATE TABLE groups (
+  group_id INTEGER PRIMARY KEY, -- local group ID
+  user_id INTEGER NOT NULL REFERENCES users,
+  local_display_name TEXT NOT NULL, -- local group name without spaces
+  group_profile_id INTEGER REFERENCES group_profiles, -- shared group profile
+  inv_queue_info BLOB,
+  FOREIGN KEY (user_id, local_display_name)
+    REFERENCES display_names (user_id, local_display_name)
+    ON DELETE RESTRICT
+    ON UPDATE CASCADE,
+  UNIQUE (user_id, local_display_name),
+  UNIQUE (user_id, group_profile_id)
+);
+
+CREATE TABLE group_members ( -- group members, excluding the local user
+  group_member_id INTEGER PRIMARY KEY,
+  group_id INTEGER NOT NULL REFERENCES groups ON DELETE RESTRICT,
+  member_id BLOB NOT NULL, -- shared member ID, unique per group
+  member_role TEXT NOT NULL, -- owner, admin, member
+  member_category TEXT NOT NULL, -- see GroupMemberCategory
+  member_status TEXT NOT NULL, -- see GroupMemberStatus
+  invited_by INTEGER REFERENCES contacts (contact_id) ON DELETE RESTRICT, -- NULL for the members who joined before the current user and for the group creator
+  group_queue_info BLOB,
+  direct_queue_info BLOB,
+  user_id INTEGER NOT NULL REFERENCES users,
+  local_display_name TEXT NOT NULL, -- should be the same as contact
+  contact_profile_id INTEGER NOT NULL REFERENCES contact_profiles ON DELETE RESTRICT,
+  contact_id INTEGER REFERENCES contacts ON DELETE RESTRICT,
+  FOREIGN KEY (user_id, local_display_name)
+    REFERENCES display_names (user_id, local_display_name)
+    ON DELETE RESTRICT
+    ON UPDATE CASCADE,
+  UNIQUE (group_id, member_id)
+);
+
+CREATE TABLE group_member_intros (
+  group_member_intro_id INTEGER PRIMARY KEY,
+  re_group_member_id INTEGER NOT NULL REFERENCES group_members (group_member_id) ON DELETE CASCADE,
+  to_group_member_id INTEGER NOT NULL REFERENCES group_members (group_member_id) ON DELETE CASCADE,
+  group_queue_info BLOB,
+  direct_queue_info BLOB,
+  intro_status TEXT NOT NULL, -- see GroupMemberIntroStatus
+  UNIQUE (re_group_member_id, to_group_member_id)
+);
+
+CREATE TABLE files (
+  file_id INTEGER PRIMARY KEY,
+  contact_id INTEGER REFERENCES contacts ON DELETE RESTRICT,
+  group_id INTEGER REFERENCES groups ON DELETE RESTRICT,
+  file_name TEXT NOT NULL,
+  file_path TEXT,
+  file_size INTEGER NOT NULL,
+  chunk_size INTEGER NOT NULL,
+  created_at TEXT NOT NULL DEFAULT (datetime('now')),
+  user_id INTEGER NOT NULL REFERENCES users
+);
+
+CREATE TABLE snd_files (
+  file_id INTEGER NOT NULL REFERENCES files ON DELETE RESTRICT,
+  connection_id INTEGER NOT NULL REFERENCES connections ON DELETE RESTRICT,
+  file_status TEXT NOT NULL, -- new, accepted, connected, completed
+  group_member_id INTEGER REFERENCES group_members ON DELETE RESTRICT,
+  PRIMARY KEY (file_id, connection_id)
+) WITHOUT ROWID;
+
+CREATE TABLE rcv_files (
+  file_id INTEGER PRIMARY KEY REFERENCES files ON DELETE RESTRICT,
+  file_status TEXT NOT NULL, -- new, accepted, connected, completed
+  group_member_id INTEGER REFERENCES group_members ON DELETE RESTRICT,
+  file_queue_info BLOB
+);
+
+CREATE TABLE snd_file_chunks (
+  file_id INTEGER NOT NULL,
+  connection_id INTEGER NOT NULL,
+  chunk_number INTEGER NOT NULL,
+  chunk_agent_msg_id INTEGER,
+  chunk_sent INTEGER NOT NULL DEFAULT 0, -- 0 (sent to agent), 1 (sent to server)
+  FOREIGN KEY (file_id, connection_id) REFERENCES snd_files ON DELETE CASCADE,
+  PRIMARY KEY (file_id, connection_id, chunk_number)
+) WITHOUT ROWID;
+
+CREATE TABLE rcv_file_chunks (
+  file_id INTEGER NOT NULL REFERENCES rcv_files,
+  chunk_number INTEGER NOT NULL,
+  chunk_agent_msg_id INTEGER NOT NULL,
+  chunk_stored INTEGER NOT NULL DEFAULT 0, -- 0 (received), 1 (appended to file)
+  PRIMARY KEY (file_id, chunk_number)
+) WITHOUT ROWID;
+
+CREATE TABLE connections ( -- all SMP agent connections
+  connection_id INTEGER PRIMARY KEY,
+  agent_conn_id BLOB NOT NULL UNIQUE,
+  conn_level INTEGER NOT NULL DEFAULT 0,
+  via_contact INTEGER REFERENCES contacts (contact_id),
+  conn_status TEXT NOT NULL,
+  conn_type TEXT NOT NULL, -- contact, member, rcv_file, snd_file
+  contact_id INTEGER REFERENCES contacts ON DELETE RESTRICT,
+  group_member_id INTEGER REFERENCES group_members ON DELETE RESTRICT,
+  snd_file_id INTEGER,
+  rcv_file_id INTEGER REFERENCES rcv_files (file_id) ON DELETE RESTRICT,
+  created_at TEXT NOT NULL DEFAULT (datetime('now')),
+  user_id INTEGER NOT NULL REFERENCES users,
+  FOREIGN KEY (snd_file_id, connection_id)
+    REFERENCES snd_files (file_id, connection_id)
+    ON DELETE RESTRICT
+    DEFERRABLE INITIALLY DEFERRED
+);
+
+CREATE TABLE events ( -- messages received by the agent, append only
+  event_id INTEGER PRIMARY KEY,
+  agent_msg_id INTEGER NOT NULL, -- internal message ID
+  external_msg_id INTEGER NOT NULL, -- external message ID (sent or received)
+  agent_meta TEXT NOT NULL, -- JSON with timestamps etc. sent in MSG
+  connection_id INTEGER NOT NULL REFERENCES connections,
+  received INTEGER NOT NULL, -- 0 for received, 1 for sent
+  chat_event_id INTEGER,
+  continuation_of INTEGER, -- references chat_event_id, but can be incorrect
+  event_type TEXT NOT NULL, -- event type - see protocol/types.ts
+  event_encoding INTEGER NOT NULL, -- format of event_body: 0 - binary, 1 - text utf8, 2 - JSON (utf8)
+  content_type TEXT NOT NULL, -- content type - see protocol/types.ts
+  event_body BLOB, -- agent message body as sent
+  event_hash BLOB NOT NULL,
+  integrity TEXT NOT NULL DEFAULT '',
+  created_at TEXT NOT NULL DEFAULT (datetime('now'))
+);
+
+CREATE INDEX events_external_msg_id_index ON events (connection_id, external_msg_id);
+
+CREATE TABLE event_body_parts (
+  event_body_part_id INTEGER PRIMARY KEY,
+  event_id REFERENCES events,
+  full_size INTEGER NOT NULL,
+  part_status TEXT, -- full, partial
+  content_type TEXT NOT NULL,
+  event_part BLOB
+);
+
+CREATE TABLE contact_profile_events (
+  event_id INTEGER NOT NULL UNIQUE REFERENCES events,
+  contact_profile_id INTEGER NOT NULL REFERENCES contact_profiles
+);
+
+CREATE TABLE group_profile_events (
+  event_id INTEGER NOT NULL UNIQUE REFERENCES events,
+  group_profile_id INTEGER NOT NULL REFERENCES group_profiles
+);
+
+CREATE TABLE group_events (
+  event_id INTEGER NOT NULL UNIQUE REFERENCES events,
+  group_id INTEGER NOT NULL REFERENCES groups ON DELETE RESTRICT,
+  group_member_id INTEGER REFERENCES group_members -- NULL for current user
+);
+
+CREATE TABLE group_event_parents (
+  group_event_parent_id INTEGER PRIMARY KEY,
+  event_id INTEGER NOT NULL REFERENCES group_events (event_id),
+  parent_group_member_id INTEGER REFERENCES group_members (group_member_id), -- can be NULL if parent_member_id is incorrect
+  parent_member_id BLOB, -- shared member ID, unique per group
+  parent_event_id INTEGER REFERENCES events (event_id) ON DELETE CASCADE, -- this can be NULL if received event references another event that's not received yet
+  parent_chat_event_id INTEGER NOT NULL,
+  parent_event_hash BLOB NOT NULL
+);
+
+CREATE INDEX group_event_parents_parent_chat_event_id_index
+  ON group_event_parents (parent_member_id, parent_chat_event_id);
+
+CREATE TABLE messages ( -- mutable messages presented to user
+  message_id INTEGER PRIMARY KEY,
+  contact_id INTEGER NOT NULL REFERENCES contacts ON DELETE RESTRICT, -- 1 for sent messages
+  group_id INTEGER REFERENCES groups ON DELETE RESTRICT, -- NULL for direct messages
+  deleted INTEGER NOT NULL, -- 1 for deleted
+  msg_type TEXT NOT NULL,
+  content_type TEXT NOT NULL,
+  msg_text TEXT NOT NULL, -- textual representation
+  msg_props TEXT NOT NULL -- JSON
+);
+
+CREATE TABLE message_content (
+  message_content_id INTEGER PRIMARY KEY,
+  message_id INTEGER REFERENCES messages ON DELETE CASCADE,
+  content_type TEXT NOT NULL,
+  content_size INTEGER, -- full expected content size
+  content_status TEXT, -- empty, part, full
+  content BLOB NOT NULL
+);
+
+CREATE TABLE message_events (
+  event_id INTEGER NOT NULL UNIQUE REFERENCES events,
+  message_id INTEGER NOT NULL REFERENCES messages
+);
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name: simplex-chat
-version: 0.3.0
+version: 0.4.0
 #synopsis:
 #description:
 homepage: https://github.com/simplex-chat/simplex-chat#readme
@@ -12,33 +12,41 @@ extra-source-files:
  - README.md

 dependencies:
+  - aeson == 1.5.*
  - ansi-terminal == 0.10.*
  - attoparsec == 0.13.*
-  - base == 4.13.*
+  - base >= 4.7 && < 5
+  - base64-bytestring >= 1.0 && < 1.3
+  - bytestring == 0.10.*
+  - composition == 1.0.*
  - containers == 0.6.*
+  - cryptonite >= 0.27 && < 0.30
+  - directory == 1.3.*
+  - exceptions == 0.10.*
+  - file-embed == 0.0.14.*
+  - filepath == 1.4.*
+  - mtl == 2.2.*
+  - optparse-applicative == 0.15.*
+  - process == 1.6.*
+  - simple-logger == 0.1.*
+  - simplexmq == 0.4.*
+  - sqlite-simple == 0.4.*
+  - stm == 2.5.*
+  - terminal == 0.2.*
  - text == 1.2.*
+  - time == 1.9.*
+  - unliftio == 0.2.*
+  - unliftio-core == 0.2.*

 library:
  source-dirs: src

 executables:
-  dog-food:
-    source-dirs: apps/dog-food
+  simplex-chat:
+    source-dirs: apps/simplex-chat
    main: Main.hs
    dependencies:
      - simplex-chat
-      - async == 2.2.*
-      - bytestring == 0.10.*
-      - directory == 1.3.*
-      - filepath == 1.4.*
-      - mtl == 2.2.*
-      - optparse-applicative == 0.15.*
-      - simple-logger == 0.1.*
-      - simplexmq == 0.3.*
-      - stm == 2.5.*
-      - terminal == 0.2.*
-      - time == 1.9.*
-      - unliftio == 0.2.*
    ghc-options:
      - -threaded

@@ -48,7 +56,10 @@ tests:
    main: Test.hs
    dependencies:
      - simplex-chat
+      - async == 2.2.*
      - hspec == 2.7.*
+      - network == 3.1.*
+      - stm == 2.5.*

 ghc-options:
  # - -haddock
--- a/protocol/types.ts
+++ b/protocol/types.ts
@@ -0,0 +1,74 @@
+// x. namespace is for chat messages transmitted inside SMP agent MSG
+type MemberMessageType =
+  | "x.grp.info" // group profile information or update
+  | "x.grp.off" // disable group
+  | "x.grp.del" // group deleted
+  | "x.grp.mem.new" // new group member
+  | "x.grp.mem.acl" // group member permissions (ACL)
+  | "x.grp.mem.leave" // group member left
+  | "x.grp.mem.off" // suspend group member
+  | "x.grp.mem.on" // enable group member
+  | "x.grp.mem.del" // group member removed
+
+type ProfileMessageType =
+  | "x.info" // profile information or update
+  | "x.info.grp" // information about group in profile
+  | "x.info.con" // information about contact in profile
+
+type NotificationMessageType = "x.msg.read"
+
+type OpenConnMessageType =
+  | "x.open.grp" // open invitation to the group
+  | "x.open.con" // open invitation to the contact
+
+type ContentMessageType =
+  | "x.msg.new" // new message
+  | "x.msg.append" // additional part of the message
+  | "x.msg.del" // delete message
+  | "x.msg.update" // update message
+  | "x.msg.fwd" // forward message
+  | "x.msg.reply" // reply to message
+
+// TODO namespace for chat messages transmitted as other agent messages
+
+type DirectMessageType =
+  | ProfileMessageType
+  | NotificationMessageType
+  | OpenConnMessageType
+  | ContentMessageType
+
+type GroupMessageType = MemberMessageType | DirectMessageType
+
+type ContentType =
+  | "c.text"
+  | "c.html"
+  | "c.image"
+  | "c.audio"
+  | "c.video"
+  | "c.doc"
+  | "c.sticker"
+  | "c.file"
+  | "c.link"
+  | "c.form"
+  | "c.poll"
+  | "c.applet"
+
+// the type of message data transmitted inside SMP agent MSG
+interface MessageData<T extends GroupMessageType> {
+  type: T
+  sent: Date
+  data: unknown
+}
+
+interface DirectMessageData<T extends DirectMessageType> extends MessageData<T> {}
+
+interface GroupMessageData<T extends GroupMessageType> extends MessageData<T> {
+  msgId: number
+  parents: ParentMessage[]
+}
+
+interface ParentMessage {
+  memberId: Uint8Array
+  msgId: number
+  msgHash: Uint8Array
+}
--- a/src/Simplex/Chat.hs
+++ b/src/Simplex/Chat.hs
--- a/src/Simplex/Chat/Controller.hs
+++ b/src/Simplex/Chat/Controller.hs
@@ -0,0 +1,87 @@
+{-# LANGUAGE ConstraintKinds #-}
+{-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Simplex.Chat.Controller where
+
+import Control.Exception
+import Control.Monad.Except
+import Control.Monad.IO.Unlift
+import Control.Monad.Reader
+import Crypto.Random (ChaChaDRG)
+import Data.Int (Int64)
+import Data.Map.Strict (Map)
+import Numeric.Natural
+import Simplex.Chat.Notification
+import Simplex.Chat.Store (StoreError)
+import Simplex.Chat.Terminal
+import Simplex.Chat.Types
+import Simplex.Messaging.Agent (AgentClient)
+import Simplex.Messaging.Agent.Env.SQLite (AgentConfig)
+import Simplex.Messaging.Agent.Protocol (AgentErrorType)
+import Simplex.Messaging.Agent.Store.SQLite (SQLiteStore)
+import System.IO (Handle)
+import UnliftIO.STM
+
+data ChatConfig = ChatConfig
+  { agentConfig :: AgentConfig,
+    dbPoolSize :: Int,
+    tbqSize :: Natural,
+    fileChunkSize :: Integer
+  }
+
+data ChatController = ChatController
+  { currentUser :: TVar User,
+    smpAgent :: AgentClient,
+    chatTerminal :: ChatTerminal,
+    chatStore :: SQLiteStore,
+    idsDrg :: TVar ChaChaDRG,
+    inputQ :: TBQueue InputEvent,
+    notifyQ :: TBQueue Notification,
+    sendNotification :: Notification -> IO (),
+    chatLock :: TMVar (),
+    sndFiles :: TVar (Map Int64 Handle),
+    rcvFiles :: TVar (Map Int64 Handle),
+    config :: ChatConfig
+  }
+
+data InputEvent = InputCommand String | InputControl Char
+
+data ChatError
+  = ChatError ChatErrorType
+  | ChatErrorMessage String
+  | ChatErrorAgent AgentErrorType
+  | ChatErrorStore StoreError
+  deriving (Show, Exception)
+
+data ChatErrorType
+  = CEGroupUserRole
+  | CEGroupContactRole ContactName
+  | CEGroupDuplicateMember ContactName
+  | CEGroupDuplicateMemberId
+  | CEGroupNotJoined GroupName
+  | CEGroupMemberNotActive
+  | CEGroupMemberUserRemoved
+  | CEGroupMemberNotFound ContactName
+  | CEGroupInternal String
+  | CEFileNotFound String
+  | CEFileAlreadyReceiving String
+  | CEFileAlreadyExists FilePath
+  | CEFileRead FilePath SomeException
+  | CEFileWrite FilePath SomeException
+  | CEFileSend Int64 AgentErrorType
+  | CEFileRcvChunk String
+  | CEFileInternal String
+  deriving (Show, Exception)
+
+type ChatMonad m = (MonadUnliftIO m, MonadReader ChatController m, MonadError ChatError m)
+
+setActive :: (MonadUnliftIO m, MonadReader ChatController m) => ActiveTo -> m ()
+setActive to = asks (activeTo . chatTerminal) >>= atomically . (`writeTVar` to)
+
+unsetActive :: (MonadUnliftIO m, MonadReader ChatController m) => ActiveTo -> m ()
+unsetActive a = asks (activeTo . chatTerminal) >>= atomically . (`modifyTVar` unset)
+  where
+    unset a' = if a == a' then ActiveNone else a'
--- a/src/Simplex/Chat/Help.hs
+++ b/src/Simplex/Chat/Help.hs
@@ -0,0 +1,109 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+module Simplex.Chat.Help
+  ( chatHelpInfo,
+    filesHelpInfo,
+    groupsHelpInfo,
+    markdownInfo,
+  )
+where
+
+import Data.List (intersperse)
+import Data.Text (Text)
+import Simplex.Chat.Markdown
+import Simplex.Chat.Styled
+import System.Console.ANSI.Types
+
+highlight :: Text -> Markdown
+highlight = Markdown (Colored Cyan)
+
+green :: Text -> Markdown
+green = Markdown (Colored Green)
+
+indent :: Markdown
+indent = "        "
+
+listHighlight :: [Text] -> Markdown
+listHighlight = mconcat . intersperse ", " . map highlight
+
+chatHelpInfo :: [StyledString]
+chatHelpInfo =
+  map
+    styleMarkdown
+    [ highlight "Using SimpleX chat prototype",
+      "Follow these steps to set up a connection:",
+      "",
+      green "Step 1: " <> highlight "/connect" <> " - Alice adds a contact.",
+      indent <> "Alice should send the invitation printed by the /add command",
+      indent <> "to her contact, Bob, out-of-band, via any trusted channel.",
+      "",
+      green "Step 2: " <> highlight "/connect <invitation>" <> " - Bob accepts the invitation.",
+      indent <> "Bob should use the invitation he received out-of-band.",
+      "",
+      green "Step 3: " <> "Bob and Alice are notified that the connection is set up,",
+      indent <> "both can now send messages:",
+      indent <> highlight "@bob Hello, Bob!" <> " - Alice messages Bob (assuming Bob has display name 'bob').",
+      indent <> highlight "@alice Hey, Alice!" <> " - Bob replies to Alice.",
+      "",
+      green "To send file:",
+      indent <> highlight "/file bob ./photo.jpg" <> " - Alice sends file to Bob",
+      indent <> "File commands: " <> highlight "/help files",
+      "",
+      green "To create group:",
+      indent <> highlight "/group team" <> " - create group #team",
+      indent <> "Group commands: " <> highlight "/help groups",
+      "",
+      green "Other commands:",
+      indent <> highlight "/profile         " <> " - show user profile",
+      indent <> highlight "/profile <name> [<full_name>]" <> " - update user profile",
+      indent <> highlight "/delete <contact>" <> " - delete contact and all messages with them",
+      indent <> highlight "/markdown        " <> " - show supported markdown syntax",
+      indent <> highlight "/quit            " <> " - quit chat",
+      "",
+      "The commands may be abbreviated to a single letter: " <> listHighlight ["/c", "/f", "/g", "/p", "/h"] <> ", etc."
+    ]
+
+filesHelpInfo :: [StyledString]
+filesHelpInfo =
+  map
+    styleMarkdown
+    [ green "File transfer commands:",
+      indent <> highlight "/file @<contact> <file_path>     " <> " - send file to contact",
+      indent <> highlight "/file #<group> <file_path>       " <> " - send file to group",
+      indent <> highlight "/freceive <file_id> [<file_path>]" <> " - accept to receive file",
+      indent <> highlight "/fcancel <file_id>               " <> " - cancel sending / receiving file",
+      indent <> highlight "/fstatus <file_id>               " <> " - show file transfer status",
+      "",
+      "The commands may be abbreviated: " <> listHighlight ["/f", "/fr", "/fc", "/fs"]
+    ]
+
+groupsHelpInfo :: [StyledString]
+groupsHelpInfo =
+  map
+    styleMarkdown
+    [ green "Group management commands:",
+      indent <> highlight "/group <group> [<full_name>]   " <> " - create group",
+      indent <> highlight "/add <group> <contact> [<role>]" <> " - add contact to group, roles: " <> highlight "owner" <> ", " <> highlight "admin" <> " (default), " <> highlight "member",
+      indent <> highlight "/join <group>                  " <> " - accept group invitation",
+      indent <> highlight "/remove <group> <member>       " <> " - remove member from group",
+      indent <> highlight "/leave <group>                 " <> " - leave group",
+      indent <> highlight "/delete <group>                " <> " - delete group",
+      indent <> highlight "/members <group>               " <> " - list group members",
+      indent <> highlight "#<group> <message>             " <> " - send message to group",
+      "",
+      "The commands may be abbreviated: " <> listHighlight ["/g", "/a", "/j", "/rm", "/l", "/d", "/ms"]
+    ]
+
+markdownInfo :: [StyledString]
+markdownInfo =
+  map
+    styleMarkdown
+    [ green "Markdown:",
+      indent <> highlight "*bold*         " <> " - " <> Markdown Bold "bold text",
+      indent <> highlight "_italic_       " <> " - " <> Markdown Italic "italic text" <> " (shown as underlined)",
+      indent <> highlight "+underlined+   " <> " - " <> Markdown Underline "underlined text",
+      indent <> highlight "~strikethrough~" <> " - " <> Markdown StrikeThrough "strikethrough text" <> " (shown as inverse)",
+      indent <> highlight "`code snippet` " <> " - " <> Markdown Snippet "a + b // no *markdown* here",
+      indent <> highlight "!1 text!       " <> " - " <> Markdown (Colored Red) "red text" <> " (1-6: red, green, blue, yellow, cyan, magenta)",
+      indent <> highlight "#secret#       " <> " - " <> Markdown Secret "secret text" <> " (can be copy-pasted)"
+    ]
--- a/apps/dog-food/ChatTerminal/Core.hs
+++ b/apps/dog-food/ChatTerminal/Core.hs
@@ -1,49 +1,53 @@
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}

-module ChatTerminal.Core where
+module Simplex.Chat.Input where

-import Control.Concurrent.STM
-import Data.ByteString.Char8 (ByteString)
-import qualified Data.ByteString.Char8 as B
+import Control.Monad.IO.Unlift
+import Control.Monad.Reader
 import Data.List (dropWhileEnd)
-import Data.Text (Text)
 import qualified Data.Text as T
-import Data.Text.Encoding
-import Simplex.Chat.Markdown
-import Styled
-import System.Console.ANSI.Types
+import Simplex.Chat.Controller
+import Simplex.Chat.Terminal
+import System.Exit (exitSuccess)
 import System.Terminal hiding (insertChars)
-import Types
+import UnliftIO.STM

-data ChatTerminal = ChatTerminal
-  { inputQ :: TBQueue String,
-    outputQ :: TBQueue [StyledString],
-    activeContact :: TVar (Maybe Contact),
-    termMode :: TermMode,
-    termState :: TVar TerminalState,
-    termSize :: Size,
-    nextMessageRow :: TVar Int,
-    termLock :: TMVar ()
-  }
+getKey :: MonadTerminal m => m (Key, Modifiers)
+getKey =
+  flush >> awaitEvent >>= \case
+    Left Interrupt -> liftIO exitSuccess
+    Right (KeyEvent key ms) -> pure (key, ms)
+    _ -> getKey

-data TerminalState = TerminalState
-  { inputPrompt :: String,
-    inputString :: String,
-    inputPosition :: Int,
-    previousInput :: String
-  }
+runTerminalInput :: (MonadUnliftIO m, MonadReader ChatController m) => m ()
+runTerminalInput = do
+  ChatController {inputQ, chatTerminal = ct} <- ask
+  liftIO $
+    withChatTerm ct $ do
+      updateInput ct
+      receiveFromTTY inputQ ct

-inputHeight :: TerminalState -> ChatTerminal -> Int
-inputHeight ts ct = length (inputPrompt ts <> inputString ts) `div` width (termSize ct) + 1
+receiveFromTTY :: MonadTerminal m => TBQueue InputEvent -> ChatTerminal -> m ()
+receiveFromTTY inputQ ct@ChatTerminal {activeTo, termSize, termState} =
+  forever $ getKey >>= processKey >> withTermLock ct (updateInput ct)
+  where
+    processKey :: MonadTerminal m => (Key, Modifiers) -> m ()
+    processKey = \case
+      (EnterKey, _) -> submitInput
+      key -> atomically $ do
+        ac <- readTVar activeTo
+        modifyTVar termState $ updateTermState ac (width termSize) key

-positionRowColumn :: Int -> Int -> Position
-positionRowColumn wid pos =
-  let row = pos `div` wid
-      col = pos - row * wid
-   in Position {row, col}
+    submitInput :: MonadTerminal m => m ()
+    submitInput = atomically $ do
+      ts <- readTVar termState
+      let s = inputString ts
+      writeTVar termState $ ts {inputString = "", inputPosition = 0, previousInput = s}
+      writeTBQueue inputQ $ InputCommand s

-updateTermState :: Maybe Contact -> Int -> (Key, Modifiers) -> TerminalState -> TerminalState
+updateTermState :: ActiveTo -> Int -> (Key, Modifiers) -> TerminalState -> TerminalState
 updateTermState ac tw (key, ms) ts@TerminalState {inputString = s, inputPosition = p} = case key of
  CharKey c
    | ms == mempty || ms == shiftKey -> insertCharsWithContact [c]
@@ -68,15 +72,16 @@ updateTermState ac tw (key, ms) ts@TerminalState {inputString = s, inputPosition
  _ -> ts
  where
    insertCharsWithContact cs
-      | null s && cs /= "@" && cs /= "/" =
+      | null s && cs /= "@" && cs /= "#" && cs /= "/" =
        insertChars $ contactPrefix <> cs
      | otherwise = insertChars cs
    insertChars = ts' . if p >= length s then append else insert
    append cs = let s' = s <> cs in (s', length s')
    insert cs = let (b, a) = splitAt p s in (b <> cs <> a, p + length cs)
    contactPrefix = case ac of
-      Just (Contact c) -> "@" <> B.unpack c <> " "
-      Nothing -> ""
+      ActiveNone -> ""
+      ActiveC c -> "@" <> T.unpack c <> " "
+      ActiveG g -> "#" <> T.unpack g <> " "
    backDeleteChar
      | p == 0 || null s = ts
      | p >= length s = ts' (init s, length s - 1)
@@ -111,29 +116,3 @@ updateTermState ac tw (key, ms) ts@TerminalState {inputString = s, inputPosition
            afterWord = dropWhile (/= ' ') $ dropWhile (== ' ') after
         in min (length s) $ p + length after - length afterWord
    ts' (s', p') = ts {inputString = s', inputPosition = p'}
-
-styleMessage :: String -> String -> StyledString
-styleMessage time msg = do
-  case msg of
-    "" -> ""
-    s@('@' : _) -> do
-      let (c, rest) = span (/= ' ') s
-      styleTime time <> " " <> styled (Colored Cyan) c <> markdown rest
-    s -> markdown s
-  where
-    markdown :: String -> StyledString
-    markdown = styleMarkdownText . T.pack
-
-styleTime :: String -> StyledString
-styleTime = Styled [SetColor Foreground Vivid Black]
-
-safeDecodeUtf8 :: ByteString -> Text
-safeDecodeUtf8 = decodeUtf8With onError
-  where
-    onError _ _ = Just '?'
-
-ttyContact :: Contact -> StyledString
-ttyContact (Contact a) = styled (Colored Green) a
-
-ttyFromContact :: Contact -> StyledString
-ttyFromContact (Contact a) = styled (Colored Yellow) $ a <> "> "
--- a/src/Simplex/Chat/Notification.hs
+++ b/src/Simplex/Chat/Notification.hs
@@ -0,0 +1,92 @@
+{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Simplex.Chat.Notification (Notification (..), initializeNotifications) where
+
+import Control.Monad (void)
+import Data.List (isInfixOf)
+import Data.Map (Map, fromList)
+import qualified Data.Map as M
+import Data.Maybe (fromMaybe)
+import Data.Text (Text)
+import qualified Data.Text as T
+import System.Directory (createDirectoryIfMissing, doesFileExist, getAppUserDataDirectory)
+import System.FilePath (combine)
+import System.Info (os)
+import System.Process (readCreateProcess, shell)
+
+data Notification = Notification {title :: Text, text :: Text}
+
+initializeNotifications :: IO (Notification -> IO ())
+initializeNotifications = case os of
+  "darwin" -> pure $ notify macScript
+  "mingw32" -> initWinNotify
+  "linux" ->
+    doesFileExist "/proc/sys/kernel/osrelease" >>= \case
+      False -> pure $ notify linuxScript
+      True -> do
+        v <- readFile "/proc/sys/kernel/osrelease"
+        if "Microsoft" `isInfixOf` v || "WSL" `isInfixOf` v
+          then initWslNotify
+          else pure $ notify linuxScript
+  _ -> pure . const $ pure ()
+
+notify :: (Notification -> Text) -> Notification -> IO ()
+notify script notification =
+  void $ readCreateProcess (shell . T.unpack $ script notification) ""
+
+linuxScript :: Notification -> Text
+linuxScript Notification {title, text} = "notify-send '" <> linuxEscape title <> "' '" <> linuxEscape text <> "'"
+
+linuxEscape :: Text -> Text
+linuxEscape = replaceAll $ fromList [('\'', "'\\''")]
+
+macScript :: Notification -> Text
+macScript Notification {title, text} = "osascript -e 'display notification \"" <> macEscape text <> "\" with title \"" <> macEscape title <> "\"'"
+
+macEscape :: Text -> Text
+macEscape = replaceAll $ fromList [('"', "\\\"")]
+
+initWslNotify :: IO (Notification -> IO ())
+initWslNotify = notify . wslScript <$> savePowershellScript
+
+wslScript :: FilePath -> Notification -> Text
+wslScript path Notification {title, text} = "powershell.exe \"" <> T.pack path <> " \\\"" <> wslEscape title <> "\\\" \\\"" <> wslEscape text <> "\\\"\""
+
+wslEscape :: Text -> Text
+wslEscape = replaceAll $ fromList [('`', "\\`\\`"), ('\\', "\\\\"), ('"', "\\`\\\"")]
+
+initWinNotify :: IO (Notification -> IO ())
+initWinNotify = notify . winScript <$> savePowershellScript
+
+winScript :: FilePath -> Notification -> Text
+winScript path Notification {title, text} = "powershell.exe \"" <> T.pack path <> " '" <> winRemoveQuotes title <> "' '" <> winRemoveQuotes text <> "'\""
+
+winRemoveQuotes :: Text -> Text
+winRemoveQuotes = replaceAll $ fromList [('`', ""), ('\'', ""), ('"', "")]
+
+replaceAll :: Map Char Text -> Text -> Text
+replaceAll rules = T.concatMap $ \c -> T.singleton c `fromMaybe` M.lookup c rules
+
+savePowershellScript :: IO FilePath
+savePowershellScript = do
+  appDir <- getAppUserDataDirectory "simplex"
+  createDirectoryIfMissing False appDir
+  let psScript = combine appDir "win-toast-notify.ps1"
+  writeFile
+    psScript
+    "[Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime] > $null\n\
+    \$Template = [Windows.UI.Notifications.ToastNotificationManager]::GetTemplateContent([Windows.UI.Notifications.ToastTemplateType]::ToastText02)\n\
+    \$RawXml = [xml] $Template.GetXml()\n\
+    \($RawXml.toast.visual.binding.text|where {$_.id -eq \"1\"}).AppendChild($RawXml.CreateTextNode($args[0])) > $null\n\
+    \($RawXml.toast.visual.binding.text|where {$_.id -eq \"2\"}).AppendChild($RawXml.CreateTextNode($args[1])) > $null\n\
+    \$SerializedXml = New-Object Windows.Data.Xml.Dom.XmlDocument\n\
+    \$SerializedXml.LoadXml($RawXml.OuterXml)\n\
+    \$Toast = [Windows.UI.Notifications.ToastNotification]::new($SerializedXml)\n\
+    \$Toast.Tag = \"simplex-chat\"\n\
+    \$Toast.Group = \"simplex-chat\"\n\
+    \$Toast.ExpirationTime = [DateTimeOffset]::Now.AddMinutes(1)\n\
+    \$Notifier = [Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier(\"PowerShell\")\n\
+    \$Notifier.Show($Toast);\n"
+  return psScript
--- a/apps/dog-food/ChatOptions.hs
+++ b/apps/dog-food/ChatOptions.hs
@@ -1,7 +1,6 @@
-{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}

-module ChatOptions (getChatOpts, ChatOpts (..)) where
+module Simplex.Chat.Options (getChatOpts, ChatOpts (..)) where

 import qualified Data.Attoparsec.ByteString.Char8 as A
 import qualified Data.ByteString.Char8 as B
@@ -11,12 +10,10 @@ import Options.Applicative
 import Simplex.Messaging.Agent.Protocol (SMPServer (..), smpServerP)
 import Simplex.Messaging.Parsers (parseAll)
 import System.FilePath (combine)
-import Types

 data ChatOpts = ChatOpts
  { dbFile :: String,
-    smpServers :: NonEmpty SMPServer,
-    termMode :: TermMode
+    smpServers :: NonEmpty SMPServer
  }

 chatOpts :: FilePath -> Parser ChatOpts
@@ -34,31 +31,25 @@ chatOpts appDir =
      ( long "server"
          <> short 's'
          <> metavar "SERVER"
-          <> help "SMP server(s) to use (smp1.simplex.im#pLdiGvm0jD1CMblnov6Edd/391OrYsShw+RgdfR0ChA=)"
-          <> value (L.fromList ["smp1.simplex.im#pLdiGvm0jD1CMblnov6Edd/391OrYsShw+RgdfR0ChA="])
-      )
-    <*> option
-      parseTermMode
-      ( long "term"
-          <> short 't'
-          <> metavar "TERM"
-          <> help ("terminal mode: editor or basic (" <> termModeName TermModeEditor <> ")")
-          <> value TermModeEditor
+          <> help
+            ( "SMP server(s) to use"
+                <> "\n(smp2.simplex.im,smp3.simplex.im)"
+            )
+          <> value
+            ( L.fromList
+                [ "smp2.simplex.im#z5W2QLQ1Br3Yd6CoWg7bIq1bHdwK7Y8bEiEXBs/WfAg=", -- London, UK
+                  "smp3.simplex.im#nxc7HnrnM8dOKgkMp008ub/9o9LXJlxlMrMpR+mfMQw=" -- Fremont, CA
+                ]
+            )
      )
  where
-    defaultDbFilePath = combine appDir "smp-chat.db"
+    defaultDbFilePath = combine appDir "simplex"

 parseSMPServer :: ReadM (NonEmpty SMPServer)
 parseSMPServer = eitherReader $ parseAll servers . B.pack
  where
    servers = L.fromList <$> smpServerP `A.sepBy1` A.char ','

-parseTermMode :: ReadM TermMode
-parseTermMode = maybeReader $ \case
-  "basic" -> Just TermModeBasic
-  "editor" -> Just TermModeEditor
-  _ -> Nothing
-
 getChatOpts :: FilePath -> IO ChatOpts
 getChatOpts appDir = execParser opts
  where
--- a/src/Simplex/Chat/Protocol._hs
+++ b/src/Simplex/Chat/Protocol._hs
@@ -1,13 +0,0 @@
-module Simplex.Chat.Protocol where
-
-data Profile = Profile
-  { displayName :: Text,
-    fullName :: Text
-  }
-
-data Contact = Contact
-  { profile :: Profile,
-    connection :: ConnAlias
-  }
-
-data ChatMessage = ContentMessage | ReadNotification | FileTransfer
--- a/src/Simplex/Chat/Protocol.hs
+++ b/src/Simplex/Chat/Protocol.hs
@@ -0,0 +1,383 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE GADTs #-}
+{-# LANGUAGE KindSignatures #-}
+{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE TupleSections #-}
+
+module Simplex.Chat.Protocol where
+
+import Control.Applicative (optional)
+import Control.Monad ((<=<))
+import Data.Aeson (FromJSON, ToJSON)
+import qualified Data.Aeson as J
+import Data.Attoparsec.ByteString.Char8 (Parser)
+import qualified Data.Attoparsec.ByteString.Char8 as A
+import qualified Data.ByteString.Base64 as B64
+import Data.ByteString.Char8 (ByteString)
+import qualified Data.ByteString.Char8 as B
+import qualified Data.ByteString.Lazy.Char8 as LB
+import Data.Int (Int64)
+import Data.List (find)
+import Data.Text (Text)
+import qualified Data.Text as T
+import Data.Text.Encoding (encodeUtf8)
+import Simplex.Chat.Types
+import Simplex.Chat.Util (safeDecodeUtf8)
+import Simplex.Messaging.Agent.Protocol
+import Simplex.Messaging.Parsers (parseAll)
+import Simplex.Messaging.Util (bshow)
+
+data ChatDirection (p :: AParty) where
+  ReceivedDirectMessage :: Connection -> Maybe Contact -> ChatDirection 'Agent
+  SentDirectMessage :: Contact -> ChatDirection 'Client
+  ReceivedGroupMessage :: Connection -> GroupName -> GroupMember -> ChatDirection 'Agent
+  SentGroupMessage :: GroupName -> ChatDirection 'Client
+  SndFileConnection :: Connection -> SndFileTransfer -> ChatDirection 'Agent
+  RcvFileConnection :: Connection -> RcvFileTransfer -> ChatDirection 'Agent
+
+deriving instance Eq (ChatDirection p)
+
+deriving instance Show (ChatDirection p)
+
+fromConnection :: ChatDirection 'Agent -> Connection
+fromConnection = \case
+  ReceivedDirectMessage conn _ -> conn
+  ReceivedGroupMessage conn _ _ -> conn
+  SndFileConnection conn _ -> conn
+  RcvFileConnection conn _ -> conn
+
+data ChatMsgEvent
+  = XMsgNew MsgContent
+  | XFile FileInvitation
+  | XFileAcpt String
+  | XInfo Profile
+  | XGrpInv GroupInvitation
+  | XGrpAcpt MemberId
+  | XGrpMemNew MemberInfo
+  | XGrpMemIntro MemberInfo
+  | XGrpMemInv MemberId IntroInvitation
+  | XGrpMemFwd MemberInfo IntroInvitation
+  | XGrpMemInfo MemberId Profile
+  | XGrpMemCon MemberId
+  | XGrpMemConAll MemberId
+  | XGrpMemDel MemberId
+  | XGrpLeave
+  | XGrpDel
+  | XInfoProbe ByteString
+  | XInfoProbeCheck ByteString
+  | XInfoProbeOk ByteString
+  | XOk
+  deriving (Eq, Show)
+
+data MessageType = MTText | MTImage deriving (Eq, Show)
+
+data MsgContent = MsgContent
+  { messageType :: MessageType,
+    files :: [(ContentType, Int)],
+    content :: [MsgContentBody]
+  }
+  deriving (Eq, Show)
+
+toMsgType :: ByteString -> Either String MessageType
+toMsgType = \case
+  "c.text" -> Right MTText
+  "c.image" -> Right MTImage
+  t -> Left $ "invalid message type " <> B.unpack t
+
+rawMsgType :: MessageType -> ByteString
+rawMsgType = \case
+  MTText -> "c.text"
+  MTImage -> "c.image"
+
+data ChatMessage = ChatMessage
+  { chatMsgId :: Maybe Int64,
+    chatMsgEvent :: ChatMsgEvent,
+    chatDAG :: Maybe ByteString
+  }
+  deriving (Eq, Show)
+
+toChatMessage :: RawChatMessage -> Either String ChatMessage
+toChatMessage RawChatMessage {chatMsgId, chatMsgEvent, chatMsgParams, chatMsgBody} = do
+  (chatDAG, body) <- getDAG <$> mapM toMsgBodyContent chatMsgBody
+  let chatMsg msg = pure ChatMessage {chatMsgId, chatMsgEvent = msg, chatDAG}
+  case (chatMsgEvent, chatMsgParams) of
+    ("x.msg.new", mt : rawFiles) -> do
+      t <- toMsgType mt
+      files <- mapM (toContentInfo <=< parseAll contentInfoP) rawFiles
+      chatMsg . XMsgNew $ MsgContent {messageType = t, files, content = body}
+    ("x.file", [name, size, qInfo]) -> do
+      let fileName = T.unpack $ safeDecodeUtf8 name
+      fileSize <- parseAll A.decimal size
+      fileQInfo <- parseAll smpQueueInfoP qInfo
+      chatMsg . XFile $ FileInvitation {fileName, fileSize, fileQInfo}
+    ("x.file.acpt", [name]) ->
+      chatMsg . XFileAcpt . T.unpack $ safeDecodeUtf8 name
+    ("x.info", []) -> do
+      profile <- getJSON body
+      chatMsg $ XInfo profile
+    ("x.grp.inv", [fromMemId, fromRole, memId, role, qInfo]) -> do
+      fromMem <- (,) <$> B64.decode fromMemId <*> toMemberRole fromRole
+      invitedMem <- (,) <$> B64.decode memId <*> toMemberRole role
+      groupQInfo <- parseAll smpQueueInfoP qInfo
+      profile <- getJSON body
+      chatMsg . XGrpInv $ GroupInvitation fromMem invitedMem groupQInfo profile
+    ("x.grp.acpt", [memId]) ->
+      chatMsg . XGrpAcpt =<< B64.decode memId
+    ("x.grp.mem.new", [memId, role]) -> do
+      chatMsg . XGrpMemNew =<< toMemberInfo memId role body
+    ("x.grp.mem.intro", [memId, role]) ->
+      chatMsg . XGrpMemIntro =<< toMemberInfo memId role body
+    ("x.grp.mem.inv", [memId, groupQInfo, directQInfo]) ->
+      chatMsg =<< (XGrpMemInv <$> B64.decode memId <*> toIntroInv groupQInfo directQInfo)
+    ("x.grp.mem.fwd", [memId, role, groupQInfo, directQInfo]) -> do
+      chatMsg =<< (XGrpMemFwd <$> toMemberInfo memId role body <*> toIntroInv groupQInfo directQInfo)
+    ("x.grp.mem.info", [memId]) ->
+      chatMsg =<< (XGrpMemInfo <$> B64.decode memId <*> getJSON body)
+    ("x.grp.mem.con", [memId]) ->
+      chatMsg . XGrpMemCon =<< B64.decode memId
+    ("x.grp.mem.con.all", [memId]) ->
+      chatMsg . XGrpMemConAll =<< B64.decode memId
+    ("x.grp.mem.del", [memId]) ->
+      chatMsg . XGrpMemDel =<< B64.decode memId
+    ("x.grp.leave", []) ->
+      chatMsg XGrpLeave
+    ("x.grp.del", []) ->
+      chatMsg XGrpDel
+    ("x.info.probe", [probe]) -> do
+      chatMsg . XInfoProbe =<< B64.decode probe
+    ("x.info.probe.check", [probeHash]) -> do
+      chatMsg =<< (XInfoProbeCheck <$> B64.decode probeHash)
+    ("x.info.probe.ok", [probe]) -> do
+      chatMsg =<< (XInfoProbeOk <$> B64.decode probe)
+    ("x.ok", []) ->
+      chatMsg XOk
+    _ -> Left $ "bad syntax or unsupported event " <> B.unpack chatMsgEvent
+  where
+    getDAG :: [MsgContentBody] -> (Maybe ByteString, [MsgContentBody])
+    getDAG body = case break (isContentType SimplexDAG) body of
+      (b, MsgContentBody SimplexDAG dag : a) -> (Just dag, b <> a)
+      _ -> (Nothing, body)
+    toMemberInfo :: ByteString -> ByteString -> [MsgContentBody] -> Either String MemberInfo
+    toMemberInfo memId role body = MemberInfo <$> B64.decode memId <*> toMemberRole role <*> getJSON body
+    toIntroInv :: ByteString -> ByteString -> Either String IntroInvitation
+    toIntroInv groupQInfo directQInfo = IntroInvitation <$> parseAll smpQueueInfoP groupQInfo <*> parseAll smpQueueInfoP directQInfo
+    toContentInfo :: (RawContentType, Int) -> Either String (ContentType, Int)
+    toContentInfo (rawType, size) = (,size) <$> toContentType rawType
+    getJSON :: FromJSON a => [MsgContentBody] -> Either String a
+    getJSON = J.eitherDecodeStrict' <=< getSimplexContentType XCJson
+
+isContentType :: ContentType -> MsgContentBody -> Bool
+isContentType t MsgContentBody {contentType = t'} = t == t'
+
+isSimplexContentType :: XContentType -> MsgContentBody -> Bool
+isSimplexContentType = isContentType . SimplexContentType
+
+getContentType :: ContentType -> [MsgContentBody] -> Either String ByteString
+getContentType t body = case find (isContentType t) body of
+  Just MsgContentBody {contentData} -> Right contentData
+  Nothing -> Left "no required content type"
+
+getSimplexContentType :: XContentType -> [MsgContentBody] -> Either String ByteString
+getSimplexContentType = getContentType . SimplexContentType
+
+rawChatMessage :: ChatMessage -> RawChatMessage
+rawChatMessage ChatMessage {chatMsgId, chatMsgEvent, chatDAG} =
+  case chatMsgEvent of
+    XMsgNew MsgContent {messageType = t, files, content} ->
+      let rawFiles = map (serializeContentInfo . rawContentInfo) files
+       in rawMsg "x.msg.new" (rawMsgType t : rawFiles) content
+    XFile FileInvitation {fileName, fileSize, fileQInfo} ->
+      rawMsg "x.file" [encodeUtf8 $ T.pack fileName, bshow fileSize, serializeSmpQueueInfo fileQInfo] []
+    XFileAcpt fileName ->
+      rawMsg "x.file.acpt" [encodeUtf8 $ T.pack fileName] []
+    XInfo profile ->
+      rawMsg "x.info" [] [jsonBody profile]
+    XGrpInv (GroupInvitation (fromMemId, fromRole) (memId, role) qInfo groupProfile) ->
+      let params =
+            [ B64.encode fromMemId,
+              serializeMemberRole fromRole,
+              B64.encode memId,
+              serializeMemberRole role,
+              serializeSmpQueueInfo qInfo
+            ]
+       in rawMsg "x.grp.inv" params [jsonBody groupProfile]
+    XGrpAcpt memId ->
+      rawMsg "x.grp.acpt" [B64.encode memId] []
+    XGrpMemNew (MemberInfo memId role profile) ->
+      let params = [B64.encode memId, serializeMemberRole role]
+       in rawMsg "x.grp.mem.new" params [jsonBody profile]
+    XGrpMemIntro (MemberInfo memId role profile) ->
+      rawMsg "x.grp.mem.intro" [B64.encode memId, serializeMemberRole role] [jsonBody profile]
+    XGrpMemInv memId IntroInvitation {groupQInfo, directQInfo} ->
+      let params = [B64.encode memId, serializeSmpQueueInfo groupQInfo, serializeSmpQueueInfo directQInfo]
+       in rawMsg "x.grp.mem.inv" params []
+    XGrpMemFwd (MemberInfo memId role profile) IntroInvitation {groupQInfo, directQInfo} ->
+      let params =
+            [ B64.encode memId,
+              serializeMemberRole role,
+              serializeSmpQueueInfo groupQInfo,
+              serializeSmpQueueInfo directQInfo
+            ]
+       in rawMsg "x.grp.mem.fwd" params [jsonBody profile]
+    XGrpMemInfo memId profile ->
+      rawMsg "x.grp.mem.info" [B64.encode memId] [jsonBody profile]
+    XGrpMemCon memId ->
+      rawMsg "x.grp.mem.con" [B64.encode memId] []
+    XGrpMemConAll memId ->
+      rawMsg "x.grp.mem.con.all" [B64.encode memId] []
+    XGrpMemDel memId ->
+      rawMsg "x.grp.mem.del" [B64.encode memId] []
+    XGrpLeave ->
+      rawMsg "x.grp.leave" [] []
+    XGrpDel ->
+      rawMsg "x.grp.del" [] []
+    XInfoProbe probe ->
+      rawMsg "x.info.probe" [B64.encode probe] []
+    XInfoProbeCheck probeHash ->
+      rawMsg "x.info.probe.check" [B64.encode probeHash] []
+    XInfoProbeOk probe ->
+      rawMsg "x.info.probe.ok" [B64.encode probe] []
+    XOk ->
+      rawMsg "x.ok" [] []
+  where
+    rawMsg :: ByteString -> [ByteString] -> [MsgContentBody] -> RawChatMessage
+    rawMsg event chatMsgParams body =
+      RawChatMessage {chatMsgId, chatMsgEvent = event, chatMsgParams, chatMsgBody = rawWithDAG body}
+    rawContentInfo :: (ContentType, Int) -> (RawContentType, Int)
+    rawContentInfo (t, size) = (rawContentType t, size)
+    jsonBody :: ToJSON a => a -> MsgContentBody
+    jsonBody x =
+      let json = LB.toStrict $ J.encode x
+       in MsgContentBody {contentType = SimplexContentType XCJson, contentData = json}
+    rawWithDAG :: [MsgContentBody] -> [RawMsgBodyContent]
+    rawWithDAG body = map rawMsgBodyContent $ case chatDAG of
+      Nothing -> body
+      Just dag -> MsgContentBody {contentType = SimplexDAG, contentData = dag} : body
+
+toMsgBodyContent :: RawMsgBodyContent -> Either String MsgContentBody
+toMsgBodyContent RawMsgBodyContent {contentType, contentData} = do
+  cType <- toContentType contentType
+  pure MsgContentBody {contentType = cType, contentData}
+
+rawMsgBodyContent :: MsgContentBody -> RawMsgBodyContent
+rawMsgBodyContent MsgContentBody {contentType = t, contentData} =
+  RawMsgBodyContent {contentType = rawContentType t, contentData}
+
+data MsgContentBody = MsgContentBody
+  { contentType :: ContentType,
+    contentData :: ByteString
+  }
+  deriving (Eq, Show)
+
+data ContentType
+  = SimplexContentType XContentType
+  | MimeContentType MContentType
+  | SimplexDAG
+  deriving (Eq, Show)
+
+data XContentType = XCText | XCImage | XCJson deriving (Eq, Show)
+
+data MContentType = MCImageJPG | MCImagePNG deriving (Eq, Show)
+
+toContentType :: RawContentType -> Either String ContentType
+toContentType (RawContentType ns cType) = case ns of
+  "x" -> case cType of
+    "text" -> Right $ SimplexContentType XCText
+    "image" -> Right $ SimplexContentType XCImage
+    "json" -> Right $ SimplexContentType XCJson
+    "dag" -> Right SimplexDAG
+    _ -> err
+  "m" -> case cType of
+    "image/jpg" -> Right $ MimeContentType MCImageJPG
+    "image/png" -> Right $ MimeContentType MCImagePNG
+    _ -> err
+  _ -> err
+  where
+    err = Left . B.unpack $ "invalid content type " <> ns <> "." <> cType
+
+rawContentType :: ContentType -> RawContentType
+rawContentType t = case t of
+  SimplexContentType t' -> RawContentType "x" $ case t' of
+    XCText -> "text"
+    XCImage -> "image"
+    XCJson -> "json"
+  MimeContentType t' -> RawContentType "m" $ case t' of
+    MCImageJPG -> "image/jpg"
+    MCImagePNG -> "image/png"
+  SimplexDAG -> RawContentType "x" "dag"
+
+newtype ContentMsg = NewContentMsg ContentData
+
+newtype ContentData = ContentText Text
+
+data RawChatMessage = RawChatMessage
+  { chatMsgId :: Maybe Int64,
+    chatMsgEvent :: ByteString,
+    chatMsgParams :: [ByteString],
+    chatMsgBody :: [RawMsgBodyContent]
+  }
+  deriving (Eq, Show)
+
+data RawMsgBodyContent = RawMsgBodyContent
+  { contentType :: RawContentType,
+    contentData :: ByteString
+  }
+  deriving (Eq, Show)
+
+data RawContentType = RawContentType NameSpace ByteString
+  deriving (Eq, Show)
+
+type NameSpace = ByteString
+
+newtype MsgData = MsgData ByteString
+  deriving (Eq, Show)
+
+class DataLength a where
+  dataLength :: a -> Int
+
+rawChatMessageP :: Parser RawChatMessage
+rawChatMessageP = do
+  chatMsgId <- optional A.decimal <* A.space
+  chatMsgEvent <- B.intercalate "." <$> identifierP `A.sepBy1'` A.char '.' <* A.space
+  chatMsgParams <- A.takeWhile1 (not . A.inClass ", ") `A.sepBy'` A.char ',' <* A.space
+  chatMsgBody <- msgBodyContent =<< contentInfoP `A.sepBy'` A.char ',' <* A.space
+  pure RawChatMessage {chatMsgId, chatMsgEvent, chatMsgParams, chatMsgBody}
+  where
+    msgBodyContent :: [(RawContentType, Int)] -> Parser [RawMsgBodyContent]
+    msgBodyContent [] = pure []
+    msgBodyContent ((contentType, size) : ps) = do
+      contentData <- A.take size <* A.space
+      ((RawMsgBodyContent {contentType, contentData}) :) <$> msgBodyContent ps
+
+contentInfoP :: Parser (RawContentType, Int)
+contentInfoP = do
+  contentType <- RawContentType <$> identifierP <* A.char '.' <*> A.takeTill (A.inClass ":, ")
+  size <- A.char ':' *> A.decimal
+  pure (contentType, size)
+
+identifierP :: Parser ByteString
+identifierP = B.cons <$> A.letter_ascii <*> A.takeWhile (\c -> A.isAlpha_ascii c || A.isDigit c)
+
+serializeRawChatMessage :: RawChatMessage -> ByteString
+serializeRawChatMessage RawChatMessage {chatMsgId, chatMsgEvent, chatMsgParams, chatMsgBody} =
+  B.unwords
+    [ maybe "" bshow chatMsgId,
+      chatMsgEvent,
+      B.intercalate "," chatMsgParams,
+      B.unwords $ map serializeBodyContentInfo chatMsgBody,
+      B.unwords $ map msgContentData chatMsgBody
+    ]
+
+serializeBodyContentInfo :: RawMsgBodyContent -> ByteString
+serializeBodyContentInfo RawMsgBodyContent {contentType = t, contentData} =
+  serializeContentInfo (t, B.length contentData)
+
+serializeContentInfo :: (RawContentType, Int) -> ByteString
+serializeContentInfo (RawContentType ns cType, size) = ns <> "." <> cType <> ":" <> bshow size
+
+msgContentData :: RawMsgBodyContent -> ByteString
+msgContentData RawMsgBodyContent {contentData} = contentData <> " "
--- a/src/Simplex/Chat/Store.hs
+++ b/src/Simplex/Chat/Store.hs
--- a/src/Simplex/Chat/Styled.hs
+++ b/src/Simplex/Chat/Styled.hs
@@ -1,14 +1,13 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE LambdaCase #-}

-module Styled
+module Simplex.Chat.Styled
  ( StyledString (..),
-    bPlain,
-    plain,
+    StyledFormat (..),
    styleMarkdown,
    styleMarkdownText,
-    styled,
    sLength,
+    sShow,
  )
 where

@@ -28,12 +27,6 @@ instance Monoid StyledString where mempty = plain ""

 instance IsString StyledString where fromString = plain

-plain :: String -> StyledString
-plain = Styled []
-
-bPlain :: ByteString -> StyledString
-bPlain = Styled [] . B.unpack
-
 styleMarkdownText :: Text -> StyledString
 styleMarkdownText = styleMarkdown . parseMarkdown

@@ -48,12 +41,22 @@ wrap c s = plain [c] <> s <> plain [c]

 class StyledFormat a where
  styled :: Format -> a -> StyledString
+  plain :: a -> StyledString

-instance StyledFormat String where styled = Styled . sgr
+instance StyledFormat String where
+  styled = Styled . sgr
+  plain = Styled []

-instance StyledFormat ByteString where styled f = styled f . B.unpack
+instance StyledFormat ByteString where
+  styled f = styled f . B.unpack
+  plain = Styled [] . B.unpack

-instance StyledFormat Text where styled f = styled f . T.unpack
+instance StyledFormat Text where
+  styled f = styled f . T.unpack
+  plain = Styled [] . T.unpack
+
+sShow :: Show a => a -> StyledString
+sShow = plain . show

 sgr :: Format -> [SGR]
 sgr = \case
--- a/src/Simplex/Chat/Terminal.hs
+++ b/src/Simplex/Chat/Terminal.hs
@@ -0,0 +1,176 @@
+{-# LANGUAGE GADTs #-}
+{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+
+module Simplex.Chat.Terminal where
+
+import Control.Monad.Catch (MonadMask)
+import Control.Monad.IO.Class (MonadIO)
+import Simplex.Chat.Styled
+import Simplex.Chat.Types
+import System.Console.ANSI.Types
+import System.Terminal
+import System.Terminal.Internal (LocalTerminal, Terminal, VirtualTerminal)
+import UnliftIO.STM
+
+data ActiveTo = ActiveNone | ActiveC ContactName | ActiveG GroupName
+  deriving (Eq)
+
+data ChatTerminal = ChatTerminal
+  { activeTo :: TVar ActiveTo,
+    termDevice :: TerminalDevice,
+    termState :: TVar TerminalState,
+    termSize :: Size,
+    nextMessageRow :: TVar Int,
+    termLock :: TMVar ()
+  }
+
+data TerminalState = TerminalState
+  { inputPrompt :: String,
+    inputString :: String,
+    inputPosition :: Int,
+    previousInput :: String
+  }
+
+class Terminal t => WithTerminal t where
+  withTerm :: (MonadIO m, MonadMask m) => t -> (t -> m a) -> m a
+
+data TerminalDevice = forall t. WithTerminal t => TerminalDevice t
+
+instance WithTerminal LocalTerminal where
+  withTerm _ = withTerminal
+
+instance WithTerminal VirtualTerminal where
+  withTerm t = ($ t)
+
+withChatTerm :: (MonadIO m, MonadMask m) => ChatTerminal -> (forall t. WithTerminal t => TerminalT t m a) -> m a
+withChatTerm ChatTerminal {termDevice = TerminalDevice t} action = withTerm t $ runTerminalT action
+
+newChatTerminal :: WithTerminal t => t -> IO ChatTerminal
+newChatTerminal t = do
+  activeTo <- newTVarIO ActiveNone
+  termSize <- withTerm t . runTerminalT $ getWindowSize
+  let lastRow = height termSize - 1
+  termState <- newTVarIO newTermState
+  termLock <- newTMVarIO ()
+  nextMessageRow <- newTVarIO lastRow
+  -- threadDelay 500000 -- this delay is the same as timeout in getTerminalSize
+  return ChatTerminal {activeTo, termDevice = TerminalDevice t, termState, termSize, nextMessageRow, termLock}
+
+newTermState :: TerminalState
+newTermState =
+  TerminalState
+    { inputString = "",
+      inputPosition = 0,
+      inputPrompt = "> ",
+      previousInput = ""
+    }
+
+withTermLock :: MonadTerminal m => ChatTerminal -> m () -> m ()
+withTermLock ChatTerminal {termLock} action = do
+  _ <- atomically $ takeTMVar termLock
+  action
+  atomically $ putTMVar termLock ()
+
+printToTerminal :: ChatTerminal -> [StyledString] -> IO ()
+printToTerminal ct s =
+  withChatTerm ct $
+    withTermLock ct $ do
+      printMessage ct s
+      updateInput ct
+
+updateInput :: forall m. MonadTerminal m => ChatTerminal -> m ()
+updateInput ChatTerminal {termSize = Size {height, width}, termState, nextMessageRow} = do
+  hideCursor
+  ts <- readTVarIO termState
+  nmr <- readTVarIO nextMessageRow
+  let ih = inputHeight ts
+      iStart = height - ih
+      prompt = inputPrompt ts
+      Position {row, col} = positionRowColumn width $ length prompt + inputPosition ts
+  if nmr >= iStart
+    then atomically $ writeTVar nextMessageRow iStart
+    else clearLines nmr iStart
+  setCursorPosition $ Position {row = max nmr iStart, col = 0}
+  putString $ prompt <> inputString ts <> " "
+  eraseInLine EraseForward
+  setCursorPosition $ Position {row = iStart + row, col}
+  showCursor
+  flush
+  where
+    clearLines :: Int -> Int -> m ()
+    clearLines from till
+      | from >= till = return ()
+      | otherwise = do
+        setCursorPosition $ Position {row = from, col = 0}
+        eraseInLine EraseForward
+        clearLines (from + 1) till
+    inputHeight :: TerminalState -> Int
+    inputHeight ts = length (inputPrompt ts <> inputString ts) `div` width + 1
+    positionRowColumn :: Int -> Int -> Position
+    positionRowColumn wid pos =
+      let row = pos `div` wid
+          col = pos - row * wid
+       in Position {row, col}
+
+printMessage :: forall m. MonadTerminal m => ChatTerminal -> [StyledString] -> m ()
+printMessage ChatTerminal {termSize = Size {height, width}, nextMessageRow} msg = do
+  nmr <- readTVarIO nextMessageRow
+  setCursorPosition $ Position {row = nmr, col = 0}
+  mapM_ printStyled msg
+  flush
+  let lc = sum $ map lineCount msg
+  atomically . writeTVar nextMessageRow $ min (height - 1) (nmr + lc)
+  where
+    lineCount :: StyledString -> Int
+    lineCount s = sLength s `div` width + 1
+    printStyled :: StyledString -> m ()
+    printStyled s = do
+      putStyled s
+      eraseInLine EraseForward
+      putLn
+
+-- Currently it is assumed that the message does not have internal line breaks.
+-- Previous implementation "kind of" supported them,
+-- but it was not determining the number of printed lines correctly
+-- because of accounting for control sequences in length
+putStyled :: MonadTerminal m => StyledString -> m ()
+putStyled (s1 :<>: s2) = putStyled s1 >> putStyled s2
+putStyled (Styled [] s) = putString s
+putStyled (Styled sgr s) = setSGR sgr >> putString s >> resetAttributes
+
+setSGR :: MonadTerminal m => [SGR] -> m ()
+setSGR = mapM_ $ \case
+  Reset -> resetAttributes
+  SetConsoleIntensity BoldIntensity -> setAttribute bold
+  SetConsoleIntensity _ -> resetAttribute bold
+  SetItalicized True -> setAttribute italic
+  SetItalicized _ -> resetAttribute italic
+  SetUnderlining NoUnderline -> resetAttribute underlined
+  SetUnderlining _ -> setAttribute underlined
+  SetSwapForegroundBackground True -> setAttribute inverted
+  SetSwapForegroundBackground _ -> resetAttribute inverted
+  SetColor l i c -> setAttribute . layer l . intensity i $ color c
+  SetBlinkSpeed _ -> pure ()
+  SetVisible _ -> pure ()
+  SetRGBColor _ _ -> pure ()
+  SetPaletteColor _ _ -> pure ()
+  SetDefaultColor _ -> pure ()
+  where
+    layer = \case
+      Foreground -> foreground
+      Background -> background
+    intensity = \case
+      Dull -> id
+      Vivid -> bright
+    color = \case
+      Black -> black
+      Red -> red
+      Green -> green
+      Yellow -> yellow
+      Blue -> blue
+      Magenta -> magenta
+      Cyan -> cyan
+      White -> white
--- a/src/Simplex/Chat/Types.hs
+++ b/src/Simplex/Chat/Types.hs
@@ -0,0 +1,497 @@
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Simplex.Chat.Types where
+
+import Data.Aeson (FromJSON, ToJSON)
+import qualified Data.Aeson as J
+import Data.ByteString.Char8 (ByteString)
+import qualified Data.ByteString.Char8 as B
+import Data.Int (Int64)
+import Data.Text (Text)
+import Data.Time.Clock (UTCTime)
+import Data.Typeable (Typeable)
+import Database.SQLite.Simple (ResultError (..), SQLData (..))
+import Database.SQLite.Simple.FromField (FieldParser, FromField (..), returnError)
+import Database.SQLite.Simple.Internal (Field (..))
+import Database.SQLite.Simple.Ok (Ok (Ok))
+import Database.SQLite.Simple.ToField (ToField (..))
+import GHC.Generics
+import Simplex.Messaging.Agent.Protocol (ConnId, SMPQueueInfo)
+import Simplex.Messaging.Agent.Store.SQLite (fromTextField_)
+
+class IsContact a where
+  contactId' :: a -> Int64
+  profile' :: a -> Profile
+  localDisplayName' :: a -> ContactName
+
+instance IsContact User where
+  contactId' = userContactId
+  profile' = profile
+  localDisplayName' = localDisplayName
+
+instance IsContact Contact where
+  contactId' = contactId
+  profile' = profile
+  localDisplayName' = localDisplayName
+
+data User = User
+  { userId :: UserId,
+    userContactId :: Int64,
+    localDisplayName :: ContactName,
+    profile :: Profile,
+    activeUser :: Bool
+  }
+
+type UserId = Int64
+
+data Contact = Contact
+  { contactId :: Int64,
+    localDisplayName :: ContactName,
+    profile :: Profile,
+    activeConn :: Connection,
+    viaGroup :: Maybe Int64
+  }
+  deriving (Eq, Show)
+
+contactConnId :: Contact -> ConnId
+contactConnId Contact {activeConn = Connection {agentConnId}} = agentConnId
+
+type ContactName = Text
+
+type GroupName = Text
+
+data Group = Group
+  { groupId :: Int64,
+    localDisplayName :: GroupName,
+    groupProfile :: GroupProfile,
+    members :: [GroupMember],
+    membership :: GroupMember
+  }
+  deriving (Eq, Show)
+
+data Profile = Profile
+  { displayName :: ContactName,
+    fullName :: Text
+  }
+  deriving (Generic, Eq, Show)
+
+instance ToJSON Profile where toEncoding = J.genericToEncoding J.defaultOptions
+
+instance FromJSON Profile
+
+data GroupProfile = GroupProfile
+  { displayName :: GroupName,
+    fullName :: Text
+  }
+  deriving (Generic, Eq, Show)
+
+instance ToJSON GroupProfile where toEncoding = J.genericToEncoding J.defaultOptions
+
+instance FromJSON GroupProfile
+
+data GroupInvitation = GroupInvitation
+  { fromMember :: (MemberId, GroupMemberRole),
+    invitedMember :: (MemberId, GroupMemberRole),
+    queueInfo :: SMPQueueInfo,
+    groupProfile :: GroupProfile
+  }
+  deriving (Eq, Show)
+
+data IntroInvitation = IntroInvitation
+  { groupQInfo :: SMPQueueInfo,
+    directQInfo :: SMPQueueInfo
+  }
+  deriving (Eq, Show)
+
+data MemberInfo = MemberInfo MemberId GroupMemberRole Profile
+  deriving (Eq, Show)
+
+memberInfo :: GroupMember -> MemberInfo
+memberInfo m = MemberInfo (memberId m) (memberRole m) (memberProfile m)
+
+data ReceivedGroupInvitation = ReceivedGroupInvitation
+  { fromMember :: GroupMember,
+    userMember :: GroupMember,
+    queueInfo :: SMPQueueInfo,
+    groupProfile :: GroupProfile
+  }
+  deriving (Eq, Show)
+
+data GroupMember = GroupMember
+  { groupMemberId :: Int64,
+    groupId :: Int64,
+    memberId :: MemberId,
+    memberRole :: GroupMemberRole,
+    memberCategory :: GroupMemberCategory,
+    memberStatus :: GroupMemberStatus,
+    invitedBy :: InvitedBy,
+    localDisplayName :: ContactName,
+    memberProfile :: Profile,
+    memberContactId :: Maybe Int64,
+    activeConn :: Maybe Connection
+  }
+  deriving (Eq, Show)
+
+memberConnId :: GroupMember -> Maybe ConnId
+memberConnId GroupMember {activeConn} = case activeConn of
+  Just Connection {agentConnId} -> Just agentConnId
+  Nothing -> Nothing
+
+data NewGroupMember = NewGroupMember
+  { memInfo :: MemberInfo,
+    memCategory :: GroupMemberCategory,
+    memStatus :: GroupMemberStatus,
+    memInvitedBy :: InvitedBy,
+    localDisplayName :: ContactName,
+    memProfileId :: Int64,
+    memContactId :: Maybe Int64
+  }
+
+type MemberId = ByteString
+
+data InvitedBy = IBContact Int64 | IBUser | IBUnknown
+  deriving (Eq, Show)
+
+toInvitedBy :: Int64 -> Maybe Int64 -> InvitedBy
+toInvitedBy userCtId (Just ctId)
+  | userCtId == ctId = IBUser
+  | otherwise = IBContact ctId
+toInvitedBy _ Nothing = IBUnknown
+
+fromInvitedBy :: Int64 -> InvitedBy -> Maybe Int64
+fromInvitedBy userCtId = \case
+  IBUnknown -> Nothing
+  IBContact ctId -> Just ctId
+  IBUser -> Just userCtId
+
+data GroupMemberRole = GRMember | GRAdmin | GROwner
+  deriving (Eq, Show, Ord)
+
+instance FromField GroupMemberRole where fromField = fromBlobField_ toMemberRole
+
+instance ToField GroupMemberRole where toField = toField . serializeMemberRole
+
+toMemberRole :: ByteString -> Either String GroupMemberRole
+toMemberRole = \case
+  "owner" -> Right GROwner
+  "admin" -> Right GRAdmin
+  "member" -> Right GRMember
+  r -> Left $ "invalid group member role " <> B.unpack r
+
+serializeMemberRole :: GroupMemberRole -> ByteString
+serializeMemberRole = \case
+  GROwner -> "owner"
+  GRAdmin -> "admin"
+  GRMember -> "member"
+
+fromBlobField_ :: Typeable k => (ByteString -> Either String k) -> FieldParser k
+fromBlobField_ p = \case
+  f@(Field (SQLBlob b) _) ->
+    case p b of
+      Right k -> Ok k
+      Left e -> returnError ConversionFailed f ("could not parse field: " ++ e)
+  f -> returnError ConversionFailed f "expecting SQLBlob column type"
+
+data GroupMemberCategory
+  = GCUserMember
+  | GCInviteeMember -- member invited by the user
+  | GCHostMember -- member who invited the user
+  | GCPreMember -- member who joined before the user and was introduced to the user (user receives x.grp.mem.intro about such members)
+  | GCPostMember -- member who joined after the user to whom the user was introduced (user receives x.grp.mem.new announcing these members and then x.grp.mem.fwd with invitation from these members)
+  deriving (Eq, Show)
+
+instance FromField GroupMemberCategory where fromField = fromTextField_ memberCategoryT
+
+instance ToField GroupMemberCategory where toField = toField . serializeMemberCategory
+
+memberCategoryT :: Text -> Maybe GroupMemberCategory
+memberCategoryT = \case
+  "user" -> Just GCUserMember
+  "invitee" -> Just GCInviteeMember
+  "host" -> Just GCHostMember
+  "pre" -> Just GCPreMember
+  "post" -> Just GCPostMember
+  _ -> Nothing
+
+serializeMemberCategory :: GroupMemberCategory -> Text
+serializeMemberCategory = \case
+  GCUserMember -> "user"
+  GCInviteeMember -> "invitee"
+  GCHostMember -> "host"
+  GCPreMember -> "pre"
+  GCPostMember -> "post"
+
+data GroupMemberStatus
+  = GSMemRemoved -- member who was removed from the group
+  | GSMemLeft -- member who left the group
+  | GSMemGroupDeleted -- user member of the deleted group
+  | GSMemInvited -- member is sent to or received invitation to join the group
+  | GSMemIntroduced -- user received x.grp.mem.intro for this member (only with GCPreMember)
+  | GSMemIntroInvited -- member is sent to or received from intro invitation
+  | GSMemAccepted -- member accepted invitation (only User and Invitee)
+  | GSMemAnnounced -- host announced (x.grp.mem.new) a member (Invitee and PostMember) to the group - at this point this member can send messages and invite other members (if they have sufficient permissions)
+  | GSMemConnected -- member created the group connection with the inviting member
+  | GSMemComplete -- host confirmed (x.grp.mem.all) that a member (User, Invitee and PostMember) created group connections with all previous members
+  | GSMemCreator -- user member that created the group (only GCUserMember)
+  deriving (Eq, Show, Ord)
+
+instance FromField GroupMemberStatus where fromField = fromTextField_ memberStatusT
+
+instance ToField GroupMemberStatus where toField = toField . serializeMemberStatus
+
+memberActive :: GroupMember -> Bool
+memberActive m = case memberStatus m of
+  GSMemRemoved -> False
+  GSMemLeft -> False
+  GSMemGroupDeleted -> False
+  GSMemInvited -> False
+  GSMemIntroduced -> False
+  GSMemIntroInvited -> False
+  GSMemAccepted -> False
+  GSMemAnnounced -> False
+  GSMemConnected -> True
+  GSMemComplete -> True
+  GSMemCreator -> True
+
+memberCurrent :: GroupMember -> Bool
+memberCurrent m = case memberStatus m of
+  GSMemRemoved -> False
+  GSMemLeft -> False
+  GSMemGroupDeleted -> False
+  GSMemInvited -> False
+  GSMemIntroduced -> True
+  GSMemIntroInvited -> True
+  GSMemAccepted -> True
+  GSMemAnnounced -> True
+  GSMemConnected -> True
+  GSMemComplete -> True
+  GSMemCreator -> True
+
+memberStatusT :: Text -> Maybe GroupMemberStatus
+memberStatusT = \case
+  "removed" -> Just GSMemRemoved
+  "left" -> Just GSMemLeft
+  "deleted" -> Just GSMemGroupDeleted
+  "invited" -> Just GSMemInvited
+  "introduced" -> Just GSMemIntroduced
+  "intro-inv" -> Just GSMemIntroInvited
+  "accepted" -> Just GSMemAccepted
+  "announced" -> Just GSMemAnnounced
+  "connected" -> Just GSMemConnected
+  "complete" -> Just GSMemComplete
+  "creator" -> Just GSMemCreator
+  _ -> Nothing
+
+serializeMemberStatus :: GroupMemberStatus -> Text
+serializeMemberStatus = \case
+  GSMemRemoved -> "removed"
+  GSMemLeft -> "left"
+  GSMemGroupDeleted -> "deleted"
+  GSMemInvited -> "invited"
+  GSMemIntroduced -> "introduced"
+  GSMemIntroInvited -> "intro-inv"
+  GSMemAccepted -> "accepted"
+  GSMemAnnounced -> "announced"
+  GSMemConnected -> "connected"
+  GSMemComplete -> "complete"
+  GSMemCreator -> "creator"
+
+data SndFileTransfer = SndFileTransfer
+  { fileId :: Int64,
+    fileName :: String,
+    filePath :: String,
+    fileSize :: Integer,
+    chunkSize :: Integer,
+    recipientDisplayName :: ContactName,
+    connId :: Int64,
+    agentConnId :: ConnId,
+    fileStatus :: FileStatus
+  }
+  deriving (Eq, Show)
+
+data FileInvitation = FileInvitation
+  { fileName :: String,
+    fileSize :: Integer,
+    fileQInfo :: SMPQueueInfo
+  }
+  deriving (Eq, Show)
+
+data RcvFileTransfer = RcvFileTransfer
+  { fileId :: Int64,
+    fileInvitation :: FileInvitation,
+    fileStatus :: RcvFileStatus,
+    senderDisplayName :: ContactName,
+    chunkSize :: Integer
+  }
+  deriving (Eq, Show)
+
+data RcvFileStatus
+  = RFSNew
+  | RFSAccepted RcvFileInfo
+  | RFSConnected RcvFileInfo
+  | RFSComplete RcvFileInfo
+  | RFSCancelled RcvFileInfo
+  deriving (Eq, Show)
+
+data RcvFileInfo = RcvFileInfo
+  { filePath :: FilePath,
+    connId :: Int64,
+    agentConnId :: ConnId
+  }
+  deriving (Eq, Show)
+
+data FileTransfer = FTSnd [SndFileTransfer] | FTRcv RcvFileTransfer
+
+data FileStatus = FSNew | FSAccepted | FSConnected | FSComplete | FSCancelled deriving (Eq, Ord, Show)
+
+instance FromField FileStatus where fromField = fromTextField_ fileStatusT
+
+instance ToField FileStatus where toField = toField . serializeFileStatus
+
+fileStatusT :: Text -> Maybe FileStatus
+fileStatusT = \case
+  "new" -> Just FSNew
+  "accepted" -> Just FSAccepted
+  "connected" -> Just FSConnected
+  "complete" -> Just FSComplete
+  "cancelled" -> Just FSCancelled
+  _ -> Nothing
+
+serializeFileStatus :: FileStatus -> Text
+serializeFileStatus = \case
+  FSNew -> "new"
+  FSAccepted -> "accepted"
+  FSConnected -> "connected"
+  FSComplete -> "complete"
+  FSCancelled -> "cancelled"
+
+data RcvChunkStatus = RcvChunkOk | RcvChunkFinal | RcvChunkDuplicate | RcvChunkError
+  deriving (Eq, Show)
+
+data Connection = Connection
+  { connId :: Int64,
+    agentConnId :: ConnId,
+    connLevel :: Int,
+    viaContact :: Maybe Int64,
+    connType :: ConnType,
+    connStatus :: ConnStatus,
+    entityId :: Maybe Int64, -- contact, group member or file ID
+    createdAt :: UTCTime
+  }
+  deriving (Eq, Show)
+
+data ConnStatus
+  = -- | connection is created by initiating party with agent NEW command (createConnection)
+    ConnNew
+  | -- | connection is joined by joining party with agent JOIN command (joinConnection)
+    ConnJoined
+  | -- | initiating party received CONF notification (to be renamed to REQ)
+    ConnRequested
+  | -- | initiating party accepted connection with agent LET command (to be renamed to ACPT) (allowConnection)
+    ConnAccepted
+  | -- | connection can be sent messages to (after joining party received INFO notification)
+    ConnSndReady
+  | -- | connection is ready for both parties to send and receive messages
+    ConnReady
+  | -- | connection deleted
+    ConnDeleted
+  deriving (Eq, Show)
+
+instance FromField ConnStatus where fromField = fromTextField_ connStatusT
+
+instance ToField ConnStatus where toField = toField . serializeConnStatus
+
+connStatusT :: Text -> Maybe ConnStatus
+connStatusT = \case
+  "new" -> Just ConnNew
+  "joined" -> Just ConnJoined
+  "requested" -> Just ConnRequested
+  "accepted" -> Just ConnAccepted
+  "snd-ready" -> Just ConnSndReady
+  "ready" -> Just ConnReady
+  "deleted" -> Just ConnDeleted
+  _ -> Nothing
+
+serializeConnStatus :: ConnStatus -> Text
+serializeConnStatus = \case
+  ConnNew -> "new"
+  ConnJoined -> "joined"
+  ConnRequested -> "requested"
+  ConnAccepted -> "accepted"
+  ConnSndReady -> "snd-ready"
+  ConnReady -> "ready"
+  ConnDeleted -> "deleted"
+
+data ConnType = ConnContact | ConnMember | ConnSndFile | ConnRcvFile
+  deriving (Eq, Show)
+
+instance FromField ConnType where fromField = fromTextField_ connTypeT
+
+instance ToField ConnType where toField = toField . serializeConnType
+
+connTypeT :: Text -> Maybe ConnType
+connTypeT = \case
+  "contact" -> Just ConnContact
+  "member" -> Just ConnMember
+  "snd_file" -> Just ConnSndFile
+  "rcv_file" -> Just ConnRcvFile
+  _ -> Nothing
+
+serializeConnType :: ConnType -> Text
+serializeConnType = \case
+  ConnContact -> "contact"
+  ConnMember -> "member"
+  ConnSndFile -> "snd_file"
+  ConnRcvFile -> "rcv_file"
+
+data NewConnection = NewConnection
+  { agentConnId :: ByteString,
+    connLevel :: Int,
+    viaConn :: Maybe Int64
+  }
+
+data GroupMemberIntro = GroupMemberIntro
+  { introId :: Int64,
+    reMember :: GroupMember,
+    toMember :: GroupMember,
+    introStatus :: GroupMemberIntroStatus,
+    introInvitation :: Maybe IntroInvitation
+  }
+
+data GroupMemberIntroStatus
+  = GMIntroPending
+  | GMIntroSent
+  | GMIntroInvReceived
+  | GMIntroInvForwarded
+  | GMIntroReConnected
+  | GMIntroToConnected
+  | GMIntroConnected
+
+instance FromField GroupMemberIntroStatus where fromField = fromTextField_ introStatusT
+
+instance ToField GroupMemberIntroStatus where toField = toField . serializeIntroStatus
+
+introStatusT :: Text -> Maybe GroupMemberIntroStatus
+introStatusT = \case
+  "new" -> Just GMIntroPending
+  "sent" -> Just GMIntroSent
+  "rcv" -> Just GMIntroInvReceived
+  "fwd" -> Just GMIntroInvForwarded
+  "re-con" -> Just GMIntroReConnected
+  "to-con" -> Just GMIntroToConnected
+  "con" -> Just GMIntroConnected
+  _ -> Nothing
+
+serializeIntroStatus :: GroupMemberIntroStatus -> Text
+serializeIntroStatus = \case
+  GMIntroPending -> "new"
+  GMIntroSent -> "sent"
+  GMIntroInvReceived -> "rcv"
+  GMIntroInvForwarded -> "fwd"
+  GMIntroReConnected -> "re-con"
+  GMIntroToConnected -> "to-con"
+  GMIntroConnected -> "con"
--- a/src/Simplex/Chat/Util.hs
+++ b/src/Simplex/Chat/Util.hs
@@ -0,0 +1,16 @@
+module Simplex.Chat.Util where
+
+import Data.ByteString.Char8 (ByteString)
+import Data.Text (Text)
+import Data.Text.Encoding (decodeUtf8With)
+
+safeDecodeUtf8 :: ByteString -> Text
+safeDecodeUtf8 = decodeUtf8With onError
+  where
+    onError _ _ = Just '?'
+
+ifM :: Monad m => m Bool -> m a -> m a -> m a
+ifM ba t f = ba >>= \b -> if b then t else f
+
+unlessM :: Monad m => m Bool -> m () -> m ()
+unlessM b = ifM b $ pure ()
--- a/src/Simplex/Chat/View.hs
+++ b/src/Simplex/Chat/View.hs
@@ -0,0 +1,687 @@
+{-# LANGUAGE ConstraintKinds #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module Simplex.Chat.View
+  ( printToView,
+    showInvitation,
+    showChatError,
+    showContactDeleted,
+    showContactGroups,
+    showContactConnected,
+    showContactDisconnected,
+    showContactAnotherClient,
+    showContactSubscribed,
+    showContactSubError,
+    showGroupSubscribed,
+    showGroupEmpty,
+    showGroupRemoved,
+    showMemberSubError,
+    showReceivedMessage,
+    showReceivedGroupMessage,
+    showSentMessage,
+    showSentGroupMessage,
+    showSentFileInvitation,
+    showSentGroupFileInvitation,
+    showSentFileInfo,
+    showSndFileStart,
+    showSndFileComplete,
+    showSndFileCancelled,
+    showSndGroupFileCancelled,
+    showSndFileRcvCancelled,
+    receivedFileInvitation,
+    showRcvFileAccepted,
+    showRcvFileStart,
+    showRcvFileComplete,
+    showRcvFileCancelled,
+    showRcvFileSndCancelled,
+    showFileTransferStatus,
+    showSndFileSubError,
+    showRcvFileSubError,
+    showGroupCreated,
+    showGroupDeletedUser,
+    showGroupDeleted,
+    showSentGroupInvitation,
+    showReceivedGroupInvitation,
+    showJoinedGroupMember,
+    showUserJoinedGroup,
+    showJoinedGroupMemberConnecting,
+    showConnectedToGroupMember,
+    showDeletedMember,
+    showDeletedMemberUser,
+    showLeftMemberUser,
+    showLeftMember,
+    showGroupMembers,
+    showContactsMerged,
+    showUserProfile,
+    showUserProfileUpdated,
+    showContactUpdated,
+    showMessageError,
+    safeDecodeUtf8,
+    msgPlain,
+  )
+where
+
+import Control.Monad.IO.Unlift
+import Control.Monad.Reader
+import Data.ByteString.Char8 (ByteString)
+import Data.Composition ((.:), (.:.))
+import Data.Function (on)
+import Data.Int (Int64)
+import Data.List (groupBy, intersperse, sortOn)
+import Data.Text (Text)
+import qualified Data.Text as T
+import Data.Time.Clock (DiffTime, UTCTime)
+import Data.Time.Format (defaultTimeLocale, formatTime)
+import Data.Time.LocalTime (TimeZone, ZonedTime, getCurrentTimeZone, getZonedTime, localDay, localTimeOfDay, timeOfDayToTime, utcToLocalTime, zonedTimeToLocalTime)
+import Numeric (showFFloat)
+import Simplex.Chat.Controller
+import Simplex.Chat.Markdown
+import Simplex.Chat.Store (StoreError (..))
+import Simplex.Chat.Styled
+import Simplex.Chat.Terminal (printToTerminal)
+import Simplex.Chat.Types
+import Simplex.Chat.Util (safeDecodeUtf8)
+import Simplex.Messaging.Agent.Protocol
+import System.Console.ANSI.Types
+
+type ChatReader m = (MonadUnliftIO m, MonadReader ChatController m)
+
+showInvitation :: ChatReader m => SMPQueueInfo -> m ()
+showInvitation = printToView . invitation
+
+showChatError :: ChatReader m => ChatError -> m ()
+showChatError = printToView . chatError
+
+showContactDeleted :: ChatReader m => ContactName -> m ()
+showContactDeleted = printToView . contactDeleted
+
+showContactGroups :: ChatReader m => ContactName -> [GroupName] -> m ()
+showContactGroups = printToView .: contactGroups
+
+showContactConnected :: ChatReader m => Contact -> m ()
+showContactConnected = printToView . contactConnected
+
+showContactDisconnected :: ChatReader m => ContactName -> m ()
+showContactDisconnected = printToView . contactDisconnected
+
+showContactAnotherClient :: ChatReader m => ContactName -> m ()
+showContactAnotherClient = printToView . contactAnotherClient
+
+showContactSubscribed :: ChatReader m => ContactName -> m ()
+showContactSubscribed = printToView . contactSubscribed
+
+showContactSubError :: ChatReader m => ContactName -> ChatError -> m ()
+showContactSubError = printToView .: contactSubError
+
+showGroupSubscribed :: ChatReader m => GroupName -> m ()
+showGroupSubscribed = printToView . groupSubscribed
+
+showGroupEmpty :: ChatReader m => GroupName -> m ()
+showGroupEmpty = printToView . groupEmpty
+
+showGroupRemoved :: ChatReader m => GroupName -> m ()
+showGroupRemoved = printToView . groupRemoved
+
+showMemberSubError :: ChatReader m => GroupName -> ContactName -> ChatError -> m ()
+showMemberSubError = printToView .:. memberSubError
+
+showReceivedMessage :: ChatReader m => ContactName -> UTCTime -> [StyledString] -> MsgIntegrity -> m ()
+showReceivedMessage = showReceivedMessage_ . ttyFromContact
+
+showReceivedGroupMessage :: ChatReader m => GroupName -> ContactName -> UTCTime -> [StyledString] -> MsgIntegrity -> m ()
+showReceivedGroupMessage = showReceivedMessage_ .: ttyFromGroup
+
+showReceivedMessage_ :: ChatReader m => StyledString -> UTCTime -> [StyledString] -> MsgIntegrity -> m ()
+showReceivedMessage_ from utcTime msg mOk = printToView =<< liftIO (receivedMessage from utcTime msg mOk)
+
+showSentMessage :: ChatReader m => ContactName -> ByteString -> m ()
+showSentMessage = showSentMessage_ . ttyToContact
+
+showSentGroupMessage :: ChatReader m => GroupName -> ByteString -> m ()
+showSentGroupMessage = showSentMessage_ . ttyToGroup
+
+showSentMessage_ :: ChatReader m => StyledString -> ByteString -> m ()
+showSentMessage_ to msg = printToView =<< liftIO (sentMessage to msg)
+
+showSentFileInvitation :: ChatReader m => ContactName -> FilePath -> m ()
+showSentFileInvitation = showSentFileInvitation_ . ttyToContact
+
+showSentGroupFileInvitation :: ChatReader m => GroupName -> FilePath -> m ()
+showSentGroupFileInvitation = showSentFileInvitation_ . ttyToGroup
+
+showSentFileInvitation_ :: ChatReader m => StyledString -> FilePath -> m ()
+showSentFileInvitation_ to filePath = printToView =<< liftIO (sentFileInvitation to filePath)
+
+showSentFileInfo :: ChatReader m => Int64 -> m ()
+showSentFileInfo = printToView . sentFileInfo
+
+showSndFileStart :: ChatReader m => SndFileTransfer -> m ()
+showSndFileStart = printToView . sndFileStart
+
+showSndFileComplete :: ChatReader m => SndFileTransfer -> m ()
+showSndFileComplete = printToView . sndFileComplete
+
+showSndFileCancelled :: ChatReader m => SndFileTransfer -> m ()
+showSndFileCancelled = printToView . sndFileCancelled
+
+showSndGroupFileCancelled :: ChatReader m => [SndFileTransfer] -> m ()
+showSndGroupFileCancelled = printToView . sndGroupFileCancelled
+
+showSndFileRcvCancelled :: ChatReader m => SndFileTransfer -> m ()
+showSndFileRcvCancelled = printToView . sndFileRcvCancelled
+
+showRcvFileAccepted :: ChatReader m => RcvFileTransfer -> FilePath -> m ()
+showRcvFileAccepted = printToView .: rcvFileAccepted
+
+showRcvFileStart :: ChatReader m => RcvFileTransfer -> m ()
+showRcvFileStart = printToView . rcvFileStart
+
+showRcvFileComplete :: ChatReader m => RcvFileTransfer -> m ()
+showRcvFileComplete = printToView . rcvFileComplete
+
+showRcvFileCancelled :: ChatReader m => RcvFileTransfer -> m ()
+showRcvFileCancelled = printToView . rcvFileCancelled
+
+showRcvFileSndCancelled :: ChatReader m => RcvFileTransfer -> m ()
+showRcvFileSndCancelled = printToView . rcvFileSndCancelled
+
+showFileTransferStatus :: ChatReader m => (FileTransfer, [Integer]) -> m ()
+showFileTransferStatus = printToView . fileTransferStatus
+
+showSndFileSubError :: ChatReader m => SndFileTransfer -> ChatError -> m ()
+showSndFileSubError = printToView .: sndFileSubError
+
+showRcvFileSubError :: ChatReader m => RcvFileTransfer -> ChatError -> m ()
+showRcvFileSubError = printToView .: rcvFileSubError
+
+showGroupCreated :: ChatReader m => Group -> m ()
+showGroupCreated = printToView . groupCreated
+
+showGroupDeletedUser :: ChatReader m => GroupName -> m ()
+showGroupDeletedUser = printToView . groupDeletedUser
+
+showGroupDeleted :: ChatReader m => GroupName -> GroupMember -> m ()
+showGroupDeleted = printToView .: groupDeleted
+
+showSentGroupInvitation :: ChatReader m => GroupName -> ContactName -> m ()
+showSentGroupInvitation = printToView .: sentGroupInvitation
+
+showReceivedGroupInvitation :: ChatReader m => Group -> ContactName -> GroupMemberRole -> m ()
+showReceivedGroupInvitation = printToView .:. receivedGroupInvitation
+
+showJoinedGroupMember :: ChatReader m => GroupName -> GroupMember -> m ()
+showJoinedGroupMember = printToView .: joinedGroupMember
+
+showUserJoinedGroup :: ChatReader m => GroupName -> m ()
+showUserJoinedGroup = printToView . userJoinedGroup
+
+showJoinedGroupMemberConnecting :: ChatReader m => GroupName -> GroupMember -> GroupMember -> m ()
+showJoinedGroupMemberConnecting = printToView .:. joinedGroupMemberConnecting
+
+showConnectedToGroupMember :: ChatReader m => GroupName -> GroupMember -> m ()
+showConnectedToGroupMember = printToView .: connectedToGroupMember
+
+showDeletedMember :: ChatReader m => GroupName -> Maybe GroupMember -> Maybe GroupMember -> m ()
+showDeletedMember = printToView .:. deletedMember
+
+showDeletedMemberUser :: ChatReader m => GroupName -> GroupMember -> m ()
+showDeletedMemberUser = printToView .: deletedMemberUser
+
+showLeftMemberUser :: ChatReader m => GroupName -> m ()
+showLeftMemberUser = printToView . leftMemberUser
+
+showLeftMember :: ChatReader m => GroupName -> GroupMember -> m ()
+showLeftMember = printToView .: leftMember
+
+showGroupMembers :: ChatReader m => Group -> m ()
+showGroupMembers = printToView . groupMembers
+
+showContactsMerged :: ChatReader m => Contact -> Contact -> m ()
+showContactsMerged = printToView .: contactsMerged
+
+showUserProfile :: ChatReader m => Profile -> m ()
+showUserProfile = printToView . userProfile
+
+showUserProfileUpdated :: ChatReader m => User -> User -> m ()
+showUserProfileUpdated = printToView .: userProfileUpdated
+
+showContactUpdated :: ChatReader m => Contact -> Contact -> m ()
+showContactUpdated = printToView .: contactUpdated
+
+showMessageError :: ChatReader m => Text -> Text -> m ()
+showMessageError = printToView .: messageError
+
+invitation :: SMPQueueInfo -> [StyledString]
+invitation qInfo =
+  [ "pass this invitation to your contact (via another channel): ",
+    "",
+    (plain . serializeSmpQueueInfo) qInfo,
+    "",
+    "and ask them to connect: " <> highlight' "/c <invitation_above>"
+  ]
+
+contactDeleted :: ContactName -> [StyledString]
+contactDeleted c = [ttyContact c <> ": contact is deleted"]
+
+contactGroups :: ContactName -> [GroupName] -> [StyledString]
+contactGroups c gNames = [ttyContact c <> ": contact cannot be deleted, it is a member of the group(s) " <> ttyGroups gNames]
+  where
+    ttyGroups :: [GroupName] -> StyledString
+    ttyGroups [] = ""
+    ttyGroups [g] = ttyGroup g
+    ttyGroups (g : gs) = ttyGroup g <> ", " <> ttyGroups gs
+
+contactConnected :: Contact -> [StyledString]
+contactConnected ct = [ttyFullContact ct <> ": contact is connected"]
+
+contactDisconnected :: ContactName -> [StyledString]
+contactDisconnected c = [ttyContact c <> ": disconnected from server (messages will be queued)"]
+
+contactAnotherClient :: ContactName -> [StyledString]
+contactAnotherClient c = [ttyContact c <> ": contact is connected to another client"]
+
+contactSubscribed :: ContactName -> [StyledString]
+contactSubscribed c = [ttyContact c <> ": connected to server"]
+
+contactSubError :: ContactName -> ChatError -> [StyledString]
+contactSubError c e = [ttyContact c <> ": contact error " <> sShow e]
+
+groupSubscribed :: GroupName -> [StyledString]
+groupSubscribed g = [ttyGroup g <> ": connected to server(s)"]
+
+groupEmpty :: GroupName -> [StyledString]
+groupEmpty g = [ttyGroup g <> ": group is empty"]
+
+groupRemoved :: GroupName -> [StyledString]
+groupRemoved g = [ttyGroup g <> ": you are no longer a member or group deleted"]
+
+memberSubError :: GroupName -> ContactName -> ChatError -> [StyledString]
+memberSubError g c e = [ttyGroup g <> " member " <> ttyContact c <> " error: " <> sShow e]
+
+groupCreated :: Group -> [StyledString]
+groupCreated g@Group {localDisplayName} =
+  [ "group " <> ttyFullGroup g <> " is created",
+    "use " <> highlight ("/a " <> localDisplayName <> " <name>") <> " to add members"
+  ]
+
+groupDeletedUser :: GroupName -> [StyledString]
+groupDeletedUser g = groupDeleted_ g Nothing
+
+groupDeleted :: GroupName -> GroupMember -> [StyledString]
+groupDeleted g m = groupDeleted_ g (Just m) <> ["use " <> highlight ("/d #" <> g) <> " to delete the local copy of the group"]
+
+groupDeleted_ :: GroupName -> Maybe GroupMember -> [StyledString]
+groupDeleted_ g m = [ttyGroup g <> ": " <> memberOrUser m <> " deleted the group"]
+
+sentGroupInvitation :: GroupName -> ContactName -> [StyledString]
+sentGroupInvitation g c = ["invitation to join the group " <> ttyGroup g <> " sent to " <> ttyContact c]
+
+receivedGroupInvitation :: Group -> ContactName -> GroupMemberRole -> [StyledString]
+receivedGroupInvitation g@Group {localDisplayName} c role =
+  [ ttyFullGroup g <> ": " <> ttyContact c <> " invites you to join the group as " <> plain (serializeMemberRole role),
+    "use " <> highlight ("/j " <> localDisplayName) <> " to accept"
+  ]
+
+joinedGroupMember :: GroupName -> GroupMember -> [StyledString]
+joinedGroupMember g m = [ttyGroup g <> ": " <> ttyMember m <> " joined the group "]
+
+userJoinedGroup :: GroupName -> [StyledString]
+userJoinedGroup g = [ttyGroup g <> ": you joined the group"]
+
+joinedGroupMemberConnecting :: GroupName -> GroupMember -> GroupMember -> [StyledString]
+joinedGroupMemberConnecting g host m = [ttyGroup g <> ": " <> ttyMember host <> " added " <> ttyFullMember m <> " to the group (connecting...)"]
+
+connectedToGroupMember :: GroupName -> GroupMember -> [StyledString]
+connectedToGroupMember g m = [ttyGroup g <> ": " <> connectedMember m <> " is connected"]
+
+deletedMember :: GroupName -> Maybe GroupMember -> Maybe GroupMember -> [StyledString]
+deletedMember g by m = [ttyGroup g <> ": " <> memberOrUser by <> " removed " <> memberOrUser m <> " from the group"]
+
+deletedMemberUser :: GroupName -> GroupMember -> [StyledString]
+deletedMemberUser g by = deletedMember g (Just by) Nothing <> groupPreserved g
+
+leftMemberUser :: GroupName -> [StyledString]
+leftMemberUser g = leftMember_ g Nothing <> groupPreserved g
+
+leftMember :: GroupName -> GroupMember -> [StyledString]
+leftMember g m = leftMember_ g (Just m)
+
+leftMember_ :: GroupName -> Maybe GroupMember -> [StyledString]
+leftMember_ g m = [ttyGroup g <> ": " <> memberOrUser m <> " left the group"]
+
+groupPreserved :: GroupName -> [StyledString]
+groupPreserved g = ["use " <> highlight ("/d #" <> g) <> " to delete the group"]
+
+memberOrUser :: Maybe GroupMember -> StyledString
+memberOrUser = maybe "you" ttyMember
+
+connectedMember :: GroupMember -> StyledString
+connectedMember m = case memberCategory m of
+  GCPreMember -> "member " <> ttyFullMember m
+  GCPostMember -> "new member " <> ttyMember m -- without fullName as as it was shown in joinedGroupMemberConnecting
+  _ -> "member " <> ttyMember m -- these case is not used
+
+groupMembers :: Group -> [StyledString]
+groupMembers Group {membership, members} = map groupMember . filter (not . removedOrLeft) $ membership : members
+  where
+    removedOrLeft m = let s = memberStatus m in s == GSMemRemoved || s == GSMemLeft
+    groupMember m = ttyFullMember m <> ": " <> role m <> ", " <> category m <> status m
+    role = plain . serializeMemberRole . memberRole
+    category m = case memberCategory m of
+      GCUserMember -> "you, "
+      GCInviteeMember -> "invited, "
+      GCHostMember -> "host, "
+      _ -> ""
+    status m = case memberStatus m of
+      GSMemRemoved -> "removed"
+      GSMemLeft -> "left"
+      GSMemInvited -> "not yet joined"
+      GSMemConnected -> "connected"
+      GSMemComplete -> "connected"
+      GSMemCreator -> "created group"
+      _ -> ""
+
+contactsMerged :: Contact -> Contact -> [StyledString]
+contactsMerged _to@Contact {localDisplayName = c1} _from@Contact {localDisplayName = c2} =
+  [ "contact " <> ttyContact c2 <> " is merged into " <> ttyContact c1,
+    "use " <> ttyToContact c1 <> highlight' "<message>" <> " to send messages"
+  ]
+
+userProfile :: Profile -> [StyledString]
+userProfile Profile {displayName, fullName} =
+  [ "user profile: " <> ttyFullName displayName fullName,
+    "use " <> highlight' "/p <display name> [<full name>]" <> " to change it",
+    "(the updated profile will be sent to all your contacts)"
+  ]
+
+userProfileUpdated :: User -> User -> [StyledString]
+userProfileUpdated
+  User {localDisplayName = n, profile = Profile {fullName}}
+  User {localDisplayName = n', profile = Profile {fullName = fullName'}}
+    | n == n' && fullName == fullName' = []
+    | n == n' = ["user full name " <> (if T.null fullName' || fullName' == n' then "removed" else "changed to " <> plain fullName') <> notified]
+    | otherwise = ["user profile is changed to " <> ttyFullName n' fullName' <> notified]
+    where
+      notified = " (your contacts are notified)"
+
+contactUpdated :: Contact -> Contact -> [StyledString]
+contactUpdated
+  Contact {localDisplayName = n, profile = Profile {fullName}}
+  Contact {localDisplayName = n', profile = Profile {fullName = fullName'}}
+    | n == n' && fullName == fullName' = []
+    | n == n' = ["contact " <> ttyContact n <> fullNameUpdate]
+    | otherwise =
+      [ "contact " <> ttyContact n <> " changed to " <> ttyFullName n' fullName',
+        "use " <> ttyToContact n' <> highlight' "<message>" <> " to send messages"
+      ]
+    where
+      fullNameUpdate = if T.null fullName' || fullName' == n' then " removed full name" else " updated full name: " <> plain fullName'
+
+messageError :: Text -> Text -> [StyledString]
+messageError prefix err = [plain prefix <> ": " <> plain err]
+
+receivedMessage :: StyledString -> UTCTime -> [StyledString] -> MsgIntegrity -> IO [StyledString]
+receivedMessage from utcTime msg mOk = do
+  t <- formatUTCTime <$> getCurrentTimeZone <*> getZonedTime
+  pure $ prependFirst (t <> " " <> from) msg ++ showIntegrity mOk
+  where
+    formatUTCTime :: TimeZone -> ZonedTime -> StyledString
+    formatUTCTime localTz currentTime =
+      let localTime = utcToLocalTime localTz utcTime
+          format =
+            if (localDay localTime < localDay (zonedTimeToLocalTime currentTime))
+              && (timeOfDayToTime (localTimeOfDay localTime) > (6 * 60 * 60 :: DiffTime))
+              then "%m-%d" -- if message is from yesterday or before and 6 hours has passed since midnight
+              else "%H:%M"
+       in styleTime $ formatTime defaultTimeLocale format localTime
+    showIntegrity :: MsgIntegrity -> [StyledString]
+    showIntegrity MsgOk = []
+    showIntegrity (MsgError err) = msgError $ case err of
+      MsgSkipped fromId toId ->
+        "skipped message ID " <> show fromId
+          <> if fromId == toId then "" else ".." <> show toId
+      MsgBadId msgId -> "unexpected message ID " <> show msgId
+      MsgBadHash -> "incorrect message hash"
+      MsgDuplicate -> "duplicate message ID"
+    msgError :: String -> [StyledString]
+    msgError s = [styled (Colored Red) s]
+
+sentMessage :: StyledString -> ByteString -> IO [StyledString]
+sentMessage to msg = sendWithTime_ to . msgPlain $ safeDecodeUtf8 msg
+
+sentFileInvitation :: StyledString -> FilePath -> IO [StyledString]
+sentFileInvitation to f = sendWithTime_ ("/f " <> to) [ttyFilePath f]
+
+sendWithTime_ :: StyledString -> [StyledString] -> IO [StyledString]
+sendWithTime_ to styledMsg = do
+  time <- formatTime defaultTimeLocale "%H:%M" <$> getZonedTime
+  pure $ prependFirst (styleTime time <> " " <> to) styledMsg
+
+prependFirst :: StyledString -> [StyledString] -> [StyledString]
+prependFirst s [] = [s]
+prependFirst s (s' : ss) = (s <> s') : ss
+
+msgPlain :: Text -> [StyledString]
+msgPlain = map styleMarkdownText . T.lines
+
+sentFileInfo :: Int64 -> [StyledString]
+sentFileInfo fileId =
+  ["use " <> highlight ("/fc " <> show fileId) <> " to cancel sending"]
+
+sndFileStart :: SndFileTransfer -> [StyledString]
+sndFileStart = sendingFile_ "started"
+
+sndFileComplete :: SndFileTransfer -> [StyledString]
+sndFileComplete = sendingFile_ "completed"
+
+sndFileCancelled :: SndFileTransfer -> [StyledString]
+sndFileCancelled = sendingFile_ "cancelled"
+
+sndGroupFileCancelled :: [SndFileTransfer] -> [StyledString]
+sndGroupFileCancelled fts =
+  case filter (\SndFileTransfer {fileStatus = s} -> s /= FSCancelled && s /= FSComplete) fts of
+    [] -> ["sending file can't be cancelled"]
+    ts@(ft : _) -> ["cancelled sending " <> sndFile ft <> " to " <> listMembers ts]
+
+sendingFile_ :: StyledString -> SndFileTransfer -> [StyledString]
+sendingFile_ status ft@SndFileTransfer {recipientDisplayName = c} =
+  [status <> " sending " <> sndFile ft <> " to " <> ttyContact c]
+
+sndFileRcvCancelled :: SndFileTransfer -> [StyledString]
+sndFileRcvCancelled ft@SndFileTransfer {recipientDisplayName = c} =
+  [ttyContact c <> " cancelled receiving " <> sndFile ft]
+
+sndFile :: SndFileTransfer -> StyledString
+sndFile SndFileTransfer {fileId, fileName} = fileTransfer fileId fileName
+
+receivedFileInvitation :: RcvFileTransfer -> [StyledString]
+receivedFileInvitation RcvFileTransfer {fileId, fileInvitation = FileInvitation {fileName, fileSize}} =
+  [ "sends file " <> ttyFilePath fileName <> " (" <> humanReadableSize fileSize <> " / " <> sShow fileSize <> " bytes)",
+    "use " <> highlight ("/fr " <> show fileId <> " [<dir>/ | <path>]") <> " to receive it"
+  ]
+
+humanReadableSize :: Integer -> StyledString
+humanReadableSize size
+  | size < kB = sShow size <> " bytes"
+  | size < mB = hrSize kB "KiB"
+  | size < gB = hrSize mB "MiB"
+  | otherwise = hrSize gB "GiB"
+  where
+    hrSize sB name = plain $ unwords [showFFloat (Just 1) (fromIntegral size / (fromIntegral sB :: Double)) "", name]
+    kB = 1024
+    mB = kB * 1024
+    gB = mB * 1024
+
+rcvFileAccepted :: RcvFileTransfer -> FilePath -> [StyledString]
+rcvFileAccepted RcvFileTransfer {fileId, senderDisplayName = c} filePath =
+  ["saving file " <> sShow fileId <> " from " <> ttyContact c <> " to " <> plain filePath]
+
+rcvFileStart :: RcvFileTransfer -> [StyledString]
+rcvFileStart = receivingFile_ "started"
+
+rcvFileComplete :: RcvFileTransfer -> [StyledString]
+rcvFileComplete = receivingFile_ "completed"
+
+rcvFileCancelled :: RcvFileTransfer -> [StyledString]
+rcvFileCancelled = receivingFile_ "cancelled"
+
+receivingFile_ :: StyledString -> RcvFileTransfer -> [StyledString]
+receivingFile_ status ft@RcvFileTransfer {senderDisplayName = c} =
+  [status <> " receiving " <> rcvFile ft <> " from " <> ttyContact c]
+
+rcvFileSndCancelled :: RcvFileTransfer -> [StyledString]
+rcvFileSndCancelled ft@RcvFileTransfer {senderDisplayName = c} =
+  [ttyContact c <> " cancelled sending " <> rcvFile ft]
+
+rcvFile :: RcvFileTransfer -> StyledString
+rcvFile RcvFileTransfer {fileId, fileInvitation = FileInvitation {fileName}} = fileTransfer fileId fileName
+
+fileTransfer :: Int64 -> String -> StyledString
+fileTransfer fileId fileName = "file " <> sShow fileId <> " (" <> ttyFilePath fileName <> ")"
+
+fileTransferStatus :: (FileTransfer, [Integer]) -> [StyledString]
+fileTransferStatus (FTSnd [ft@SndFileTransfer {fileStatus, fileSize, chunkSize}], chunksNum) =
+  ["sending " <> sndFile ft <> " " <> sndStatus]
+  where
+    sndStatus = case fileStatus of
+      FSNew -> "not accepted yet"
+      FSAccepted -> "just started"
+      FSConnected -> "progress " <> fileProgress chunksNum chunkSize fileSize
+      FSComplete -> "complete"
+      FSCancelled -> "cancelled"
+fileTransferStatus (FTSnd [], _) = ["no file transfers (empty group)"]
+fileTransferStatus (FTSnd fts@(ft : _), chunksNum) =
+  case concatMap membersTransferStatus $ groupBy ((==) `on` fs) $ sortOn fs fts of
+    [membersStatus] -> ["sending " <> sndFile ft <> " " <> membersStatus]
+    membersStatuses -> ("sending " <> sndFile ft <> ": ") : map ("  " <>) membersStatuses
+  where
+    fs = fileStatus :: SndFileTransfer -> FileStatus
+    membersTransferStatus [] = []
+    membersTransferStatus ts@(SndFileTransfer {fileStatus, fileSize, chunkSize} : _) = [sndStatus <> ": " <> listMembers ts]
+      where
+        sndStatus = case fileStatus of
+          FSNew -> "not accepted"
+          FSAccepted -> "just started"
+          FSConnected -> "in progress (" <> sShow (sum chunksNum * chunkSize * 100 `div` (toInteger (length chunksNum) * fileSize)) <> "%)"
+          FSComplete -> "complete"
+          FSCancelled -> "cancelled"
+fileTransferStatus (FTRcv ft@RcvFileTransfer {fileId, fileInvitation = FileInvitation {fileSize}, fileStatus, chunkSize}, chunksNum) =
+  ["receiving " <> rcvFile ft <> " " <> rcvStatus]
+  where
+    rcvStatus = case fileStatus of
+      RFSNew -> "not accepted yet, use " <> highlight ("/fr " <> show fileId) <> " to receive file"
+      RFSAccepted _ -> "just started"
+      RFSConnected _ -> "progress " <> fileProgress chunksNum chunkSize fileSize
+      RFSComplete RcvFileInfo {filePath} -> "complete, path: " <> plain filePath
+      RFSCancelled RcvFileInfo {filePath} -> "cancelled, received part path: " <> plain filePath
+
+listMembers :: [SndFileTransfer] -> StyledString
+listMembers = mconcat . intersperse ", " . map (ttyContact . recipientDisplayName)
+
+fileProgress :: [Integer] -> Integer -> Integer -> StyledString
+fileProgress chunksNum chunkSize fileSize =
+  sShow (sum chunksNum * chunkSize * 100 `div` fileSize) <> "% of " <> humanReadableSize fileSize
+
+sndFileSubError :: SndFileTransfer -> ChatError -> [StyledString]
+sndFileSubError SndFileTransfer {fileId, fileName} e =
+  ["sent file " <> sShow fileId <> " (" <> plain fileName <> ") error: " <> sShow e]
+
+rcvFileSubError :: RcvFileTransfer -> ChatError -> [StyledString]
+rcvFileSubError RcvFileTransfer {fileId, fileInvitation = FileInvitation {fileName}} e =
+  ["received file " <> sShow fileId <> " (" <> plain fileName <> ") error: " <> sShow e]
+
+chatError :: ChatError -> [StyledString]
+chatError = \case
+  ChatError err -> case err of
+    CEGroupDuplicateMember c -> ["contact " <> ttyContact c <> " is already in the group"]
+    CEGroupDuplicateMemberId -> ["cannot add member - duplicate member ID"]
+    CEGroupUserRole -> ["you have insufficient permissions for this group command"]
+    CEGroupContactRole c -> ["contact " <> ttyContact c <> " has insufficient permissions for this group action"]
+    CEGroupNotJoined g -> ["you did not join this group, use " <> highlight ("/join #" <> g)]
+    CEGroupMemberNotActive -> ["you cannot invite other members yet, try later"]
+    CEGroupMemberUserRemoved -> ["you are no longer the member of the group"]
+    CEGroupMemberNotFound c -> ["contact " <> ttyContact c <> " is not a group member"]
+    CEGroupInternal s -> ["chat group bug: " <> plain s]
+    CEFileNotFound f -> ["file not found: " <> plain f]
+    CEFileAlreadyReceiving f -> ["file is already accepted: " <> plain f]
+    CEFileAlreadyExists f -> ["file already exists: " <> plain f]
+    CEFileRead f e -> ["cannot read file " <> plain f, sShow e]
+    CEFileWrite f e -> ["cannot write file " <> plain f, sShow e]
+    CEFileSend fileId e -> ["error sending file " <> sShow fileId <> ": " <> sShow e]
+    CEFileRcvChunk e -> ["error receiving file: " <> plain e]
+    CEFileInternal e -> ["file error: " <> plain e]
+  -- e -> ["chat error: " <> sShow e]
+  ChatErrorStore err -> case err of
+    SEDuplicateName -> ["this display name is already used by user, contact or group"]
+    SEContactNotFound c -> ["no contact " <> ttyContact c]
+    SEContactNotReady c -> ["contact " <> ttyContact c <> " is not active yet"]
+    SEGroupNotFound g -> ["no group " <> ttyGroup g]
+    SEGroupAlreadyJoined -> ["you already joined this group"]
+    SEFileNotFound fileId -> fileNotFound fileId
+    SESndFileNotFound fileId -> fileNotFound fileId
+    SERcvFileNotFound fileId -> fileNotFound fileId
+    e -> ["chat db error: " <> sShow e]
+  ChatErrorAgent e -> ["smp agent error: " <> sShow e]
+  ChatErrorMessage e -> ["chat message error: " <> sShow e]
+  where
+    fileNotFound fileId = ["file " <> sShow fileId <> " not found"]
+
+printToView :: (MonadUnliftIO m, MonadReader ChatController m) => [StyledString] -> m ()
+printToView s = asks chatTerminal >>= liftIO . (`printToTerminal` s)
+
+ttyContact :: ContactName -> StyledString
+ttyContact = styled (Colored Green)
+
+ttyFullContact :: Contact -> StyledString
+ttyFullContact Contact {localDisplayName, profile = Profile {fullName}} =
+  ttyFullName localDisplayName fullName
+
+ttyMember :: GroupMember -> StyledString
+ttyMember GroupMember {localDisplayName} = ttyContact localDisplayName
+
+ttyFullMember :: GroupMember -> StyledString
+ttyFullMember GroupMember {localDisplayName, memberProfile = Profile {fullName}} =
+  ttyFullName localDisplayName fullName
+
+ttyFullName :: ContactName -> Text -> StyledString
+ttyFullName c fullName = ttyContact c <> optFullName c fullName
+
+ttyToContact :: ContactName -> StyledString
+ttyToContact c = styled (Colored Cyan) $ "@" <> c <> " "
+
+ttyFromContact :: ContactName -> StyledString
+ttyFromContact c = styled (Colored Yellow) $ c <> "> "
+
+ttyGroup :: GroupName -> StyledString
+ttyGroup g = styled (Colored Blue) $ "#" <> g
+
+ttyFullGroup :: Group -> StyledString
+ttyFullGroup Group {localDisplayName, groupProfile = GroupProfile {fullName}} =
+  ttyGroup localDisplayName <> optFullName localDisplayName fullName
+
+ttyFromGroup :: GroupName -> ContactName -> StyledString
+ttyFromGroup g c = styled (Colored Yellow) $ "#" <> g <> " " <> c <> "> "
+
+ttyToGroup :: GroupName -> StyledString
+ttyToGroup g = styled (Colored Cyan) $ "#" <> g <> " "
+
+ttyFilePath :: FilePath -> StyledString
+ttyFilePath = plain
+
+optFullName :: ContactName -> Text -> StyledString
+optFullName localDisplayName fullName
+  | T.null fullName || localDisplayName == fullName = ""
+  | otherwise = plain (" (" <> fullName <> ")")
+
+highlight :: StyledFormat a => a -> StyledString
+highlight = styled (Colored Cyan)
+
+highlight' :: String -> StyledString
+highlight' = highlight
+
+styleTime :: String -> StyledString
+styleTime = Styled [SetColor Foreground Vivid Black]
--- a/src/Simplex/Chat/protocol.md
+++ b/src/Simplex/Chat/protocol.md
@@ -0,0 +1,168 @@
+# Chat protocol
+
+## Design constraints
+
+- the transport message has a fixed size (8 or 16kb), but the SMP agent will be updated to support sending messages up to maximum configured size (TBC - 64-256kb) in 8-16Kb blocks.
+- the chat message can have multiple content parts, but it should fit the agent message of the variable size.
+- one of the chat message types should support transmitting large binaries in chunks that could potentially be interleaved with other messages. For example, image preview would fit the message, but the full size image will be transmitted in chunks later - same for large files.
+- using object storage can be effective for large groups, but we will postpone it until content channels are implemented.
+
+## Questions
+
+- should content types be:
+  - limited to MIME-types
+  - separate content types vocabulary
+  - both MIME types and extensions (currently we support MIME (m.) and Simplex (x.) namespaces)
+  - allow additional content types namespaces
+
+## Message syntax
+
+The syntax of the message inside agent MSG:
+
+```abnf
+agentMessageBody = [chatMsgId] SP msgEvent SP [parameters] SP [contentParts [SP msgBodyParts]]
+chatMsgId = 1*DIGIT ; used to refer to previous message;
+                    ; in the group should only be used in messages sent to all members,
+                    ; which is the main reason not to use external agent ID -
+                    ; some messages are sent only to one member
+msgEvent = protocolNamespace 1*("." msgTypeName)
+protocolNamespace = 1*ALPHA ; "x" for all events defined in the protocol
+msgTypeName = 1*ALPHA
+parameters = parameter *("," parameter)
+parameter = 1*(%x21-2B / %x2D-7E) ; exclude control characters, space, comma (%x2C)
+contentParts = contentPart *("," contentPart)
+contentPart = contentTypeNamespace "." contentType ":" contentSize [":" contentHash]
+contentType = "i." <mime-type> / contentTypeNamespace "." 1*("." contentTypeName)
+contentTypeNamespace = 1*ALPHA
+contentTypeName = 1*ALPHA
+contentHash = <base64>
+msgBodyParts = msgBodyPart *(SP msgBodyPart)
+msgEventParents = msgEventParent *msgEventParent ; binary body part for content type "x.dag"
+msgEventParent = memberId refMsgId refMsgHash
+memberId = 8*8(OCTET) ; shared member ID
+refMsgId = 8*8(OCTET) ; sequential message number - external agent message ID
+refMsgHash = 16*16(OCTET) ; SHA256 of agent message body
+```
+
+### Example: messages, updates, groups
+
+```
+"3 x.msg.new c.text x.text:5 hello "
+"4 x.msg.new c.image i.image/jpg:256,i.image/png:4096 abcd abcd "
+"4 x.msg.new c.image x.dag:32,i.image/jpg:8000,i.image/png:16000 binary1"
+"5 x.msg.new c.image,i.image/jpg:150000 i.image/jpg:256 abcd "
+"6 x.msg.file 5,1.1 x.file:60000 abcd "
+"7 x.msg.file 5,1.2 x.file:60000 abcd "
+"8 x.msg.file 5,1.3 x.file:30000 abcd "
+'8 x.msg.update 3 x.text:11,x.dag:16 hello there abcd '
+'9 x.msg.delete 3'
+'10 x.msg.new app/v1 i.text/html:NNN,i.text/css:NNN,c.js:NNN,c.json:NNN ... ... ... {...} '
+'11 x.msg.eval 8 c.json:NNN {...} '
+'12 x.msg.new c.text x.text:16,x.dag:32 hello there @123 abcd '
+' x.grp.mem.inv 23456,123 x.json:NNN {...} '
+' x.grp.mem.acpt 23456 x.text:NNN <invitation> '
+' x.grp.mem.intro 23456,234 x.json:NNN {...} '
+' x.grp.mem.inv 23456,234 x.text:NNN <invitation> '
+' x.grp.mem.req 23456,123 x.json:NNN {...} '
+' x.grp.mem.direct.inv 23456,234 x.text:NNN <invitation>  '
+' x.file name,size x.text:NNN <invitation> '
+```
+
+### Group protocol
+
+#### Add group member
+
+A -> B: invite to group - `MSG: x.grp.inv G_MEM_ID_A,G_MEM_ROLE_A,G_MEM_ID_B,G_MEM_ROLE_B,<invitation> x.json:NNN <group_profile>`
+user B confirms
+B -> A: establish group connection (B: JOIN, A: LET)
+B -> Ag: join group - `in SMP confirmation: x.grp.acpt G_MEM_ID_B`
+A -> group (including B)): announce group member: `MSG: N x.grp.mem.new G_MEM_ID_B,G_MEM_ROLE_B,G_MEM_ID_M,... x.json:NNN <B_profile>`
+
+In the message `x.grp.mem.new` A sends the sorted list of all members to whom A is connected followed by the new member ID, role and profile. The following introductions will be sent about/to all members A "knows about" (includes members introduced to A and members who accepted group invitation but not connected yet), once they are connected, so it can be a bigger list than sent in `x.grp.mem.new`.
+
+All members who received `x.grp.mem.new` from A should check the list of connected members and if any connected members that recipients invited to the group are not in this list, they should introduce them to this new member (the last ID, role and profile in `x.grp.mem.new`). That might lead to double introductions that would provide a stronger consistency of group membership at a cost of extra connection between some members that will be unused.
+
+subsequent messages between A and B are via group connection
+A -> Bg: intro member - `MSG: x.grp.mem.intro G_MEM_ID_M,G_MEM_ROLE_M x.json:NNN <M_profile>`
+B -> Ag: inv for mem - `MSG: x.grp.mem.inv G_MEM_ID_M,<gr_invitation>,<dm_invitation>,<probe>`
+M is an existing member, messages are via group connection
+A -> Mg: fwd inv - `MSG: x.grp.mem.fwd G_MEM_ID_B,<gr_invitation>,<dm_invitation>,<probe>`
+M -> Bg: establish group connection (M: JOIN, B: LET)
+M -> B: establish direct connection (M: JOIN, B: LET)
+M -> Bg: confirm profile and role - `CONF: x.grp.mem.info G_MEM_ID_M,G_MEM_ROLE x.json:NNN <M_profile>`
+B -> Mg: send profile probe - `MSG: x.info.probe <probe>` - it should always be send, even when there is no profile match.
+if M is a known contact (profile match) send probe to M:
+  B -> M (via old DM conn): profile match probe: `MSG: x.info.probe.check <probe_hash>`
+  M -> B (via old DM conn): probe confirm: `MSG: x.info.probe.ok <probe>`
+  link to the same contact
+B -> Ag: connected to M: `MSG: x.grp.mem.con G_MEM_ID_M`
+M -> Ag: connected to M: `MSG: x.grp.mem.con G_MEM_ID_B`
+
+once all members connected
+A -> group: `MSG: N x.grp.mem.con.all G_MEM_ID_B`
+
+#### Send group message
+
+Example:
+
+`MSG: N x.msg.new c.text x.text:5 hello `
+
+#### Group member statuses
+
+1. Me
+  - invited
+  - accepted
+  - connected to member who invited me
+  - announced to group
+    - x.grp.mem.new to group
+  - confirmed as connected to group
+    - this happens once member who invited me sends x.grp.mem.ok to group
+1. Member that I invited:
+  - invited
+  - accepted
+  - connected to me
+  - announced to group
+    - this happens after x.grp.mem.new but before introductions are sent.
+    This message is used to determine which members should be additionally introduced if they were announced before (or in "parallel").
+  - confirmed as connected to group
+2. Member who invited me
+  - invited_me
+  - connected to me
+    - I won't know whether this member was announced or confirmed to group - with the correctly functioning clients it must have happened.
+3. Prior member introduced to me after I joined (x.grp.mem.intro)
+  - introduced
+  - sent invitation
+  - connected
+  - connected directly (or confirmed existing contact)
+4. Member I was introduced to after that member joined (via x.grp.mem.fwd)
+  - announced via x.grp.mem.new
+  - received invitation
+  - connected
+  - connected directly (or confirmed existing contact)
+
+#### Introductions
+
+1. Introductions I sent to members I invited
+  - the time of joining is determined by the time of creating the connection and sending the x.grp.mem.new message to the group.
+  - introductions of the members who were connected before the new member should be sent - how to determine which members were connected before?
+    - use time stamp of creating connection, possibly in the member record - not very reliable, as time can change.
+    - use record ID - requires changing the schema, as currently members are added as invited, not as connected. So possibly invited members should be tracked in a separate table, and all members should still be tracked together to ensure that memberId is unique.
+    - record ID is also not 100% sufficient, as there can be forks in message history and I may need to intro the member I invited to the member that was announced after my member in my chronology, but in another graph branch.
+    - some other mechanism that allows to establish who should be connected to whom and whether I should introduce or another member (in case of forks - although maybe we both can introduce and eventually two group connections will be created between these members and they would just ignore the first one - although in cases of multiple branches in the graph it can be N connections).
+    - introductions/member connection statuses:
+      - created introduction
+      - sent to the member I invited
+      - received the invitation from the member I invited
+      - forwarded this invitation to previously connected member
+      - received confirmation from member I invited
+      - received confirmation from member I forwarded to
+      - completed introduction and recorded that these members are now fully connected to each other
+2. Introductions I received from the member who invited me
+  - if somebody else sends such introduction - this is an error (can be logged or ignored)
+  - duplicate memberId is an error (e.g. it is a member that was announced in the group broadcast - I should be introduced to this member, and not the other way around? Although it can happen in case of fork and maybe I should establish the connection anyway).
+  - member connection status in this case is just a member status from part 3, so maybe no need to track invitations separately and just put SMPQueueInfo on member record.
+3. Invitation forwarded to me by any prior member
+  - any admin/owner can add members, so they can forward their queue invitations - I should just check forwarding member permission
+  - duplicate memberId is an error
+  - unannounced memberId is an error - I should have seen member announcement prior to receiving this forwarded invitation. Fork would not happen here as it is the same member that announces and forwards the invitation, so they should be in order.
+  - member connection status in this case is just a member status from part 4, so maybe no need to track invitations separately and just put SMPQueueInfo on member record.
--- a/stack.yaml
+++ b/stack.yaml
@@ -17,7 +17,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-16.17
+resolver: lts-17.12

 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -40,12 +40,10 @@ extra-deps:
  - simple-logger-0.1.0@sha256:be8ede4bd251a9cac776533bae7fb643369ebd826eb948a9a18df1a8dd252ff8,1079
  - sqlite-simple-0.4.18.0@sha256:3ceea56375c0a3590c814e411a4eb86943f8d31b93b110ca159c90689b6b39e5,3002
  - terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977
+  - simplexmq-0.4.1@sha256:3a1bc40d85e4e398458e5b9b79757e0af4fe27b8ef44eb3157f7f1e07412a8e8,7640
  # - ../simplexmq
-  - github: simplex-chat/simplexmq
-    commit: fa5a8cb5cd9aed374906c92e641968f8e5883ca5
-# - network-run-0.2.4@sha256:7dbb06def522dab413bce4a46af476820bffdff2071974736b06f52f4ab57c96,885
-# - git: https://github.com/commercialhaskell/stack.git
-#   commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
+  # - github: simplex-chat/simplexmq
+  #   commit: 35e6593581e68f7b444e0f8f4fb6a2e2cc59a5ea
 #
 # extra-deps: []

--- a/tests/ChatClient.hs
+++ b/tests/ChatClient.hs
@@ -0,0 +1,199 @@
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedLists #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeApplications #-}
+
+module ChatClient where
+
+import Control.Concurrent (ThreadId, forkIOWithUnmask, killThread)
+import Control.Concurrent.Async
+import Control.Concurrent.STM
+import Control.Exception (bracket, bracket_)
+import Control.Monad.Except
+import Data.List (dropWhileEnd)
+import Network.Socket
+import Simplex.Chat
+import Simplex.Chat.Controller (ChatConfig (..), ChatController (..))
+import Simplex.Chat.Options
+import Simplex.Chat.Store
+import Simplex.Chat.Types (Profile)
+import Simplex.Messaging.Agent.Env.SQLite
+import Simplex.Messaging.Agent.RetryInterval
+import Simplex.Messaging.Server (runSMPServerBlocking)
+import Simplex.Messaging.Server.Env.STM
+import Simplex.Messaging.Transport
+import System.Directory (createDirectoryIfMissing, removeDirectoryRecursive)
+import qualified System.Terminal as C
+import System.Terminal.Internal (VirtualTerminal (..), VirtualTerminalSettings (..), withVirtualTerminal)
+import System.Timeout (timeout)
+
+testDBPrefix :: FilePath
+testDBPrefix = "tests/tmp/test"
+
+serverPort :: ServiceName
+serverPort = "5000"
+
+opts :: ChatOpts
+opts =
+  ChatOpts
+    { dbFile = undefined,
+      smpServers = ["localhost:5000"]
+    }
+
+termSettings :: VirtualTerminalSettings
+termSettings =
+  VirtualTerminalSettings
+    { virtualType = "xterm",
+      virtualWindowSize = pure C.Size {height = 24, width = 1000},
+      virtualEvent = retry,
+      virtualInterrupt = retry
+    }
+
+data TestCC = TestCC
+  { chatController :: ChatController,
+    virtualTerminal :: VirtualTerminal,
+    chatAsync :: Async (),
+    termAsync :: Async (),
+    termQ :: TQueue String
+  }
+
+aCfg :: AgentConfig
+aCfg = agentConfig defaultChatConfig
+
+cfg :: ChatConfig
+cfg =
+  defaultChatConfig
+    { agentConfig =
+        aCfg {retryInterval = (retryInterval aCfg) {initialInterval = 50000}}
+    }
+
+virtualSimplexChat :: FilePath -> Profile -> IO TestCC
+virtualSimplexChat dbFile profile = do
+  st <- createStore (dbFile <> ".chat.db") 1
+  void . runExceptT $ createUser st profile True
+  t <- withVirtualTerminal termSettings pure
+  cc <- newChatController cfg opts {dbFile} t . const $ pure () -- no notifications
+  chatAsync <- async $ runSimplexChat cc
+  termQ <- newTQueueIO
+  termAsync <- async $ readTerminalOutput t termQ
+  pure TestCC {chatController = cc, virtualTerminal = t, chatAsync, termAsync, termQ}
+
+readTerminalOutput :: VirtualTerminal -> TQueue String -> IO ()
+readTerminalOutput t termQ = do
+  let w = virtualWindow t
+  winVar <- atomically $ newTVar . init =<< readTVar w
+  forever . atomically $ do
+    win <- readTVar winVar
+    win' <- init <$> readTVar w
+    if win' == win
+      then retry
+      else do
+        let diff = getDiff win' win
+        forM_ diff $ writeTQueue termQ
+        writeTVar winVar win'
+  where
+    getDiff :: [String] -> [String] -> [String]
+    getDiff win win' = getDiff_ 1 (length win) win win'
+    getDiff_ :: Int -> Int -> [String] -> [String] -> [String]
+    getDiff_ n len win' win =
+      let diff = drop (len - n) win'
+       in if drop n win <> diff == win'
+            then map (dropWhileEnd (== ' ')) diff
+            else getDiff_ (n + 1) len win' win
+
+testChatN :: [Profile] -> ([TestCC] -> IO ()) -> IO ()
+testChatN ps test =
+  bracket_
+    (createDirectoryIfMissing False "tests/tmp")
+    (removeDirectoryRecursive "tests/tmp")
+    $ do
+      let envs = zip ps $ map ((testDBPrefix <>) . show) [(1 :: Int) ..]
+      tcs <- getTestCCs envs []
+      test tcs
+  where
+    getTestCCs [] tcs = pure tcs
+    getTestCCs ((p, db) : envs') tcs = (:) <$> virtualSimplexChat db p <*> getTestCCs envs' tcs
+
+testChat2 :: Profile -> Profile -> (TestCC -> TestCC -> IO ()) -> IO ()
+testChat2 p1 p2 test = testChatN [p1, p2] test_
+  where
+    test_ :: [TestCC] -> IO ()
+    test_ [tc1, tc2] = test tc1 tc2
+    test_ _ = error "expected 2 chat clients"
+
+testChat3 :: Profile -> Profile -> Profile -> (TestCC -> TestCC -> TestCC -> IO ()) -> IO ()
+testChat3 p1 p2 p3 test = testChatN [p1, p2, p3] test_
+  where
+    test_ :: [TestCC] -> IO ()
+    test_ [tc1, tc2, tc3] = test tc1 tc2 tc3
+    test_ _ = error "expected 3 chat clients"
+
+testChat4 :: Profile -> Profile -> Profile -> Profile -> (TestCC -> TestCC -> TestCC -> TestCC -> IO ()) -> IO ()
+testChat4 p1 p2 p3 p4 test = testChatN [p1, p2, p3, p4] test_
+  where
+    test_ :: [TestCC] -> IO ()
+    test_ [tc1, tc2, tc3, tc4] = test tc1 tc2 tc3 tc4
+    test_ _ = error "expected 4 chat clients"
+
+concurrentlyN_ :: [IO a] -> IO ()
+concurrentlyN_ = mapConcurrently_ id
+
+serverCfg :: ServerConfig
+serverCfg =
+  ServerConfig
+    { transports = [(serverPort, transport @TCP)],
+      tbqSize = 1,
+      msgQueueQuota = 4,
+      queueIdBytes = 12,
+      msgIdBytes = 6,
+      storeLog = Nothing,
+      blockSize = 4096,
+      serverPrivateKey =
+        -- full RSA private key (only for tests)
+        "MIIFIwIBAAKCAQEArZyrri/NAwt5buvYjwu+B/MQeJUszDBpRgVqNddlI9kNwDXu\
+        \kaJ8chEhrtaUgXeSWGooWwqjXEUQE6RVbCC6QVo9VEBSP4xFwVVd9Fj7OsgfcXXh\
+        \AqWxfctDcBZQ5jTUiJpdBc+Vz2ZkumVNl0W+j9kWm9nfkMLQj8c0cVSDxz4OKpZb\
+        \qFuj0uzHkis7e7wsrKSKWLPg3M5ZXPZM1m9qn7SfJzDRDfJifamxWI7uz9XK2+Dp\
+        \NkUQlGQgFJEv1cKN88JAwIqZ1s+TAQMQiB+4QZ2aNfSqGEzRJN7FMCKRK7pM0A9A\
+        \PCnijyuImvKFxTdk8Bx1q+XNJzsY6fBrLWJZ+QKBgQCySG4tzlcEm+tOVWRcwrWh\
+        \6zsczGZp9mbf9c8itRx6dlldSYuDG1qnddL70wuAZF2AgS1JZgvcRZECoZRoWP5q\
+        \Kq2wvpTIYjFPpC39lxgUoA/DXKVKZZdan+gwaVPAPT54my1CS32VrOiAY4gVJ3LJ\
+        \Mn1/FqZXUFQA326pau3loQKCAQEAoljmJMp88EZoy3HlHUbOjl5UEhzzVsU1TnQi\
+        \QmPm+aWRe2qelhjW4aTvSVE5mAUJsN6UWTeMf4uvM69Z9I5pfw2pEm8x4+GxRibY\
+        \iiwF2QNaLxxmzEHm1zQQPTgb39o8mgklhzFPill0JsnL3f6IkVwjFJofWSmpqEGs\
+        \dFSMRSXUTVXh1p/o7QZrhpwO/475iWKVS7o48N/0Xp513re3aXw+DRNuVnFEaBIe\
+        \TLvWM9Czn16ndAu1HYiTBuMvtRbAWnGZxU8ewzF4wlWK5tdIL5PTJDd1VhZJAKtB\
+        \npDvJpwxzKmjAhcTmjx0ckMIWtdVaOVm/2gWCXDty2FEdg7koQKBgQDOUUguJ/i7\
+        \q0jldWYRnVkotKnpInPdcEaodrehfOqYEHnvro9xlS6OeAS4Vz5AdH45zQ/4J3bV\
+        \2cH66tNr18ebM9nL//t5G69i89R9W7szyUxCI3LmAIdi3oSEbmz5GQBaw4l6h9Wi\
+        \n4FmFQaAXZrjQfO2qJcAHvWRsMp2pmqAGwKBgQDXaza0DRsKWywWznsHcmHa0cx8\
+        \I4jxqGaQmLO7wBJRP1NSFrywy1QfYrVX9CTLBK4V3F0PCgZ01Qv94751CzN43TgF\
+        \ebd/O9r5NjNTnOXzdWqETbCffLGd6kLgCMwPQWpM9ySVjXHWCGZsRAnF2F6M1O32\
+        \43StIifvwJQFqSM3ewKBgCaW6y7sRY90Ua7283RErezd9EyT22BWlDlACrPu3FNC\
+        \LtBf1j43uxBWBQrMLsHe2GtTV0xt9m0MfwZsm2gSsXcm4Xi4DJgfN+Z7rIlyy9UY\
+        \PCDSdZiU1qSr+NrffDrXlfiAM1cUmCdUX7eKjp/ltkUHNaOGfSn5Pdr3MkAiD/Hf\
+        \AoGBAKIdKCuOwuYlwjS9J+IRGuSSM4o+OxQdwGmcJDTCpyWb5dEk68e7xKIna3zf\
+        \jc+H+QdMXv1nkRK9bZgYheXczsXaNZUSTwpxaEldzVD3hNvsXSgJRy9fqHwA4PBq\
+        \vqiBHoO3RNbqg+2rmTMfDuXreME3S955ZiPZm4Z+T8Hj52mPAoGAQm5QH/gLFtY5\
+        \+znqU/0G8V6BKISCQMxbbmTQVcTgGySrP2gVd+e4MWvUttaZykhWqs8rpr7mgpIY\
+        \hul7Swx0SHFN3WpXu8uj+B6MLpRcCbDHO65qU4kQLs+IaXXsuuTjMvJ5LwjkZVrQ\
+        \TmKzSAw7iVWwEUZR/PeiEKazqrpp9VU="
+    }
+
+withSmpServer :: IO a -> IO a
+withSmpServer = serverBracket (`runSMPServerBlocking` serverCfg) (pure ()) . const
+
+serverBracket :: (TMVar Bool -> IO ()) -> IO () -> (ThreadId -> IO a) -> IO a
+serverBracket process afterProcess f = do
+  started <- newEmptyTMVarIO
+  bracket
+    (forkIOWithUnmask ($ process started))
+    (\t -> killThread t >> afterProcess >> waitFor started "stop")
+    (\t -> waitFor started "start" >> f t)
+  where
+    waitFor started s =
+      5000000 `timeout` atomically (takeTMVar started) >>= \case
+        Nothing -> error $ "server did not " <> s
+        _ -> pure ()
--- a/tests/ChatTests.hs
+++ b/tests/ChatTests.hs
@@ -0,0 +1,643 @@
+{-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE PostfixOperators #-}
+
+module ChatTests where
+
+import ChatClient
+import Control.Concurrent.Async (concurrently_)
+import Control.Concurrent.STM
+import qualified Data.ByteString as B
+import Data.Char (isDigit)
+import qualified Data.Text as T
+import Simplex.Chat.Controller
+import Simplex.Chat.Types (Profile (..), User (..))
+import Simplex.Chat.Util (unlessM)
+import System.Directory (doesFileExist)
+import System.Timeout (timeout)
+import Test.Hspec
+
+aliceProfile :: Profile
+aliceProfile = Profile {displayName = "alice", fullName = "Alice"}
+
+bobProfile :: Profile
+bobProfile = Profile {displayName = "bob", fullName = "Bob"}
+
+cathProfile :: Profile
+cathProfile = Profile {displayName = "cath", fullName = "Catherine"}
+
+danProfile :: Profile
+danProfile = Profile {displayName = "dan", fullName = "Daniel"}
+
+chatTests :: Spec
+chatTests = do
+  describe "direct messages" $
+    it "add contact and send/receive message" testAddContact
+  describe "chat groups" $ do
+    it "add contacts, create group and send/receive messages" testGroup
+    it "create and join group with 4 members" testGroup2
+    it "create and delete group" testGroupDelete
+    it "remove contact from group and add again" testGroupRemoveAdd
+  describe "user profiles" $
+    it "update user profiles and notify contacts" testUpdateProfile
+  describe "sending and receiving files" $ do
+    it "send and receive file" testFileTransfer
+    it "sender cancelled file transfer" testFileSndCancel
+    it "recipient cancelled file transfer" testFileRcvCancel
+    it "send and receive file to group" testGroupFileTransfer
+
+testAddContact :: IO ()
+testAddContact =
+  testChat2 aliceProfile bobProfile $
+    \alice bob -> do
+      alice ##> "/c"
+      inv <- getInvitation alice
+      bob ##> ("/c " <> inv)
+      concurrently_
+        (bob <## "alice (Alice): contact is connected")
+        (alice <## "bob (Bob): contact is connected")
+      alice #> "@bob hello"
+      bob <# "alice> hello"
+      bob #> "@alice hi"
+      alice <# "bob> hi"
+      -- test adding the same contact one more time - local name will be different
+      alice ##> "/c"
+      inv' <- getInvitation alice
+      bob ##> ("/c " <> inv')
+      concurrently_
+        (bob <## "alice_1 (Alice): contact is connected")
+        (alice <## "bob_1 (Bob): contact is connected")
+      alice #> "@bob_1 hello"
+      bob <# "alice_1> hello"
+      bob #> "@alice_1 hi"
+      alice <# "bob_1> hi"
+      -- test deleting contact
+      alice ##> "/d bob_1"
+      alice <## "bob_1: contact is deleted"
+      alice #> "@bob_1 hey"
+      alice <## "no contact bob_1"
+
+testGroup :: IO ()
+testGroup =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      connectUsers alice bob
+      connectUsers alice cath
+      alice ##> "/g team"
+      alice <## "group #team is created"
+      alice <## "use /a team <name> to add members"
+      alice ##> "/a team bob"
+      concurrentlyN_
+        [ alice <## "invitation to join the group #team sent to bob",
+          do
+            bob <## "#team: alice invites you to join the group as admin"
+            bob <## "use /j team to accept"
+        ]
+      bob ##> "/j team"
+      concurrently_
+        (alice <## "#team: bob joined the group")
+        (bob <## "#team: you joined the group")
+      alice ##> "/a team cath"
+      concurrentlyN_
+        [ alice <## "invitation to join the group #team sent to cath",
+          do
+            cath <## "#team: alice invites you to join the group as admin"
+            cath <## "use /j team to accept"
+        ]
+      cath ##> "/j team"
+      concurrentlyN_
+        [ alice <## "#team: cath joined the group",
+          do
+            cath <## "#team: you joined the group"
+            cath <## "#team: member bob (Bob) is connected",
+          do
+            bob <## "#team: alice added cath (Catherine) to the group (connecting...)"
+            bob <## "#team: new member cath is connected"
+        ]
+      alice #> "#team hello"
+      concurrently_
+        (bob <# "#team alice> hello")
+        (cath <# "#team alice> hello")
+      bob #> "#team hi there"
+      concurrently_
+        (alice <# "#team bob> hi there")
+        (cath <# "#team bob> hi there")
+      cath #> "#team hey"
+      concurrently_
+        (alice <# "#team cath> hey")
+        (bob <# "#team cath> hey")
+      bob <##> cath
+      -- remove member
+      bob ##> "/rm team cath"
+      concurrentlyN_
+        [ bob <## "#team: you removed cath from the group",
+          alice <## "#team: bob removed cath from the group",
+          do
+            cath <## "#team: bob removed you from the group"
+            cath <## "use /d #team to delete the group"
+        ]
+      bob #> "#team hi"
+      concurrently_
+        (alice <# "#team bob> hi")
+        (cath </)
+      alice #> "#team hello"
+      concurrently_
+        (bob <# "#team alice> hello")
+        (cath </)
+      cath #> "#team hello"
+      cath <## "you are no longer the member of the group"
+      bob <##> cath
+
+testGroup2 :: IO ()
+testGroup2 =
+  testChat4 aliceProfile bobProfile cathProfile danProfile $
+    \alice bob cath dan -> do
+      connectUsers alice bob
+      connectUsers alice cath
+      connectUsers bob dan
+      connectUsers alice dan
+      alice ##> "/g club"
+      alice <## "group #club is created"
+      alice <## "use /a club <name> to add members"
+      alice ##> "/a club bob"
+      concurrentlyN_
+        [ alice <## "invitation to join the group #club sent to bob",
+          do
+            bob <## "#club: alice invites you to join the group as admin"
+            bob <## "use /j club to accept"
+        ]
+      alice ##> "/a club cath"
+      concurrentlyN_
+        [ alice <## "invitation to join the group #club sent to cath",
+          do
+            cath <## "#club: alice invites you to join the group as admin"
+            cath <## "use /j club to accept"
+        ]
+      bob ##> "/j club"
+      concurrently_
+        (alice <## "#club: bob joined the group")
+        (bob <## "#club: you joined the group")
+      cath ##> "/j club"
+      concurrentlyN_
+        [ alice <## "#club: cath joined the group",
+          do
+            cath <## "#club: you joined the group"
+            cath <## "#club: member bob (Bob) is connected",
+          do
+            bob <## "#club: alice added cath (Catherine) to the group (connecting...)"
+            bob <## "#club: new member cath is connected"
+        ]
+      bob ##> "/a club dan"
+      concurrentlyN_
+        [ bob <## "invitation to join the group #club sent to dan",
+          do
+            dan <## "#club: bob invites you to join the group as admin"
+            dan <## "use /j club to accept"
+        ]
+      dan ##> "/j club"
+      concurrentlyN_
+        [ bob <## "#club: dan joined the group",
+          do
+            dan <## "#club: you joined the group"
+            dan
+              <### [ "#club: member alice_1 (Alice) is connected",
+                     "contact alice_1 is merged into alice",
+                     "use @alice <message> to send messages",
+                     "#club: member cath (Catherine) is connected"
+                   ],
+          do
+            alice <## "#club: bob added dan_1 (Daniel) to the group (connecting...)"
+            alice <## "#club: new member dan_1 is connected"
+            alice <## "contact dan_1 is merged into dan"
+            alice <## "use @dan <message> to send messages",
+          do
+            cath <## "#club: bob added dan (Daniel) to the group (connecting...)"
+            cath <## "#club: new member dan is connected"
+        ]
+      alice #> "#club hello"
+      concurrentlyN_
+        [ bob <# "#club alice> hello",
+          cath <# "#club alice> hello",
+          dan <# "#club alice> hello"
+        ]
+      bob #> "#club hi there"
+      concurrentlyN_
+        [ alice <# "#club bob> hi there",
+          cath <# "#club bob> hi there",
+          dan <# "#club bob> hi there"
+        ]
+      cath #> "#club hey"
+      concurrentlyN_
+        [ alice <# "#club cath> hey",
+          bob <# "#club cath> hey",
+          dan <# "#club cath> hey"
+        ]
+      dan #> "#club how is it going?"
+      concurrentlyN_
+        [ alice <# "#club dan> how is it going?",
+          bob <# "#club dan> how is it going?",
+          cath <# "#club dan> how is it going?"
+        ]
+      bob <##> cath
+      dan <##> cath
+      dan <##> alice
+      -- remove member
+      cath ##> "/rm club dan"
+      concurrentlyN_
+        [ cath <## "#club: you removed dan from the group",
+          alice <## "#club: cath removed dan from the group",
+          bob <## "#club: cath removed dan from the group",
+          do
+            dan <## "#club: cath removed you from the group"
+            dan <## "use /d #club to delete the group"
+        ]
+      alice #> "#club hello"
+      concurrentlyN_
+        [ bob <# "#club alice> hello",
+          cath <# "#club alice> hello",
+          (dan </)
+        ]
+      bob #> "#club hi there"
+      concurrentlyN_
+        [ alice <# "#club bob> hi there",
+          cath <# "#club bob> hi there",
+          (dan </)
+        ]
+      cath #> "#club hey"
+      concurrentlyN_
+        [ alice <# "#club cath> hey",
+          bob <# "#club cath> hey",
+          (dan </)
+        ]
+      dan #> "#club how is it going?"
+      dan <## "you are no longer the member of the group"
+      dan <##> cath
+      dan <##> alice
+      -- member leaves
+      bob ##> "/l club"
+      concurrentlyN_
+        [ do
+            bob <## "#club: you left the group"
+            bob <## "use /d #club to delete the group",
+          alice <## "#club: bob left the group",
+          cath <## "#club: bob left the group"
+        ]
+      alice #> "#club hello"
+      concurrently_
+        (cath <# "#club alice> hello")
+        (bob </)
+      cath #> "#club hey"
+      concurrently_
+        (alice <# "#club cath> hey")
+        (bob </)
+      bob #> "#club how is it going?"
+      bob <## "you are no longer the member of the group"
+      bob <##> cath
+      bob <##> alice
+
+testGroupDelete :: IO ()
+testGroupDelete =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      createGroup3 "team" alice bob cath
+      alice ##> "/d #team"
+      concurrentlyN_
+        [ alice <## "#team: you deleted the group",
+          do
+            bob <## "#team: alice deleted the group"
+            bob <## "use /d #team to delete the local copy of the group",
+          do
+            cath <## "#team: alice deleted the group"
+            cath <## "use /d #team to delete the local copy of the group"
+        ]
+      bob ##> "/d #team"
+      bob <## "#team: you deleted the group"
+      cath #> "#team hi"
+      cath <## "you are no longer the member of the group"
+
+testGroupRemoveAdd :: IO ()
+testGroupRemoveAdd =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      createGroup3 "team" alice bob cath
+      -- remove member
+      alice ##> "/rm team bob"
+      concurrentlyN_
+        [ alice <## "#team: you removed bob from the group",
+          do
+            bob <## "#team: alice removed you from the group"
+            bob <## "use /d #team to delete the group",
+          cath <## "#team: alice removed bob from the group"
+        ]
+      alice ##> "/a team bob"
+      alice <## "invitation to join the group #team sent to bob"
+      bob <## "#team_1 (team): alice invites you to join the group as admin"
+      bob <## "use /j team_1 to accept"
+      bob ##> "/j team_1"
+      concurrentlyN_
+        [ alice <## "#team: bob joined the group",
+          do
+            bob <## "#team_1: you joined the group"
+            bob <## "#team_1: member cath_1 (Catherine) is connected"
+            bob <## "contact cath_1 is merged into cath"
+            bob <## "use @cath <message> to send messages",
+          do
+            cath <## "#team: alice added bob_1 (Bob) to the group (connecting...)"
+            cath <## "#team: new member bob_1 is connected"
+            cath <## "contact bob_1 is merged into bob"
+            cath <## "use @bob <message> to send messages"
+        ]
+      alice #> "#team hi"
+      concurrently_
+        (bob <# "#team_1 alice> hi")
+        (cath <# "#team alice> hi")
+      bob #> "#team_1 hey"
+      concurrently_
+        (alice <# "#team bob> hey")
+        (cath <# "#team bob> hey")
+      cath #> "#team hello"
+      concurrently_
+        (alice <# "#team cath> hello")
+        (bob <# "#team_1 cath> hello")
+
+testUpdateProfile :: IO ()
+testUpdateProfile =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      createGroup3 "team" alice bob cath
+      alice ##> "/p"
+      alice <## "user profile: alice (Alice)"
+      alice <## "use /p <display name> [<full name>] to change it"
+      alice <## "(the updated profile will be sent to all your contacts)"
+      alice ##> "/p alice"
+      concurrentlyN_
+        [ alice <## "user full name removed (your contacts are notified)",
+          bob <## "contact alice removed full name",
+          cath <## "contact alice removed full name"
+        ]
+      alice ##> "/p alice Alice Jones"
+      concurrentlyN_
+        [ alice <## "user full name changed to Alice Jones (your contacts are notified)",
+          bob <## "contact alice updated full name: Alice Jones",
+          cath <## "contact alice updated full name: Alice Jones"
+        ]
+      cath ##> "/p cate"
+      concurrentlyN_
+        [ cath <## "user profile is changed to cate (your contacts are notified)",
+          do
+            alice <## "contact cath changed to cate"
+            alice <## "use @cate <message> to send messages",
+          do
+            bob <## "contact cath changed to cate"
+            bob <## "use @cate <message> to send messages"
+        ]
+      cath ##> "/p cat Cate"
+      concurrentlyN_
+        [ cath <## "user profile is changed to cat (Cate) (your contacts are notified)",
+          do
+            alice <## "contact cate changed to cat (Cate)"
+            alice <## "use @cat <message> to send messages",
+          do
+            bob <## "contact cate changed to cat (Cate)"
+            bob <## "use @cat <message> to send messages"
+        ]
+
+testFileTransfer :: IO ()
+testFileTransfer =
+  testChat2 aliceProfile bobProfile $
+    \alice bob -> do
+      connectUsers alice bob
+      startFileTransfer alice bob
+      concurrentlyN_
+        [ do
+            bob #> "@alice receiving here..."
+            bob <## "completed receiving file 1 (test.jpg) from alice",
+          do
+            alice <# "bob> receiving here..."
+            alice <## "completed sending file 1 (test.jpg) to bob"
+        ]
+      src <- B.readFile "./tests/fixtures/test.jpg"
+      dest <- B.readFile "./tests/tmp/test.jpg"
+      dest `shouldBe` src
+
+testFileSndCancel :: IO ()
+testFileSndCancel =
+  testChat2 aliceProfile bobProfile $
+    \alice bob -> do
+      connectUsers alice bob
+      startFileTransfer alice bob
+      alice ##> "/fc 1"
+      concurrentlyN_
+        [ do
+            alice <## "cancelled sending file 1 (test.jpg) to bob"
+            alice ##> "/fs 1"
+            alice <## "sending file 1 (test.jpg) cancelled",
+          do
+            bob <## "alice cancelled sending file 1 (test.jpg)"
+            bob ##> "/fs 1"
+            bob <## "receiving file 1 (test.jpg) cancelled, received part path: ./tests/tmp/test.jpg"
+        ]
+      checkPartialTransfer
+
+testFileRcvCancel :: IO ()
+testFileRcvCancel =
+  testChat2 aliceProfile bobProfile $
+    \alice bob -> do
+      connectUsers alice bob
+      startFileTransfer alice bob
+      bob ##> "/fs 1"
+      getTermLine bob >>= (`shouldStartWith` "receiving file 1 (test.jpg) progress")
+      waitFileExists "./tests/tmp/test.jpg"
+      bob ##> "/fc 1"
+      concurrentlyN_
+        [ do
+            bob <## "cancelled receiving file 1 (test.jpg) from alice"
+            bob ##> "/fs 1"
+            bob <## "receiving file 1 (test.jpg) cancelled, received part path: ./tests/tmp/test.jpg",
+          do
+            alice <## "bob cancelled receiving file 1 (test.jpg)"
+            alice ##> "/fs 1"
+            alice <## "sending file 1 (test.jpg) cancelled"
+        ]
+      checkPartialTransfer
+  where
+    waitFileExists f = unlessM (doesFileExist f) $ waitFileExists f
+
+testGroupFileTransfer :: IO ()
+testGroupFileTransfer =
+  testChat3 aliceProfile bobProfile cathProfile $
+    \alice bob cath -> do
+      createGroup3 "team" alice bob cath
+      alice #> "/f #team ./tests/fixtures/test.jpg"
+      alice <## "use /fc 1 to cancel sending"
+      concurrentlyN_
+        [ do
+            bob <# "#team alice> sends file test.jpg (136.5 KiB / 139737 bytes)"
+            bob <## "use /fr 1 [<dir>/ | <path>] to receive it",
+          do
+            cath <# "#team alice> sends file test.jpg (136.5 KiB / 139737 bytes)"
+            cath <## "use /fr 1 [<dir>/ | <path>] to receive it"
+        ]
+      alice ##> "/fs 1"
+      getTermLine alice >>= (`shouldStartWith` "sending file 1 (test.jpg) not accepted")
+      bob ##> "/fr 1 ./tests/tmp/"
+      bob <## "saving file 1 from alice to ./tests/tmp/test.jpg"
+      concurrentlyN_
+        [ do
+            alice <## "started sending file 1 (test.jpg) to bob"
+            alice <## "completed sending file 1 (test.jpg) to bob"
+            alice ##> "/fs 1"
+            alice <## "sending file 1 (test.jpg):"
+            alice <### ["  complete: bob", "  not accepted: cath"],
+          do
+            bob <## "started receiving file 1 (test.jpg) from alice"
+            bob <## "completed receiving file 1 (test.jpg) from alice"
+        ]
+      cath ##> "/fr 1 ./tests/tmp/"
+      cath <## "saving file 1 from alice to ./tests/tmp/test_1.jpg"
+      concurrentlyN_
+        [ do
+            alice <## "started sending file 1 (test.jpg) to cath"
+            alice <## "completed sending file 1 (test.jpg) to cath"
+            alice ##> "/fs 1"
+            getTermLine alice >>= (`shouldStartWith` "sending file 1 (test.jpg) complete"),
+          do
+            cath <## "started receiving file 1 (test.jpg) from alice"
+            cath <## "completed receiving file 1 (test.jpg) from alice"
+        ]
+
+startFileTransfer :: TestCC -> TestCC -> IO ()
+startFileTransfer alice bob = do
+  alice #> "/f @bob ./tests/fixtures/test.jpg"
+  alice <## "use /fc 1 to cancel sending"
+  bob <# "alice> sends file test.jpg (136.5 KiB / 139737 bytes)"
+  bob <## "use /fr 1 [<dir>/ | <path>] to receive it"
+  bob ##> "/fr 1 ./tests/tmp"
+  bob <## "saving file 1 from alice to ./tests/tmp/test.jpg"
+  concurrently_
+    (bob <## "started receiving file 1 (test.jpg) from alice")
+    (alice <## "started sending file 1 (test.jpg) to bob")
+
+checkPartialTransfer :: IO ()
+checkPartialTransfer = do
+  src <- B.readFile "./tests/fixtures/test.jpg"
+  dest <- B.readFile "./tests/tmp/test.jpg"
+  B.unpack src `shouldStartWith` B.unpack dest
+  B.length src > B.length dest `shouldBe` True
+
+connectUsers :: TestCC -> TestCC -> IO ()
+connectUsers cc1 cc2 = do
+  name1 <- showName cc1
+  name2 <- showName cc2
+  cc1 ##> "/c"
+  inv <- getInvitation cc1
+  cc2 ##> ("/c " <> inv)
+  concurrently_
+    (cc2 <## (name1 <> ": contact is connected"))
+    (cc1 <## (name2 <> ": contact is connected"))
+
+showName :: TestCC -> IO String
+showName (TestCC ChatController {currentUser} _ _ _ _) = do
+  User {localDisplayName, profile = Profile {fullName}} <- readTVarIO currentUser
+  pure . T.unpack $ localDisplayName <> " (" <> fullName <> ")"
+
+createGroup3 :: String -> TestCC -> TestCC -> TestCC -> IO ()
+createGroup3 gName cc1 cc2 cc3 = do
+  connectUsers cc1 cc2
+  connectUsers cc1 cc3
+  name2 <- userName cc2
+  name3 <- userName cc3
+  sName2 <- showName cc2
+  sName3 <- showName cc3
+  cc1 ##> ("/g " <> gName)
+  cc1 <## ("group #" <> gName <> " is created")
+  cc1 <## ("use /a " <> gName <> " <name> to add members")
+  addMember cc2
+  cc2 ##> ("/j " <> gName)
+  concurrently_
+    (cc1 <## ("#" <> gName <> ": " <> name2 <> " joined the group"))
+    (cc2 <## ("#" <> gName <> ": you joined the group"))
+  addMember cc3
+  cc3 ##> ("/j " <> gName)
+  concurrentlyN_
+    [ cc1 <## ("#" <> gName <> ": " <> name3 <> " joined the group"),
+      do
+        cc3 <## ("#" <> gName <> ": you joined the group")
+        cc3 <## ("#" <> gName <> ": member " <> sName2 <> " is connected"),
+      do
+        cc2 <## ("#" <> gName <> ": alice added " <> sName3 <> " to the group (connecting...)")
+        cc2 <## ("#" <> gName <> ": new member " <> name3 <> " is connected")
+    ]
+  where
+    addMember :: TestCC -> IO ()
+    addMember mem = do
+      name1 <- userName cc1
+      memName <- userName mem
+      cc1 ##> ("/a " <> gName <> " " <> memName)
+      concurrentlyN_
+        [ cc1 <## ("invitation to join the group #" <> gName <> " sent to " <> memName),
+          do
+            mem <## ("#" <> gName <> ": " <> name1 <> " invites you to join the group as admin")
+            mem <## ("use /j " <> gName <> " to accept")
+        ]
+
+-- | test sending direct messages
+(<##>) :: TestCC -> TestCC -> IO ()
+cc1 <##> cc2 = do
+  name1 <- userName cc1
+  name2 <- userName cc2
+  cc1 #> ("@" <> name2 <> " hi")
+  cc2 <# (name1 <> "> hi")
+  cc2 #> ("@" <> name1 <> " hey")
+  cc1 <# (name2 <> "> hey")
+
+userName :: TestCC -> IO [Char]
+userName (TestCC ChatController {currentUser} _ _ _ _) = T.unpack . localDisplayName <$> readTVarIO currentUser
+
+(##>) :: TestCC -> String -> IO ()
+cc ##> cmd = do
+  cc `send` cmd
+  cc <## cmd
+
+(#>) :: TestCC -> String -> IO ()
+cc #> cmd = do
+  cc `send` cmd
+  cc <# cmd
+
+send :: TestCC -> String -> IO ()
+send TestCC {chatController = cc} cmd = atomically $ writeTBQueue (inputQ cc) $ InputCommand cmd
+
+(<##) :: TestCC -> String -> Expectation
+cc <## line = getTermLine cc `shouldReturn` line
+
+(<###) :: TestCC -> [String] -> Expectation
+_ <### [] = pure ()
+cc <### ls = do
+  line <- getTermLine cc
+  if line `elem` ls
+    then cc <### filter (/= line) ls
+    else error $ "unexpected output: " <> line
+
+(<#) :: TestCC -> String -> Expectation
+cc <# line = (dropTime <$> getTermLine cc) `shouldReturn` line
+
+(</) :: TestCC -> Expectation
+(</) cc = timeout 500000 (getTermLine cc) `shouldReturn` Nothing
+
+dropTime :: String -> String
+dropTime msg = case splitAt 6 msg of
+  ([m, m', ':', s, s', ' '], text) ->
+    if all isDigit [m, m', s, s'] then text else error "invalid time"
+  _ -> error "invalid time"
+
+getTermLine :: TestCC -> IO String
+getTermLine = atomically . readTQueue . termQ
+
+getInvitation :: TestCC -> IO String
+getInvitation cc = do
+  cc <## "pass this invitation to your contact (via another channel):"
+  cc <## ""
+  inv <- getTermLine cc
+  cc <## ""
+  cc <## "and ask them to connect: /c <invitation_above>"
+  pure inv
--- a/tests/ProtocolTests.hs
+++ b/tests/ProtocolTests.hs
@@ -0,0 +1,47 @@
+{-# LANGUAGE OverloadedLists #-}
+{-# LANGUAGE OverloadedStrings #-}
+
+module ProtocolTests where
+
+import Data.ByteString.Char8 (ByteString)
+import Simplex.Chat.Protocol
+import Simplex.Messaging.Parsers (parseAll)
+import Test.Hspec
+
+protocolTests :: Spec
+protocolTests = do
+  parseChatMessageTest
+
+(#==) :: ByteString -> RawChatMessage -> Expectation
+s #== msg = parseAll rawChatMessageP s `shouldBe` Right msg
+
+parseChatMessageTest :: Spec
+parseChatMessageTest = describe "Raw chat message format" $ do
+  it "no parameters and content" $
+    "5 x.grp.mem.leave   " #== RawChatMessage (Just 5) "x.grp.mem.leave" [] []
+  it "one parameter, no content" $
+    "6 x.msg.del 3  " #== RawChatMessage (Just 6) "x.msg.del" ["3"] []
+  it "with content that fits the message" $
+    "7 x.msg.new c.text x.text:11 hello there "
+      #== RawChatMessage
+        (Just 7)
+        "x.msg.new"
+        ["c.text"]
+        [RawMsgBodyContent (RawContentType "x" "text") "hello there"]
+  it "with DAG reference and partial content" $
+    "8 x.msg.new c.image x.dag:16,x.text:7,m.image/jpg:6 0123456789012345 picture abcdef "
+      #== RawChatMessage
+        (Just 8)
+        "x.msg.new"
+        ["c.image"]
+        [ RawMsgBodyContent (RawContentType "x" "dag") "0123456789012345",
+          RawMsgBodyContent (RawContentType "x" "text") "picture",
+          RawMsgBodyContent (RawContentType "m" "image/jpg") "abcdef"
+        ]
+  it "without message id" $
+    " x.grp.mem.inv 23456,123 x.json:46 {\"contactRef\":\"john\",\"displayName\":\"John Doe\"} "
+      #== RawChatMessage
+        Nothing
+        "x.grp.mem.inv"
+        ["23456", "123"]
+        [RawMsgBodyContent (RawContentType "x" "json") "{\"contactRef\":\"john\",\"displayName\":\"John Doe\"}"]
--- a/tests/Test.hs
+++ b/tests/Test.hs
@@ -1,7 +1,11 @@
+import ChatClient
+import ChatTests
 import MarkdownTests
+import ProtocolTests
 import Test.Hspec

 main :: IO ()
-main = do
-  hspec $ do
-    describe "SimpleX chat markdown" markdownTests
+main = withSmpServer . hspec $ do
+  describe "SimpleX chat markdown" markdownTests
+  describe "SimpleX chat protocol" protocolTests
+  describe "SimpleX chat client" chatTests
--- a/tests/fixtures/test.jpg
+++ b/tests/fixtures/test.jpg
Author	SHA1	Message	Date
Evgeny Poberezkin	43fc819f77	0.4.0	2021-09-11 20:44:01 +01:00
Evgeny Poberezkin	471652a042	Merge pull request #65 from simplex-chat/v4 v0.4.0	2021-09-11 20:18:53 +01:00
Evgeny Poberezkin	3a2c7927e1	update simplexmq version (#102 ) * update simplexmq version * update simplexmq version 0.4.1	2021-09-11 19:50:00 +01:00
Efim Poberezkin	4360d34847	update readme (#99 ) * update readme * case * fixes, roadmap * wording * features * update gifs and images * block warning * add link from announcement to groups * update default servers * update readme * update roadmap, image, etc. Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>	2021-09-11 17:00:59 +01:00
Efim Poberezkin	46cf314403	update default smp servers (#101 ) * update default smp servers * add smp3 server	2021-09-11 13:45:22 +01:00
Efim Poberezkin	fe5769156c	correctly print both db files (#100 )	2021-09-07 01:08:29 +10:00
Evgeny Poberezkin	28103825fa	send files to groups (#97 ) * add sender/recipient info to file types * send file to group (WIP) * send file to group, test * show file status when sending file to group * notification when cancelled sending to group, remove chunks when file complete or canceleld	2021-09-05 14:08:29 +01:00
Efim Poberezkin	4bbdcc1d06	update help - file transfer and groups (#98 ) * update help - file transfer and groups * update help * update help * update help Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>	2021-09-04 20:38:11 +01:00
Evgeny Poberezkin	c51493e016	send files to contacts (#94 ) * schema for sending files * send file "invitation" * receive file "invitation" * send/receive file flow (with stubs) * update simplexmq * send and receive the file (WIP - only the first chunk) * sending and receiving file works (but it is slow) * use correct terminal output for file sending/receiving * improve file transfer, support cancellation * command to show file transfer status and progress * file transfer tests * resume file transfer on restart (WIP) * stabilize test of recipient cancelling file transfer * trying to improve file transfer on restart * update SMP block size and file chunk size * acquire agent lock before chat lock to test whether it avoids deadlock * fix resuming sending file on client restart * manual message ACK (prevents losing messages between agent and chat client and stabilizes resuming file reception after restart) * do NOT send file chunk after receiving it before it is appended to the file * update file chunk size for SMP block size 8192 (set in smpDefaultConfig) * save received files to ~/Downloads folder by default; create empty file when file is accepted * keep file handle used to create empty file * check message integrity * fix trying to resume sending file when it was not yet accepted * fix subscribing to pending connections on start * update simplexmq (fixes smp-server syntax parser)	2021-09-04 07:32:56 +01:00
Efim Poberezkin	97fde7ecd0	subscribe pending connections on chat start (#95 )	2021-08-28 20:54:53 +10:00
Evgeny Poberezkin	9cfca4ed35	update user profile (and notify contacts) (#93 ) * update user profile (and notify contacts) * add concurrently to profile update test for better layout	2021-08-22 15:56:36 +01:00
Evgeny Poberezkin	e5b9cdef9d	update for asynchronous message delivery (#92 )	2021-08-14 21:04:51 +01:00
Evgeny Poberezkin	f3c64f3fc7	Merge branch 'master' into v4	2021-08-06 21:51:21 +01:00
Nikita Poberezkin	2884bf73b7	escape/remove symbols in notifications for all platforms (#88 ) * escape backtick, backslash, double quotes wsl/win * remove quotes, backtick from win notifications to prevent chat from crashing * put notification title and text in single quotes and escape single quotes inside * escape notifications for mac (draft) * add replaceAll func * remove unused import * imports * refactor replaceAll Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>	2021-08-06 21:41:35 +01:00
Evgeny Poberezkin	d23417596e	TMVar lock to avoid subscriber and client processing in parallel, fix the test (#90 ) * TMVar lock to avoid subscriber and client processing in parallel, fix the test * run SMP server as part of the test * stabilize tests * update simplexmq * test: stabilize getting invitation from terminal * remove unused import * simplify test	2021-08-05 20:51:48 +01:00
Evgeny Poberezkin	a9d32db404	update for SMP agent protocol changes (#89 )	2021-08-05 08:38:39 +01:00
Evgeny Poberezkin	b798342c61	group commands (remove member, leave group, delete group) (#87 ) * remove group member * leave group, fix remove member, tests for leave group/remove member * delete group with test * prevent contact deletion error when it is a group member * support inviting the group member who left or was removed * use small retry interval in the tests * test multiline outputs	2021-08-02 20:10:24 +01:00
Evgeny Poberezkin	b7c4a6e195	Merge branch 'master' into v4	2021-07-27 08:10:20 +01:00
Evgeny Poberezkin	2d1ff5fb4b	Merge branch 'master' into v4	2021-07-27 08:09:48 +01:00
Evgeny Poberezkin	b3af93e0ad	merge profiles using contact probe (#86 ) * chat commands to list members and to quit chat * merge profiles using probe * merge contacts connected to the same user based on successful profile probe * delete display name after merging contacts * probe: rename "existing" contacts to "matching"	2021-07-27 08:08:05 +01:00
Evgeny Poberezkin	cc4cb78209	subscribe all user contacts and group members (#85 )	2021-07-25 20:23:52 +01:00
Evgeny Poberezkin	488df1aa3c	refactor groups (#84 ) * refactor groups * disable chat test * remove comments	2021-07-24 18:11:04 +01:00
Evgeny Poberezkin	189cd7e09d	core chat groups protocol for adding members (#78 ) * add category and local display name to group members, extend member status * additional chat commands, serialization * parse all chat messages * draft group protocol implementation * group protocol: connect new member to existing members (TODO fix race condition with contact connection) * send/receive group messages (race condition still there - the 3rd member cannot send either group or direct messages to the 2nd member - CONN SIMPLEX) * send x.grp.mem.info and x.ok in SMP confirmation * fix host user adding new member, update simplexmq to fix sqlite concurrency, remove logs, make # optional in chat commands * more precise view messages about members joining and connecting * track connection status; only send messages to active members (TODO change to current members); group name autocomplete after joining the group * track via which group the contact was added; show only one message when a contact fully connected; group tests * test sending messages to the new direct contacts created via the group * update simplexmq to include .cabal file * remove unused import	2021-07-24 10:26:28 +01:00
Nikita Poberezkin	94f89ed8f7	merge master to v4 (#83 ) * update ghc version to 8.10.4 for Docker build (#67) * make broader check for WSL on notifications (#68) * update readme: network topology and disclaimer on encryption design (#73) * update readme with the disclaimer on encryption design and explanation of the network topology * corrections * remove old disclaimer Co-authored-by: Efim Poberezkin <8711996+efim-poberezkin@users.noreply.github.com> * create appDir if absent (#79) Co-authored-by: Efim Poberezkin <8711996+efim-poberezkin@users.noreply.github.com> Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>	2021-07-24 09:57:10 +01:00
Nikita Poberezkin	3c942f6f3e	create appDir if absent (#79 )	2021-07-23 07:41:10 +01:00
Evgeny Poberezkin	f1a44383fa	chat groups: establish connection between host and invitee members (#77 ) * create group after invitation * add group invitation to db, show sent and received group invitations * test creating group and sending invitation * establish group connections (WIP) * connect user to the inviter, notification, member classification	2021-07-16 07:40:55 +01:00
Evgeny Poberezkin	e9d931059b	use shared namespace for usernames, contact names and group names (#76 ) * test adding same contact, add display_names table and functions * rename display_name -> full_name * use shared namespace for usernames, contact names and group names	2021-07-14 20:11:41 +01:00
Evgeny Poberezkin	e99c4bda1e	started chat groups protocol (#75 ) * create group * add user as member, store methods to get group and to create group member * add group member and send member invitation * fix ci: use simplexmq from github * chat protocol: create SMP agent connection when inviting member * update protocol, started group invitation receiving	2021-07-12 19:00:03 +01:00
Evgeny Poberezkin	24c62584fc	simplify chat protocol (#74 ) * groups protocol and some group commands * simplify chat message format, refactor types to include parsed message body * disable chat test	2021-07-11 12:22:22 +01:00
Evgeny Poberezkin	44496bc003	update readme: network topology and disclaimer on encryption design (#73 ) * update readme with the disclaimer on encryption design and explanation of the network topology * corrections * remove old disclaimer Co-authored-by: Efim Poberezkin <8711996+efim-poberezkin@users.noreply.github.com>	2021-07-07 22:58:53 +01:00
Evgeny Poberezkin	d21abbdec1	chat test with VirtualTerminal (#72 ) * chat test with VirtualTerminal * disable chat test * fix intermittently failing test * simplify test	2021-07-07 22:46:38 +01:00
Evgeny Poberezkin	25ac250d37	use chat message format to pass profile information, refactor (#71 )	2021-07-06 19:07:03 +01:00
Evgeny Poberezkin	85727bfbf1	move files to src folder (to allow testing) (#70 )	2021-07-05 20:05:07 +01:00
Evgeny Poberezkin	58889be83d	establish connection using user profiles (#69 ) * establish connection using user profiles (TODO: delete contact and send message) * delete contact and send message with the updated schema * comment * refactor, remove old code	2021-07-05 19:54:44 +01:00
Evgeny Poberezkin	2f604d91ba	use chat protocol and contacts in chat commands/messages (#66 ) * chat types, chat protocol syntax idea * chat message syntax, raw message type * chat message format and parsing * raw chat message parsing test * add message parsing tests * interpret RawChatMessage * use chat message format when sending messages * save contacts and related connections to DB (WIP) * use contacts in all chat commands (add, connect, send, delete) * use contacts when receiving messages and notifications * handle contact not found error * automatically accept connection when CONF is received from the agent	2021-07-04 18:42:24 +01:00
Efim Poberezkin	c6f1858ca0	make broader check for WSL on notifications (#68 )	2021-07-02 00:37:19 +10:00
Efim Poberezkin	321f4bbe9d	update ghc version to 8.10.4 for Docker build (#67 )	2021-07-01 00:37:47 +10:00
Evgeny Poberezkin	c3d5797a0b	Merge branch 'master' into v4	2021-06-26 20:20:33 +01:00
Nikita Poberezkin	32d90580e7	desktop notifications (#64 ) * send notifications * support for linux notifications (draft) * add support for linux, win (draft) and wsl (draft) notifications * add support for windows/wsl notifications * add unix to extra-deps * add alternative linux notification method * remove unused cpp conditions * fix notification commands for win/lin * remove dbus package and code * remove fdo-notify from extra-deps * move script running logic to common method + add lacking quotes * remove unrelated workspace file * corrections Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>	2021-06-26 19:48:08 +01:00
Evgeny Poberezkin	5a2ded775d	rename app folder (#63 ) * rename app folder * clean up package.yaml	2021-06-25 18:34:29 +01:00
Evgeny Poberezkin	eb2404c9ce	simplex-chat schema, refactor chat to use SMP agent functions (#62 ) * chat messages namespace and types * initial schema (WIP) * schema for messages (WIP) * fix schema, add migrations, remove broadcast * simplex-chat spike (WIP) * chat client design * update chat schema * more chat schema updates * simplex-chat app structure * chat app layout demo * update schema * refactor dog-food (WIP) * refactor / simplify * refactor output of sent message to avoid separate parsing * refactor inputSubscriber * remove unused simplex-chat code * update simplexmq commit * update schema * remove ncurses	2021-06-25 18:18:24 +01:00
Evgeny Poberezkin	4232f73ed2	support ad-hoc groups (broadcasts) (#61 ) * support ad-hoc groups (broadcasts) * fake group chat * use simplexmq latest	2021-06-10 20:34:52 +01:00
Efim Poberezkin	e4f3414b0b	add missing dot (#58 )	2021-05-16 18:58:19 +04:00
Evgeny Poberezkin	d4ecd27067	add gif to readme (#59 )	2021-05-12 19:33:50 +01:00
Evgeny Poberezkin	723c787edc	0.3.1 (#57 )	2021-05-10 19:49:21 +01:00