From f406dd71a0517a95490990d9655596358f2379b9 Mon Sep 17 00:00:00 2001 From: "Evgeny @ SimpleX Chat" <259188159+evgeny-simplex@users.noreply.github.com> Date: Tue, 17 Nov 2026 23:32:59 +0000 Subject: [PATCH 01/20] core, ui: validate short link type, show contact info for long addresses and rejected contacts (#8184) * tests: short link type, QR code capacity and contact statuses * core: validate the type of short links * android, desktop: show contact info for addresses above QR code capacity * ui: show chats with rejected contact requests * tests: short link types with group, channel and contact data * core: validate short link type against link data * tests: fix short link data test * tests: group data in invitation link before its first use * tests: connect via address in contact profile with group link * core: connect via contact address only with address links * core: parse short link data once, by link type * core: types of short link data parser * core: test short link types and contact rejection, record app fixtures * android, desktop: test contact info, link alerts and rejected contacts * ios: test invalid link alerts and rejected contacts in the chat list * desktop: contact info tests find texts without app resources * ui: core responses of invalid link plans and a rejected contact request * desktop: contact info tests provide the app bar handler * core: normalise file and message keys in app test fixtures * core: normalise deletion times in app test fixtures * desktop: test that a QR code above capacity is not shared on tap * core: test relay link checks and known channel refresh from link data --- .../SimpleX Unit Tests/NameAlertsTests.swift | 23 ++ apps/ios/SimpleXChat/ChatTypes.swift | 1 + .../chat/simplex/common/model/ChatModel.kt | 3 +- .../simplex/common/views/newchat/QRCode.kt | 19 +- .../chat/simplex/app/ContactStatusTest.kt | 16 + .../kotlin/chat/simplex/app/NameAlertsTest.kt | 29 ++ .../kotlin/chat/simplex/app/QRCodeTest.kt | 91 +++++ scripts/ci/README.md | 2 +- src/Simplex/Chat/Library/Commands.hs | 56 ++- src/Simplex/Chat/Library/Internal.hs | 30 +- src/Simplex/Chat/Library/Subscriber.hs | 4 +- src/Simplex/Chat/Protocol.hs | 17 + tests/ChatTests/Groups.hs | 62 +++- tests/ChatTests/Profiles.hs | 180 +++++++++- tests/ChatTests/Utils.hs | 4 +- .../api/connect/group-link-as-address.json | 30 ++ .../api/connect/group-link-as-channel.json | 30 ++ .../api/connect/request-rejected.json | 318 ++++++++++++++++++ 18 files changed, 860 insertions(+), 55 deletions(-) create mode 100644 apps/multiplatform/common/src/commonTest/kotlin/chat/simplex/app/ContactStatusTest.kt create mode 100644 apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/QRCodeTest.kt create mode 100644 tests/fixtures/api/connect/group-link-as-address.json create mode 100644 tests/fixtures/api/connect/group-link-as-channel.json create mode 100644 tests/fixtures/api/connect/request-rejected.json diff --git a/apps/ios/SimpleX Unit Tests/NameAlertsTests.swift b/apps/ios/SimpleX Unit Tests/NameAlertsTests.swift index 6b3290c351..36b22f4016 100644 --- a/apps/ios/SimpleX Unit Tests/NameAlertsTests.swift +++ b/apps/ios/SimpleX Unit Tests/NameAlertsTests.swift @@ -221,6 +221,29 @@ final class NameAlertsTests: XCTestCase { XCTAssertEqual(shownLocalChats, ["@3"]) } + @MainActor + func testGroupLinkAsAddress() async throws { + try recorded("connect/group-link-as-address") + connect("GROUP_LINK") + try await assertTexts(["Invalid connection link", "Please check that you used the correct link or ask your contact to send you another one.", "Ok"]) + } + + @MainActor + func testGroupLinkAsChannel() async throws { + try recorded("connect/group-link-as-channel") + connect("GROUP_LINK") + try await assertTexts(["Invalid connection link", "Please check that you used the correct link or ask your contact to send you another one.", "Ok"]) + } + + @MainActor + func testRejectedContactInChatList() async throws { + try recorded("connect/request-rejected") + ChatModel.shared.updateChats(try apiGetChats()) + guard case let .direct(contact)? = ChatModel.shared.getContactChat(2)?.chatInfo else { return XCTFail("contact not decoded: \(ChatModel.shared.chats.map(\.id))") } + XCTAssertEqual(contact.contactStatus.rawValue, "rejected") + XCTAssertFalse(contact.active) + } + @MainActor func testNameMovedEvent() async throws { var contact = Contact.sampleData diff --git a/apps/ios/SimpleXChat/ChatTypes.swift b/apps/ios/SimpleXChat/ChatTypes.swift index 74d514922d..8d1e53b7a7 100644 --- a/apps/ios/SimpleXChat/ChatTypes.swift +++ b/apps/ios/SimpleXChat/ChatTypes.swift @@ -2760,6 +2760,7 @@ public enum ContactStatus: String, Decodable, Hashable { case active = "active" case deleted = "deleted" case deletedByUser = "deletedByUser" + case rejected = "rejected" } public struct ContactRef: Decodable, Equatable, Hashable { diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt index 403af4185a..959c4315e0 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt @@ -2105,7 +2105,8 @@ enum class ConnectionMode { enum class ContactStatus { @SerialName("active") Active, @SerialName("deleted") Deleted, - @SerialName("deletedByUser") DeletedByUser; + @SerialName("deletedByUser") DeletedByUser, + @SerialName("rejected") Rejected; } @Serializable diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/QRCode.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/QRCode.kt index 07dbb6aaea..eef8f963ab 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/QRCode.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/QRCode.kt @@ -77,9 +77,9 @@ fun QRCode( val errorLevel = if (small) QrCode.ErrorLevel.M else QrCode.ErrorLevel.L val fixedQRCode = LocalFixedQRCode.current val qr = remember(connReq, tintColor, withLogo) { - (fixedQRCode ?: qrCodeBitmap(connReq, 1024, errorLevel)).replaceColor(Color.Black.toArgb(), tintColor.toArgb()) - .let { if (withLogo) it.addLogo(logoSize) else it } - } + (fixedQRCode ?: qrCodeBitmap(connReq, 1024, errorLevel))?.replaceColor(Color.Black.toArgb(), tintColor.toArgb()) + ?.let { if (withLogo) it.addLogo(logoSize) else it } + } ?: return Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) { Image( bitmap = qr, @@ -92,8 +92,8 @@ fun QRCode( .then(modifier) .clickable { scope.launch { - val image = qrCodeBitmap(connReq, 1024, errorLevel).replaceColor(Color.Black.toArgb(), tintColor.toArgb()) - .let { if (withLogo) it.addLogo(logoSize) else it } + val image = qrCodeBitmap(connReq, 1024, errorLevel)?.replaceColor(Color.Black.toArgb(), tintColor.toArgb()) + ?.let { if (withLogo) it.addLogo(logoSize) else it } ?: return@launch val file = saveTempImageUncompressed(image, true) if (file != null) { shareFile("", CryptoFile.plain(file.absolutePath)) @@ -105,8 +105,13 @@ fun QRCode( } } -fun qrCodeBitmap(content: String, size: Int = 1024, errorLevel: QrCode.ErrorLevel): ImageBitmap { - val qrCode = QrCodeEncoder().addAutomatic(content).setError(errorLevel).fixate() +fun qrCodeBitmap(content: String, size: Int = 1024, errorLevel: QrCode.ErrorLevel): ImageBitmap? { + val qrCode = try { + QrCodeEncoder().addAutomatic(content).setError(errorLevel).fixate() + } catch (e: Exception) { + Log.e(TAG, "qrCodeBitmap error: ${e.message}") + return null + } /** See [QrCodeGeneratorImage.initialize] and [FiducialImageEngine.configure] for size calculation */ val numModules = QrCode.totalModules(qrCode.version) // Hide border on light themes to make it fit to the same place as camera in QRCodeScanner. diff --git a/apps/multiplatform/common/src/commonTest/kotlin/chat/simplex/app/ContactStatusTest.kt b/apps/multiplatform/common/src/commonTest/kotlin/chat/simplex/app/ContactStatusTest.kt new file mode 100644 index 0000000000..d1ba98ac1f --- /dev/null +++ b/apps/multiplatform/common/src/commonTest/kotlin/chat/simplex/app/ContactStatusTest.kt @@ -0,0 +1,16 @@ +package chat.simplex.app + +import chat.simplex.common.model.ContactStatus +import chat.simplex.common.model.json +import kotlin.test.Test +import kotlin.test.assertEquals + +class ContactStatusTest { + @Test + fun testContactStatusesOfCore() { + listOf("active", "deleted", "deletedByUser", "rejected").forEach { status -> + val decoded = json.decodeFromString(ContactStatus.serializer(), "\"$status\"") + assertEquals("\"$status\"", json.encodeToString(ContactStatus.serializer(), decoded)) + } + } +} diff --git a/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/NameAlertsTest.kt b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/NameAlertsTest.kt index 486a65495f..1467582a78 100644 --- a/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/NameAlertsTest.kt +++ b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/NameAlertsTest.kt @@ -246,6 +246,18 @@ class NameAlertsTest { assertLocalChats("@3") } + @Test + fun groupLinkAsAddress() = recordedAlerts("connect/group-link-as-address") { + connect("GROUP_LINK") + assertTexts("Invalid connection link", "Please check that you used the correct link or ask your contact to send you another one.", "OK") + } + + @Test + fun groupLinkAsChannel() = recordedAlerts("connect/group-link-as-channel") { + connect("GROUP_LINK") + assertTexts("Invalid connection link", "Please check that you used the correct link or ask your contact to send you another one.", "OK") + } + @Test fun connectByNameRowShowsLocalChats() = recorded("names/plan-known") { val searchText = mutableStateOf(TextFieldValue("alice")) @@ -298,6 +310,23 @@ class NameAlertsTest { onNodeWithText("Connect to team.simplex").assertExists() } + @Test + fun rejectedContactInChatList() = recorded("connect/request-rejected") { + ChatModel.chatRunning.value = true + runBlocking { + val chats = ChatController.apiGetChats(null) + withContext(Dispatchers.Main) { ChatModel.chatsContext.updateChats(chats) } + } + setContent { + CompositionLocalProvider(LocalAppBarHandler provides rememberAppBarHandler()) { + ChatListView(ChatModel, MutableStateFlow(AnimatedViewState.GONE), {}, false) + } + } + assertEquals(listOf("@2"), chatIds()) + assertFalse((chatInfo("@2") as ChatInfo.Direct).contact.active) + waitUntil(timeoutMillis = 5_000) { onAllNodesWithText("alice").fetchSemanticsNodes().isNotEmpty() } + } + @Test fun verifiedNameIsCopied() = simplexName(DomainVerification.Verified) { verifications, copied -> onNodeWithText(SIMPLEX_NAME).performClick() diff --git a/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/QRCodeTest.kt b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/QRCodeTest.kt new file mode 100644 index 0000000000..d5d55abf97 --- /dev/null +++ b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/QRCodeTest.kt @@ -0,0 +1,91 @@ +package chat.simplex.app + +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.test.ComposeUiTest +import androidx.compose.ui.test.ExperimentalTestApi +import androidx.compose.ui.test.assertCountEquals +import androidx.compose.ui.test.onAllNodesWithContentDescription +import androidx.compose.ui.test.onNodeWithContentDescription +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.performClick +import androidx.compose.ui.test.runComposeUiTest +import boofcv.alg.fiducial.qrcode.QrCode +import chat.simplex.common.model.* +import chat.simplex.common.views.chat.ChatInfoView +import chat.simplex.common.views.helpers.LocalAppBarHandler +import chat.simplex.common.views.helpers.rememberAppBarHandler +import chat.simplex.common.views.newchat.LocalFixedQRCode +import chat.simplex.common.views.newchat.SimpleXLinkQRCode +import chat.simplex.common.views.newchat.qrCodeBitmap +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.withContext +import kotlin.test.AfterTest +import kotlin.test.Test +import kotlin.test.assertFalse +import kotlin.test.assertNotNull +import kotlin.test.assertNull + +@OptIn(ExperimentalTestApi::class) +class QRCodeTest { + private val link = "https://simplex.chat/contact#/?v=2-7&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FWHV0YU1sYlU7NqiEHkHDB6gxO1ofTync%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAWbebOqVYuBXaiqHcXYjEHCpYi6VzDlu6CVaijDTmsQU%253D" + + @AfterTest + fun tearDown() { + ChatModel.chatsContext.chats.value.clear() + ChatModel.currentUser.value = null + } + + @Test + fun testQRCodeBitmapOfLinkWithinCapacity() { + assertNotNull(qrCodeBitmap(link, errorLevel = QrCode.ErrorLevel.L)) + assertNotNull(qrCodeBitmap(link, errorLevel = QrCode.ErrorLevel.M)) + } + + @Test + fun testNoQRCodeBitmapOfLinkAboveCapacity() { + assertNull(qrCodeBitmap("$link&data=${"a".repeat(3000)}", errorLevel = QrCode.ErrorLevel.L)) + assertNull(qrCodeBitmap("$link&data=${"a".repeat(2400)}", errorLevel = QrCode.ErrorLevel.M)) + } + + @Test + fun testContactInfoShowsQRCodeOfAddress() = contactInfo(link) { + onNodeWithText(ADDRESS_FOOTER).assertExists() + onAllNodesWithContentDescription("QR Code").assertCountEquals(1) + } + + @Test + fun testContactInfoWithoutQRCodeOfAddressAboveCapacity() = contactInfo("$link&data=${"a".repeat(3000)}") { + onNodeWithText(ADDRESS_FOOTER).assertExists() + onAllNodesWithContentDescription("QR Code").assertCountEquals(0) + } + + @Test + fun testNoShareOfQRCodeAboveCapacity() = runComposeUiTest { + var shared = false + setContent { + CompositionLocalProvider(LocalFixedQRCode provides qrCodeBitmap(link, errorLevel = QrCode.ErrorLevel.L)) { + SimpleXLinkQRCode("$link&data=${"a".repeat(3000)}", onShare = { shared = true }) + } + } + onNodeWithContentDescription("QR Code").performClick() + waitForIdle() + assertFalse(shared) + } + + private fun contactInfo(address: String, test: ComposeUiTest.() -> Unit) = runComposeUiTest { + val contact = Contact.sampleData.copy(profile = LocalProfile.sampleData.copy(contactLink = address)) + ChatModel.currentUser.value = User.sampleData + runBlocking { withContext(Dispatchers.Main) { ChatModel.chatsContext.updateChat(null, ChatInfo.Direct(contact)) } } + setContent { + CompositionLocalProvider(LocalAppBarHandler provides rememberAppBarHandler()) { + ChatInfoView(ChatModel.chatsContext, ChatModel, contact, connectionStats = null, customUserProfile = null, localAlias = "", connectionCode = null, close = {}, onSearchClicked = {}) + } + } + test() + } + + private companion object { + const val ADDRESS_FOOTER = "You can share this address with your contacts to let them connect with alice." + } +} diff --git a/scripts/ci/README.md b/scripts/ci/README.md index cffdfec2a2..31b0e234b1 100644 --- a/scripts/ci/README.md +++ b/scripts/ci/README.md @@ -45,7 +45,7 @@ The reduced build runs one Linux job, build-linux (ubuntu-22.04 x86_64), for eve - caches (the steps "Restore ... from cache"); - `cabal build -j --enable-tests --ghc-options=-O0` (step "Build CLI"); - simplex-chat-test with the selected tests (step "Run tests"), each attempt limited to 35 minutes by `timeout`; an attempt that reaches the limit fails, and "Attempt timed out." is printed. -- App test fixtures: core tests write the core's responses and events that the app tests use to tests/fixtures/api (`/names tests/` to tests/fixtures/api/names, `/contact via address/` to tests/fixtures/api/connect, `/updated item event has the previous item/`, `/should send updated item with mentions added and removed by edit/` and `/mark call invitation missed when the caller ends the call/` to tests/fixtures/api/updates), and fail when a recording differs from the committed file; the rewritten files are committed, and the kotlin and ios scopes run for them. +- App test fixtures: core tests write the core's responses and events that the app tests use to tests/fixtures/api (`/names tests/` to tests/fixtures/api/names; `/contact via address/`, `/should validate link type/` and `/reject contact and notify the sender/` to tests/fixtures/api/connect; `/updated item event has the previous item/`, `/should send updated item with mentions added and removed by edit/` and `/mark call invitation missed when the caller ends the call/` to tests/fixtures/api/updates), and fail when a recording differs from the committed file; the rewritten files are committed, and the kotlin and ios scopes run for them. - Local: ```sh cp scripts/cabal.project.local.linux cabal.project.local diff --git a/src/Simplex/Chat/Library/Commands.hs b/src/Simplex/Chat/Library/Commands.hs index 66c8f2b3c4..d12b9b4cba 100644 --- a/src/Simplex/Chat/Library/Commands.hs +++ b/src/Simplex/Chat/Library/Commands.hs @@ -1741,11 +1741,9 @@ processChatCommand cxt nm = \case r <- tryAllErrors $ getShortLinkConnReq nm user address case r of Left e -> failAt RTSGetLink e - Right (FixedLinkData {rootKey}, cData, cReq) -> do - relayProfile_ <- liftIO $ decodeLinkUserData cData - case relayProfile_ of - Nothing -> failAt RTSDecodeLink (ChatError $ CERelayTestError "no relay address link data") - Just RelayAddressLinkData {relayProfile} -> do + Right (FixedLinkData {rootKey}, _, cReq, sLinkData_) -> + case sLinkData_ of + Just (SLDRelayAddress RelayAddressLinkData {relayProfile}) -> do let failWithProfile step e = pure $ CRChatRelayTestResult user (Just relayProfile) (Just $ RelayTestFailure step e) lift (withAgent' (`connRequestAgentVersion` cReq)) >>= \case @@ -1774,6 +1772,7 @@ processChatCommand cxt nm = \case Right Nothing -> failWithProfile RTSWaitResponse (ChatError $ CERelayTestError "timeout") Right (Just Nothing) -> pure $ CRChatRelayTestResult user (Just relayProfile) Nothing Right (Just (Just failure)) -> pure $ CRChatRelayTestResult user (Just relayProfile) (Just failure) + _ -> failAt RTSDecodeLink (ChatError $ CERelayTestError "no relay address link data") TestChatRelay address -> withUser $ \User {userId} -> processChatCommand cxt nm $ APITestChatRelay userId address APIAllowRelayGroup groupId -> withUser $ \user -> do @@ -1986,10 +1985,9 @@ processChatCommand cxt nm = \case gInfo@GroupInfo {groupProfile = p} <- withFastStore $ \db -> getGroupInfo db cxt user groupId case p of GroupProfile {publicGroup = Just PublicGroupProfile {groupLink = sLnk, publicGroupId}} | useRelays' gInfo -> do - (FixedLinkData {linkEntityId}, cData@(ContactLinkData _ UserContactData {relays = currentRelayLinks}), _) <- getShortLinkConnReq' nm user sLnk + (FixedLinkData {linkEntityId}, ContactLinkData _ UserContactData {relays = currentRelayLinks}, _, sLinkData_) <- getShortLinkConnReq' nm user sLnk unless ((B64UrlByteString <$> linkEntityId) == Just publicGroupId) $ throwChatError CEInvalidConnReq - groupSLinkData_ <- liftIO $ decodeLinkUserData cData - gInfo' <- case groupSLinkData_ of + gInfo' <- case shortLinkGroupData =<< sLinkData_ of Just sLinkData -> (\(g, _, _) -> g) <$> updateGroupFromLinkData user gInfo sLinkData Nothing _ -> pure gInfo when (memberRole' (membership gInfo) /= GROwner && memberCurrent (membership gInfo)) $ @@ -2352,8 +2350,8 @@ processChatCommand cxt nm = \case sLnk <- case connShortLink' connLinkToConnect of Just sl -> pure sl Nothing -> throwChatError $ CEException "failed to retrieve relays: no short link" - (FixedLinkData {linkEntityId, rootKey}, cData@(ContactLinkData _ UserContactData {owners, relays}), mainCReq@(CRContactUri crData e2e)) <- getShortLinkConnReq nm user sLnk - groupSLinkData_ <- liftIO $ decodeLinkUserData cData + (FixedLinkData {linkEntityId, rootKey}, ContactLinkData _ UserContactData {owners, relays}, mainCReq@(CRContactUri crData e2e), sLinkData_) <- getShortLinkConnReq nm user sLnk + let groupSLinkData_ = shortLinkGroupData =<< sLinkData_ -- Validate link entity ID matches group profile's publicGroupId (relay groups must have both) case groupSLinkData_ of Just sLinkData@GroupShortLinkData {groupProfile = GroupProfile {publicGroup = Just PublicGroupProfile {publicGroupId}}} @@ -2490,9 +2488,10 @@ processChatCommand cxt nm = \case when (isJust groupDirectInv) $ throwCmdError "contact is a member contact request" ccLink <- case contactLink of Just (CLFull cReq) -> pure $ CCLink cReq Nothing - Just (CLShort sLnk) -> do - (_, _, cReq) <- getShortLinkConnReq nm user sLnk + Just (CLShort sLnk@(CSLContact _ CCTContact _ _)) -> do + (_, _, cReq, _) <- getShortLinkConnReq nm user sLnk pure $ CCLink cReq $ Just sLnk + Just (CLShort _) -> throwChatError CEInvalidConnReq Nothing -> throwCmdError "no address in contact profile" connectContactViaAddress user incognito ct ccLink `catchAllErrors` \e -> do -- get updated contact, in case connection was started - in UI it would lock ability to change incognito choice @@ -4045,10 +4044,9 @@ processChatCommand cxt nm = \case -- Save relayLink to re-use relay member record on retry (check by relayLink) relayMember <- withFastStore $ \db -> getCreateRelayForMember db cxt gVar user gInfo relayLink r <- tryAllErrors $ do - (FixedLinkData {rootKey = relayKey, linkEntityId}, cData, cReq) <- getShortLinkConnReq nm user relayLink - relayLinkData_ <- liftIO $ decodeLinkUserData cData - relayMemberId <- case (relayLinkData_, linkEntityId) of - (Just RelayShortLinkData {relayProfile = p}, Just entityId) -> do + (FixedLinkData {rootKey = relayKey, linkEntityId}, _, cReq, sLinkData_) <- getShortLinkConnReq nm user relayLink + relayMemberId <- case (sLinkData_, linkEntityId) of + (Just (SLDRelayLink RelayShortLinkData {relayProfile = p}), Just entityId) -> do withFastStore $ \db -> updateRelayMemberData db cxt user relayMember (MemberId entityId) (MemberKey relayKey) p pure $ MemberId entityId _ -> throwChatError $ CEException "relay link: no relay link data or entity id" @@ -4453,7 +4451,7 @@ processChatCommand cxt nm = \case where addRelay :: UserChatRelay -> CM (UserChatRelay, Either ChatError GroupRelay) addRelay relay@UserChatRelay {address} = fmap (relay,) . tryAllErrors $ do - (_, _, cReq) <- getShortLinkConnReq nm user address + (_, _, cReq, _) <- getShortLinkConnReq nm user address lift (withAgent' (`connRequestAgentVersion` cReq)) >>= \case Nothing -> throwChatError CEInvalidConnReq Just _ -> do @@ -4555,8 +4553,8 @@ processChatCommand cxt nm = \case knownLinkPlans l' >>= \case Just (createdLink, p) -> pure (createdLink, Nothing, Nothing, p) Nothing -> do - (FixedLinkData {rootKey}, cData, cReq) <- getShortLinkConnReq nm user l' - contactSLinkData_ <- mapM (linkDataBadge $ linkPresHeader l') =<< liftIO (decodeLinkUserData cData) + (FixedLinkData {rootKey}, _, cReq, sLinkData_) <- getShortLinkConnReq nm user l' + contactSLinkData_ <- mapM (linkDataBadge $ linkPresHeader l') $ shortLinkContactData =<< sLinkData_ let ov = verifyLinkOwner rootKey [] l sig_ invitationReqAndPlan cReq (Just l') contactSLinkData_ ov where @@ -4611,9 +4609,9 @@ processChatCommand cxt nm = \case resolveSLink >>= contactLinkPlan Nothing where contactLinkPlan knownChat_ l' = do - (FixedLinkData {rootKey}, cData, cReq) <- getShortLinkConnReq nm user l' + (FixedLinkData {rootKey}, cData, cReq, sLinkData_) <- getShortLinkConnReq nm user l' let presHeader = linkPresHeader l' - contactSLinkData_ <- mapM (linkDataBadge presHeader) =<< liftIO (decodeLinkUserData cData) + contactSLinkData_ <- mapM (linkDataBadge presHeader) $ shortLinkContactData =<< sLinkData_ let linkProfile_ = (\ContactShortLinkData {profile} -> profile) <$> contactSLinkData_ linkDomain_ = linkProfile_ >>= \Profile {contactDomain} -> claimDomain <$> contactDomain planDomain = case nl of CTName ni -> Just (nameDomain ni); _ -> Nothing @@ -4680,9 +4678,9 @@ processChatCommand cxt nm = \case resolveSLink >>= groupLinkPlan Nothing where groupLinkPlan knownChat_ l' = do - (fd, cData@(ContactLinkData _ UserContactData {direct, owners, relays}), cReq) <- getShortLinkConnReq' nm user l' - groupSLinkData_ <- liftIO $ decodeLinkUserData cData - let planDomain = case nl of CTName ni -> Just (nameDomain ni); _ -> Nothing + (fd, ContactLinkData _ UserContactData {direct, owners, relays}, cReq, sLinkData_) <- getShortLinkConnReq' nm user l' + let groupSLinkData_ = shortLinkGroupData =<< sLinkData_ + planDomain = case nl of CTName ni -> Just (nameDomain ni); _ -> Nothing nc_ = NCMoved <$> knownChat_ knownMoved moved = NCMoved . movedChat moved <$> knownChat_ plan <- if @@ -4726,8 +4724,8 @@ processChatCommand cxt nm = \case Nothing -> (gPlan =<<) <$> getGroupToConnect db cxt user nl' resolveKnownGroup g = do l' <- resolveSLink - (FixedLinkData {rootKey = rk}, cData@(ContactLinkData _ UserContactData {owners}), cReq) <- getShortLinkConnReq' nm user l' - groupSLinkData_ <- liftIO $ decodeLinkUserData cData + (FixedLinkData {rootKey = rk}, ContactLinkData _ UserContactData {owners}, cReq, sLinkData_) <- getShortLinkConnReq' nm user l' + let groupSLinkData_ = shortLinkGroupData =<< sLinkData_ let ov = verifyLinkOwner rk owners l' sig_ glOwners = map (\OwnerAuth {ownerId, ownerKey} -> GroupLinkOwner {memberId = MemberId ownerId, memberKey = ownerKey}) owners (g', updated, _) <- case groupSLinkData_ of @@ -5348,7 +5346,7 @@ verifyEntityDomain user nm nameType SimplexDomainClaim {domain = StrJSON domain, where verifyDomainProof :: SimplexDomainProof -> ShortLinkContact -> CM Bool verifyDomainProof SimplexDomainProof {linkOwnerId, presHeader, signature} sLnk@(CSLContact _ ct srv key) = do - (FixedLinkData {rootKey}, ContactLinkData _ UserContactData {owners}, _) <- getShortLinkConnReq nm user sLnk + (FixedLinkData {rootKey}, ContactLinkData _ UserContactData {owners}, _, _) <- getShortLinkConnReq nm user sLnk let ownerKey_ = case linkOwnerId of Nothing -> Just rootKey Just (StrJSON oid) -> ownerKey <$> find (\OwnerAuth {ownerId} -> ownerId == oid) owners @@ -6502,7 +6500,7 @@ sendServiceRequestBytes nm user sendTarget requestTimeout signKey request = do case firstNameLink CCTContact (nrSimplexContact nr) of Just sLnk -> resolveShortLink sLnk Nothing -> throwChatError $ CESimplexDomainNotReady d SDENoValidLink - resolveShortLink sLnk = (\(_, _, cReq) -> cReq) <$> getShortLinkConnReq nm user sLnk + resolveShortLink sLnk = (\(_, _, cReq, _) -> cReq) <$> getShortLinkConnReq nm user sLnk assertDirectAllowed :: User -> MsgDirection -> Contact -> CMEventTag e -> CM () assertDirectAllowed user dir ct event = @@ -6697,7 +6695,7 @@ runRelayGroupLinkChecks user = do forM_ relayGroups $ \g@(GIK gInfo@GroupInfo {groupProfile = gp} _) -> flip catchAllErrors eToView $ do case publicGroup gp of Just PublicGroupProfile {groupLink = sLnk} -> do - (_, ContactLinkData _ UserContactData {relays = relayLinks}, _) <- + (_, ContactLinkData _ UserContactData {relays = relayLinks}, _, _) <- getShortLinkConnReq' NRMBackground user sLnk gLink_ <- withStore' $ \db -> runExceptT $ getGroupLink db user gInfo case gLink_ of diff --git a/src/Simplex/Chat/Library/Internal.hs b/src/Simplex/Chat/Library/Internal.hs index 17ca822ddb..a734a8c617 100644 --- a/src/Simplex/Chat/Library/Internal.hs +++ b/src/Simplex/Chat/Library/Internal.hs @@ -28,6 +28,7 @@ import Control.Monad.IO.Unlift import Control.Monad.Reader import Crypto.Random (ChaChaDRG) import qualified Data.Aeson as J +import qualified Data.Aeson.Types as JT import Data.Bifunctor (first) import Data.ByteString.Char8 (ByteString) import qualified Data.ByteString.Char8 as B @@ -1721,14 +1722,35 @@ groupLinkData (GIK gInfo@GroupInfo {groupProfile, groupSummary = GroupSummary {p restoreShortLink' :: ConnShortLink m -> CM (ConnShortLink m) restoreShortLink' l = (`restoreShortLink` l) <$> asks (shortLinkPresetServers . config) -getShortLinkConnReq' :: NetworkRequestMode -> User -> ConnShortLink m -> CM (FixedLinkData m, ConnLinkData m, ConnectionRequestUri m) +getShortLinkConnReq' :: NetworkRequestMode -> User -> ConnShortLink m -> CM (FixedLinkData m, ConnLinkData m, ConnectionRequestUri m, Maybe ShortLinkData) getShortLinkConnReq' nm user l = do l' <- restoreShortLink' l - withAgent $ \a -> getConnShortLink a nm (aUserId user) l' + (fd, cData, cReq) <- withAgent $ \a -> getConnShortLink a nm (aUserId user) l' + linkData <- liftIO $ decodeLinkUserData cData + case JT.parseMaybe (shortLinkDataP l) (fromMaybe J.Null linkData) of + Just sLinkData_ -> pure (fd, cData, cReq, sLinkData_) + Nothing -> throwChatError CEInvalidConnReq -getShortLinkConnReq :: NetworkRequestMode -> User -> ConnShortLink m -> CM (FixedLinkData m, ConnLinkData m, ConnectionRequestUri m) +shortLinkDataP :: ConnShortLink m -> J.Value -> JT.Parser (Maybe ShortLinkData) +shortLinkDataP l v = case l of + CSLInvitation {} -> optionalData $ contact <|> group notChannel + CSLContact _ ct _ _ -> case ct of + CCTContact -> optionalData $ contact <|> relayAddress + CCTGroup -> optionalData $ group notChannel <|> relayLink + CCTChannel -> Just <$> group isJust + CCTRelay -> optionalData $ relayAddress <|> contact + where + optionalData :: JT.Parser ShortLinkData -> JT.Parser (Maybe ShortLinkData) + optionalData p = if v == J.Null then pure Nothing else Just <$> p + contact = SLDContact <$> J.parseJSON v + relayLink = SLDRelayLink <$> J.parseJSON v + relayAddress = SLDRelayAddress <$> J.parseJSON v + group ok = SLDGroup <$> mfilter (\GroupShortLinkData {groupProfile = GroupProfile {publicGroup}} -> ok publicGroup) (J.parseJSON v) + notChannel = maybe True (\PublicGroupProfile {groupType} -> groupType /= GTChannel) + +getShortLinkConnReq :: NetworkRequestMode -> User -> ConnShortLink m -> CM (FixedLinkData m, ConnLinkData m, ConnectionRequestUri m, Maybe ShortLinkData) getShortLinkConnReq nm user l = do - r@(_, cData, _) <- getShortLinkConnReq' nm user l + r@(_, cData, _, _) <- getShortLinkConnReq' nm user l case cData of ContactLinkData _ UserContactData {direct, relays} | not direct && null relays -> throwChatError CEUnsupportedConnReq diff --git a/src/Simplex/Chat/Library/Subscriber.hs b/src/Simplex/Chat/Library/Subscriber.hs index 7cea9f4a8c..39d0971c7e 100644 --- a/src/Simplex/Chat/Library/Subscriber.hs +++ b/src/Simplex/Chat/Library/Subscriber.hs @@ -4615,8 +4615,8 @@ runRelayRequestWorker a Worker {doWork} = do memberPrivKey' <- case gks of GKRelayRequest {memberPrivKey} -> pure memberPrivKey _ -> throwChatError $ CEException "getLinkDataCreateRelayLink: group is not a relay request" - (FixedLinkData {linkEntityId, rootKey}, cData@(ContactLinkData _ UserContactData {owners}), _) <- getShortLinkConnReq' NRMBackground user reqGroupLink - liftIO (decodeLinkUserData cData) >>= \case + (FixedLinkData {linkEntityId, rootKey}, ContactLinkData _ UserContactData {owners}, _, sLinkData_) <- getShortLinkConnReq' NRMBackground user reqGroupLink + case shortLinkGroupData =<< sLinkData_ of Nothing -> throwChatError $ CEException "getLinkDataCreateRelayLink: no group link data" Just GroupShortLinkData {groupProfile = gp@GroupProfile {publicGroup}} -> do pg <- case (linkEntityId, publicGroup) of diff --git a/src/Simplex/Chat/Protocol.hs b/src/Simplex/Chat/Protocol.hs index 62b00bb46f..9848b497c4 100644 --- a/src/Simplex/Chat/Protocol.hs +++ b/src/Simplex/Chat/Protocol.hs @@ -1665,3 +1665,20 @@ data RelayAddressLinkData = RelayAddressLinkData {relayProfile :: RelayProfile} $(JQ.deriveJSON defaultJSON ''RelayAddressLinkData) +data ShortLinkData + = SLDContact ContactShortLinkData + | SLDGroup GroupShortLinkData + | SLDRelayLink RelayShortLinkData + | SLDRelayAddress RelayAddressLinkData + deriving (Show) + +shortLinkContactData :: ShortLinkData -> Maybe ContactShortLinkData +shortLinkContactData = \case + SLDContact d -> Just d + _ -> Nothing + +shortLinkGroupData :: ShortLinkData -> Maybe GroupShortLinkData +shortLinkGroupData = \case + SLDGroup d -> Just d + _ -> Nothing + diff --git a/tests/ChatTests/Groups.hs b/tests/ChatTests/Groups.hs index 34a56e9d86..526a9b6e93 100644 --- a/tests/ChatTests/Groups.hs +++ b/tests/ChatTests/Groups.hs @@ -14,7 +14,7 @@ module ChatTests.Groups where import ChatClient import ChatTests.DBUtils -import ChatTests.Profiles (addTestBadge, futureDate, issueTestBadge, testBadgeKeys) +import ChatTests.Profiles (addTestBadge, futureDate, invalidLink, issueTestBadge, setLinkType, setTestGroupLinkData, testBadgeKeys) import ChatTests.Utils import Control.Concurrent (threadDelay) import Control.Concurrent.Async (concurrently_) @@ -46,7 +46,7 @@ import Simplex.Chat.Types.Shared (GroupMemberRole (..), GroupAcceptance (..)) import Simplex.Chat.Types.UITheme (ChatLayout (..)) import Simplex.Messaging.Agent (createConnection, joinConnection, prepareConnectionToJoin, sendMessages, vrValue) import Simplex.Messaging.Agent.Env.SQLite -import Simplex.Messaging.Agent.Protocol (CreatedConnLink (..), SConnectionMode (..)) +import Simplex.Messaging.Agent.Protocol (CreatedConnLink (..), SConnectionMode (..), UserLinkData (..)) import Simplex.Messaging.Agent.RetryInterval import qualified Simplex.Messaging.Agent.Store.DB as DB import Simplex.Messaging.Agent.Store.DB (Binary (..), BoolInt (..)) @@ -324,7 +324,10 @@ chatGroupTests = do it "should preserve owner key in link data after profile update" testChannelOwnerKeyAfterLinkUpdate it "should keep channel profile from link data when joining" testChannelJoinKeepsLinkProfile it "should apply channel profile from link data when joining" testChannelJoinAppliesLinkProfile + it "should apply channel profile from link data to known channel in plan" testChannelPlanAppliesLinkProfile it "should check entity ID of channel link on refresh" testChannelLinkDataOtherChannel + it "should validate type of channel link" testChannelLinkAsOtherTypes + it "relay link checks should skip invalid channel link data" testRelayLinkChecksInvalidData it "should update channel preferences (signed)" testChannelUpdatePrefsSigned it "should change member role (signed)" testChannelChangeRoleSigned it "should block member for all (signed)" testChannelBlockMemberSigned @@ -3759,7 +3762,7 @@ sendMemberJoinRequest cc groupLink = gLink :: ShortLinkContact <- either fail pure $ strDecode (B.pack groupLink) (memberKey, _) <- atomically . C.generateKeyPair =<< C.newRandom let joinGroup = do - (_, _, cReq) <- getShortLinkConnReq NRMInteractive user gLink + (_, _, cReq, _) <- getShortLinkConnReq NRMInteractive user gLink (connId, _) <- withAgent $ \a -> prepareConnectionToJoin a (aUserId user) True cReq PQSupportOff dm <- encodeConnInfo $ XMember bobProfile (MemberId "member") (MemberKey memberKey) Nothing withAgent $ \a -> joinConnection a NRMInteractive (aUserId user) connId True cReq dm PQSupportOff SMSubscribe @@ -10903,6 +10906,57 @@ testChannelLinkDataOtherChannel ps = cath <## "Please ask your contact to check /version and update if needed." cath <## "To update run: curl -o- https://raw.githubusercontent.com/simplex-chat/simplex-chat/master/install.sh | bash" +testChannelLinkAsOtherTypes :: HasCallStack => TestParams -> IO () +testChannelLinkAsOtherTypes ps = + withNewTestChat ps "alice" aliceProfile $ \alice -> + withNewTestChatOpts ps relayTestOpts "bob" bobProfile $ \bob -> + withNewTestChat ps "cath" cathProfile $ \cath -> do + (shortLink, _) <- prepareChannel1Relay "team" alice bob + cath ##> ("/_connect plan 1 " <> shortLink) + cath <## "group link: ok to connect via relays" + _ <- getTermLine cath + forM_ ["/g#", "/a#"] $ \linkType -> do + cath ##> ("/_connect plan 1 " <> setLinkType "/c#" linkType shortLink) + invalidLink cath + cath ##> ("/relay test " <> setLinkType "/c#" "/r#" shortLink) + cath <## "relay test failed at RTSGetLink, error: ChatError {errorType = CEInvalidConnReq}" + +testChannelPlanAppliesLinkProfile :: HasCallStack => TestParams -> IO () +testChannelPlanAppliesLinkProfile ps = + withNewTestChat ps "alice" aliceProfile $ \alice -> + withNewTestChatOpts ps relayTestOpts "bob" bobProfile $ \bob -> + withNewTestChat ps "cath" cathProfile $ \cath -> do + (shortLink, fullLink) <- prepareChannel1Relay "team" alice bob + memberJoinChannel "team" [bob] [alice] shortLink fullLink cath + withCCTransaction cath $ \db -> + DB.execute_ db "UPDATE group_profiles SET short_descr = 'local copy'" + cath ##> ("/_connect plan 1 " <> shortLink <> " resolve=allGroups") + cath <## "group link: known group #team" + cath <## "use #team to send messages" + withCCTransaction cath (\db -> DB.query_ db "SELECT short_descr FROM group_profiles" :: IO [Only (Maybe T.Text)]) + `shouldReturn` [Only Nothing] + +testRelayLinkChecksInvalidData :: HasCallStack => TestParams -> IO () +testRelayLinkChecksInvalidData ps = + withNewTestChat ps "alice" aliceProfile $ \alice -> + withNewTestChatCfgOpts ps testCfg {relayChecksInterval = 3} relayTestOpts "bob" bobProfile $ \bob -> do + _ <- prepareChannel1Relay "team" alice bob + relayOwnStatus bob "active" + setTestGroupLinkData alice $ UserLinkData "" + invalidLink bob + relayOwnStatus bob "active" + bob ##> "/_stop" + bob <## "chat stopped" + where + relayOwnStatus :: HasCallStack => TestCC -> T.Text -> IO () + relayOwnStatus cc status = go (100 :: Int) + where + go n = do + [Only s] <- withCCTransaction cc $ \db -> DB.query_ db "SELECT relay_own_status FROM groups" :: IO [Only T.Text] + if s == status || n == 0 + then s `shouldBe` status + else threadDelay 100000 >> go (n - 1) + testChannelUpdatePrefsSigned :: HasCallStack => TestParams -> IO () testChannelUpdatePrefsSigned ps = withNewTestChat ps "alice" aliceProfile $ \alice -> @@ -12267,7 +12321,7 @@ sendUnsignedRelayInv cc relayAddress = fromMemberKey = Just $ MemberKey memberKey } joinRelay = do - (_, _, cReq) <- getShortLinkConnReq NRMInteractive user relayLink + (_, _, cReq, _) <- getShortLinkConnReq NRMInteractive user relayLink (connId, _) <- withAgent $ \a -> prepareConnectionToJoin a (aUserId user) True cReq PQSupportOff dm <- encodeConnInfo $ XGrpRelayInv inv withAgent $ \a -> joinConnection a NRMInteractive (aUserId user) connId True cReq dm PQSupportOff SMSubscribe diff --git a/tests/ChatTests/Profiles.hs b/tests/ChatTests/Profiles.hs index dff29295bf..e54ccac18e 100644 --- a/tests/ChatTests/Profiles.hs +++ b/tests/ChatTests/Profiles.hs @@ -19,6 +19,7 @@ import Control.Concurrent.Async (concurrently, concurrently_) import Control.Monad import Control.Monad.Except import Control.Monad.Reader (runReaderT) +import qualified Data.Aeson as J import qualified Data.Attoparsec.ByteString.Char8 as A import qualified Data.ByteString.Char8 as B import qualified Data.Text as T @@ -26,14 +27,15 @@ import Data.Time.Clock (UTCTime, addUTCTime, getCurrentTime, nominalDay) import Data.Time.Clock.POSIX (posixSecondsToUTCTime, utcTimeToPOSIXSeconds) import Data.Time.Format (defaultTimeLocale, formatTime) import qualified Data.Map.Strict as M +import ProtocolTests (testGroupProfile) import Simplex.Chat.Badges (BadgeCredential, BadgeInfo (..), BadgeProof, BadgePurchase (..), BadgeRequest (..), BadgeStatus (..), BadgeType (..), LocalBadge (..), ProofPresHeader (..), badgeProof, generateMasterKey, issueBadge, verifyPayment) import Simplex.Chat.Controller (CM, ChatConfig (..), ChatController (ChatController, smpAgent), ChatHooks (..), defaultChatHooks, storeCxt, withAgent) import Simplex.Chat.Library.Internal (encodeConnInfo, encodeShortLinkData, getShortLinkConnReq, groupMemberKey, redactedMemberProfile, sendDirectContactMessage, sendGroupMessage') import Simplex.Chat.Options (ChatOpts (..), CoreChatOpts (..)) -import Simplex.Chat.Protocol (ChatBinding (..), ChatMsgEvent (XContact, XInfo, XOk), ContactShortLinkData (ContactShortLinkData), LinkOwnerSig, MsgChatLink (..), MsgContent (..), encodeChatBinding) +import Simplex.Chat.Protocol (ChatBinding (..), ChatMsgEvent (XContact, XInfo, XOk), ContactShortLinkData (ContactShortLinkData), GroupShortLinkData (GroupShortLinkData), LinkOwnerSig, MsgChatLink (..), MsgContent (..), encodeChatBinding) import Simplex.Chat.Store.Groups (getGroupMembers) import Simplex.Chat.Store.Shared (createContact, getGroupInfoKeys) -import Simplex.Chat.Types (AgentConnId (..), ChatPeerType (..), ConnStatus (..), GroupId, GroupInfo (..), GroupInfoKeys (..), GroupMember (..), ImageData (..), Profile (..), GroupRejectionReason (..), ShortLinkContact, User (..), aUserId, fromLocalProfile, profileFromName, userProfileDirect, pattern VersionChat) +import Simplex.Chat.Types (AgentConnId (..), B64UrlByteString (..), ChatPeerType (..), ConnStatus (..), GroupId, GroupInfo (..), GroupInfoKeys (..), GroupMember (..), GroupProfile (publicGroup), GroupType (..), ImageData (..), Profile (..), PublicGroupProfile (PublicGroupProfile), GroupRejectionReason (..), ShortLinkContact, User (..), aUserId, fromLocalProfile, profileFromName, userProfileDirect, pattern VersionChat) import qualified Simplex.Messaging.Crypto as C import Simplex.Messaging.Crypto.BBS (BBSPublicKey, BBSSecretKey, bbsKeyGen) import Simplex.Messaging.Crypto.Ratchet (pattern PQSupportOff) @@ -41,7 +43,7 @@ import Simplex.Chat.Types.Shared (GroupMemberRole (..)) import Simplex.Chat.Types.UITheme import Simplex.Messaging.Agent (joinConnection, prepareConnectionToJoin, setConnShortLink) import Simplex.Messaging.Agent.Env.SQLite -import Simplex.Messaging.Agent.Protocol (SConnectionMode (..), UserConnLinkData (..)) +import Simplex.Messaging.Agent.Protocol (SConnectionMode (..), UserConnLinkData (..), UserContactData (..), UserLinkData (..)) import Simplex.Messaging.Agent.RetryInterval import qualified Simplex.Messaging.Agent.Store.DB as DB import Simplex.Messaging.Client (pattern NRMInteractive) @@ -116,6 +118,7 @@ chatProfileTests = do it "duplicate contact request from connected contact" testDuplicateContactRequestConnected it "contact requests with invalid or unsupported messages" testContactRequestsInvalidMessages it "reject contact and delete contact link" testRejectContactAndDeleteUserContact + it "reject contact and notify the sender" testRejectContactNotifySender it "keep connection requests when contact link deleted" testKeepConnectionRequests it "connected contact works when contact link deleted" testContactLinkDeletedConnectedContactWorks it "auto-reply message" testAutoReplyMessage @@ -182,6 +185,17 @@ chatProfileTests = do it "should connect via contact address" testShortLinkContactAddress it "should share contact address via chat" testShareAddressViaChat it "should join group" testShortLinkJoinGroup + describe "should validate link type" $ do + it "group link as address" $ testGroupLinkAsType "/a#" "connect/group-link-as-address" + it "group link as channel" $ testGroupLinkAsType "/c#" "connect/group-link-as-channel" + it "group link as relay address" testGroupLinkAsRelay + it "relay address as address, address as relay address" testRelayAddressLinkTypes + it "address as group link and channel" testAddressAsGroupLink + it "group link as address in contact profile" testGroupLinkInContactProfile + it "contact data in group link" testContactDataInGroupLink + it "channel data in invitation" testChannelDataInInvitation + it "invitation, address and group link with their data" testLinksWithTheirData + it "invitation and channel link without data" testLinksWithoutData describe "short links with attached data" shortLinkTests describe "client services" $ do it "should create user as a service, disable and re-enable" testClientService @@ -1167,13 +1181,22 @@ sendTestMemberProof cc groupId proof = runExceptT (sendGroupMessage' user g members (XInfo p (Just $ groupMemberKey gks))) `runReaderT` chatController cc >>= either (fail . show) (\_ -> pure ()) -setTestInvLinkData :: TestCC -> ContactShortLinkData -> IO () +setTestInvLinkData :: J.ToJSON a => TestCC -> a -> IO () setTestInvLinkData cc linkData = do [Only (AgentConnId connId)] <- withCCTransaction cc $ \db -> DB.query_ db "SELECT agent_conn_id FROM connections" let ChatController {smpAgent} = chatController cc runExceptT (setConnShortLink smpAgent NRMInteractive connId SCMInvitation (UserInvLinkData $ encodeShortLinkData linkData) Nothing False Nothing) >>= either (fail . show) (\_ -> pure ()) +setTestGroupLinkData :: TestCC -> UserLinkData -> IO () +setTestGroupLinkData cc linkData = do + [Only (AgentConnId connId)] <- withCCTransaction cc $ \db -> + DB.query_ db "SELECT c.agent_conn_id FROM connections c JOIN user_contact_links l ON l.user_contact_link_id = c.user_contact_link_id WHERE l.group_id IS NOT NULL" + let ChatController {smpAgent} = chatController cc + contactData = UserContactData {direct = True, owners = [], relays = [], userData = linkData, ratchetKeys = Nothing} + runExceptT (setConnShortLink smpAgent NRMInteractive connId SCMContact (UserContactLinkData contactData) Nothing False Nothing) + >>= either (fail . show) (\_ -> pure ()) + testUpdateProfileImage :: HasCallStack => TestParams -> IO () testUpdateProfileImage = testChat2 aliceProfile bobProfile $ @@ -1871,7 +1894,7 @@ sendAddressRequest cc address encodeInfo = withCCUser cc $ \user -> do sLink <- either fail pure $ strDecode @ShortLinkContact (B.pack address) let sendRequest = do - (_, _, cReq) <- getShortLinkConnReq NRMInteractive user sLink + (_, _, cReq, _) <- getShortLinkConnReq NRMInteractive user sLink (connId, _) <- withAgent $ \a -> prepareConnectionToJoin a (aUserId user) True cReq PQSupportOff connInfo <- encodeInfo withAgent $ \a -> joinConnection a NRMInteractive (aUserId user) connId True cReq connInfo PQSupportOff SMSubscribe @@ -1903,6 +1926,26 @@ testRejectContactAndDeleteUserContact = testChat3 aliceProfile bobProfile cathPr cath ##> ("/c " <> cLink) cath <## "error: connection authorization failed - this could happen if connection was deleted, secured with different credentials, or due to a bug - please re-create the connection" +testRejectContactNotifySender :: HasCallStack => TestParams -> IO () +testRejectContactNotifySender = + testChat2 aliceProfile bobProfile $ \alice bob -> do + alice ##> "/ad pq_ratchet=on" + (shortLink, fullLink) <- getContactLinks alice True + bob ##> ("/_connect plan 1 " <> shortLink) + bob <## "contact address: ok to connect" + contactSLinkData <- getTermLine bob + bob ##> ("/_prepare contact 1 " <> fullLink <> " " <> shortLink <> " " <> contactSLinkData) + bob <## "alice: contact is prepared" + bob ##> "/_connect contact @2" + bob <## "alice: connection started" + alice <## "bob (Bob) wants to connect to you!" + alice <## "to accept: /ac bob" + alice <## "to reject: /rc bob (the sender will NOT be notified)" + alice ##> "/rc bob notify" + alice <## "bob: contact request rejected" + bob <## "alice: contact request rejected" + apiFixture "connect/request-rejected" bob [] FixtureRequests {frMarkdown = [""], frUris = [], frCommands = ["/_get chats 1 pcc=on"]} + testKeepConnectionRequests :: HasCallStack => TestParams -> IO () testKeepConnectionRequests = testChat3 aliceProfile bobProfile cathProfile $ \alice bob cath -> do @@ -4268,6 +4311,133 @@ testShortLinkJoinGroup = cc <## "#team: you joined the group" ] +testGroupLinkAsType :: HasCallStack => T.Text -> String -> TestParams -> IO () +testGroupLinkAsType linkType fixture = + testChat2 aliceProfile bobProfile $ \alice bob -> do + link <- setLinkType "/g#" linkType <$> createGroupWithLink alice + bob ##> ("/_connect plan 1 " <> link) + invalidLink bob + apiFixture fixture bob [(link, "GROUP_LINK")] FixtureRequests {frMarkdown = [link], frUris = [], frCommands = ["/_connect plan 1 " <> link]} + bob ##> ("/c " <> link) + invalidLink bob + +testGroupLinkAsRelay :: HasCallStack => TestParams -> IO () +testGroupLinkAsRelay = + testChat2 aliceProfile bobProfile $ \alice bob -> do + link <- setLinkType "/g#" "/r#" <$> createGroupWithLink alice + bob ##> ("/relay test " <> link) + bob <## "relay test failed at RTSGetLink, error: ChatError {errorType = CEInvalidConnReq}" + +testRelayAddressLinkTypes :: HasCallStack => TestParams -> IO () +testRelayAddressLinkTypes ps = + withNewTestChat ps "alice" aliceProfile $ \alice -> + withNewTestChatOpts ps relayTestOpts "bob" bobProfile $ \bob -> + withNewTestChat ps "cath" cathProfile $ \cath -> do + bob ##> "/ad" + (relayAddress, _) <- getContactLinks bob True + cath ##> "/ad" + (address, _) <- getContactLinks cath True + alice ##> ("/relay test " <> setLinkType "/r#" "/a#" relayAddress) + alice <## "relay test passed, profile: bob (Bob)" + alice ##> ("/relay test " <> setLinkType "/a#" "/r#" address) + alice <##. "relay test failed at RTSDecodeLink, error: " + +testAddressAsGroupLink :: HasCallStack => TestParams -> IO () +testAddressAsGroupLink = + testChat2 aliceProfile bobProfile $ \alice bob -> do + alice ##> "/ad" + (address, _) <- getContactLinks alice True + forM_ ["/g#", "/c#"] $ \linkType -> do + let link = setLinkType "/a#" linkType address + bob ##> ("/_connect plan 1 " <> link) + invalidLink bob + bob ##> ("/c " <> link) + invalidLink bob + +testGroupLinkInContactProfile :: HasCallStack => TestParams -> IO () +testGroupLinkInContactProfile = + testChat2 aliceProfile bobProfile $ \alice bob -> do + link <- createGroupWithLink alice + void $ withCCUser bob $ \user -> withCCTransaction bob $ \db -> + runExceptT $ createContact db (storeCxt $ chatController bob) user aliceProfile {contactLink = either error Just $ strDecode $ B.pack link} + bob ##> "/_connect contact 1 2" + invalidLink bob + +testContactDataInGroupLink :: HasCallStack => TestParams -> IO () +testContactDataInGroupLink = + testChat2 aliceProfile bobProfile $ \alice bob -> do + link <- createGroupWithLink alice + setTestGroupLinkData alice $ encodeShortLinkData $ ContactShortLinkData aliceProfile Nothing False Nothing Nothing + bob ##> ("/_connect plan 1 " <> link) + invalidLink bob + +testChannelDataInInvitation :: HasCallStack => TestParams -> IO () +testChannelDataInInvitation = + testChat2 aliceProfile bobProfile $ \alice bob -> do + alice ##> "/_connect 1" + (link, _) <- getInvitations alice + setTestInvLinkData alice $ GroupShortLinkData testGroupProfile {publicGroup = Just channel} Nothing + bob ##> ("/_connect plan 1 " <> link) + invalidLink bob + where + channel = PublicGroupProfile GTChannel channelLink (B64UrlByteString "channel") Nothing + channelLink = either error id $ strDecode "https://localhost/c#Pz9qz7ZVljMofoRxiDDpL_w2DZSazK8IgafxqnWKv6Y" + +testLinksWithTheirData :: HasCallStack => TestParams -> IO () +testLinksWithTheirData = + testChat2 aliceProfile bobProfile $ \alice bob -> do + alice ##> "/_connect 1" + (invitation, _) <- getInvitations alice + setTestInvLinkData alice $ GroupShortLinkData testGroupProfile Nothing + bob ##> ("/_connect plan 1 " <> invitation) + bob <## "invitation link: ok to connect" + _ <- getTermLine bob + alice ##> "/ad" + (address, _) <- getContactLinks alice True + bob ##> ("/_connect plan 1 " <> address) + bob <## "contact address: ok to connect" + _ <- getTermLine bob + link <- createGroupWithLink alice + bob ##> ("/_connect plan 1 " <> link) + bob <## "group link: ok to connect directly" + _ <- getTermLine bob + setTestGroupLinkData alice $ UserLinkData "" + bob ##> ("/_connect plan 1 " <> link) + bob <## "group link: ok to connect directly" + void $ getTermLine bob + +testLinksWithoutData :: HasCallStack => TestParams -> IO () +testLinksWithoutData = + testChat2 aliceProfile bobProfile $ \alice bob -> do + alice ##> "/_connect 1" + (invitation, _) <- getInvitations alice + setTestInvLinkData alice J.Null + bob ##> ("/_connect plan 1 " <> invitation) + bob <## "invitation link: ok to connect" + _ <- getTermLine bob + link <- createGroupWithLink alice + setTestGroupLinkData alice $ UserLinkData "" + bob ##> ("/_connect plan 1 " <> setLinkType "/g#" "/c#" link) + invalidLink bob + +createGroupWithLink :: HasCallStack => TestCC -> IO String +createGroupWithLink cc = do + cc ##> "/g team" + cc <## "group #team is created" + cc <## "to add members use /a team or /create link #team" + cc ##> "/create link #team" + fst <$> getGroupLinks cc "team" GRMember True + +setLinkType :: T.Text -> T.Text -> String -> String +setLinkType from to = T.unpack . T.replace from to . T.pack + +invalidLink :: HasCallStack => TestCC -> IO () +invalidLink cc = do + cc <## "" + cc <## "Connection link is invalid, possibly it was created in a previous version." + cc <## "Please ask your contact to check /version and update if needed." + cc <##. "To update run: " + testShortLinkInvitationPrepareContact :: HasCallStack => TestParams -> IO () testShortLinkInvitationPrepareContact = testChat2 aliceProfile bobProfile test where diff --git a/tests/ChatTests/Utils.hs b/tests/ChatTests/Utils.hs index 3769f41edd..63b6864dc1 100644 --- a/tests/ChatTests/Utils.hs +++ b/tests/ChatTests/Utils.hs @@ -1055,7 +1055,7 @@ stableJSON = \case v -> v where stableField k v - | k `elem` ["createdAt", "updatedAt", "chatTs", "userMemberProfileSentAt", "itemTs"] = J.String "1970-01-01T00:00:00Z" - | k `elem` ["agentConnId", "xContactId", "connFullLink", "connShortLink", "contactLink", "groupLink", "viaGroupLinkUri", "simplexUri", "memberId", "memberPubKey", "publicGroupId", "businessId", "customerId", "itemSharedMsgId"] = J.String $ JK.toText k + | k `elem` ["createdAt", "updatedAt", "chatTs", "userMemberProfileSentAt", "itemTs", "deletedTs", "fileExpires"] = J.String "1970-01-01T00:00:00Z" + | k `elem` ["agentConnId", "xContactId", "connFullLink", "connShortLink", "contactLink", "groupLink", "viaGroupLinkUri", "simplexUri", "memberId", "memberPubKey", "publicGroupId", "businessId", "customerId", "itemSharedMsgId", "fileDescrText"] = J.String $ JK.toText k | k == "groupRelays", J.Array a <- v = J.Array $ J.String "groupRelay" <$ a | otherwise = stableJSON v diff --git a/tests/fixtures/api/connect/group-link-as-address.json b/tests/fixtures/api/connect/group-link-as-address.json new file mode 100644 index 0000000000..6eaf3e7abf --- /dev/null +++ b/tests/fixtures/api/connect/group-link-as-address.json @@ -0,0 +1,30 @@ +{ + "commands": { + "/_connect plan 1 GROUP_LINK": { + "error": { + "errorType": { + "type": "invalidConnReq" + }, + "type": "error" + } + } + }, + "markdown": { + "GROUP_LINK": { + "formattedText": [ + { + "format": { + "linkType": "contact", + "simplexUri": "simplexUri", + "smpHosts": [ + "localhost" + ], + "type": "simplexLink" + }, + "text": "GROUP_LINK" + } + ] + } + }, + "uris": {} +} diff --git a/tests/fixtures/api/connect/group-link-as-channel.json b/tests/fixtures/api/connect/group-link-as-channel.json new file mode 100644 index 0000000000..c32c496b1c --- /dev/null +++ b/tests/fixtures/api/connect/group-link-as-channel.json @@ -0,0 +1,30 @@ +{ + "commands": { + "/_connect plan 1 GROUP_LINK": { + "error": { + "errorType": { + "type": "invalidConnReq" + }, + "type": "error" + } + } + }, + "markdown": { + "GROUP_LINK": { + "formattedText": [ + { + "format": { + "linkType": "channel", + "simplexUri": "simplexUri", + "smpHosts": [ + "localhost" + ], + "type": "simplexLink" + }, + "text": "GROUP_LINK" + } + ] + } + }, + "uris": {} +} diff --git a/tests/fixtures/api/connect/request-rejected.json b/tests/fixtures/api/connect/request-rejected.json new file mode 100644 index 0000000000..84e749426a --- /dev/null +++ b/tests/fixtures/api/connect/request-rejected.json @@ -0,0 +1,318 @@ +{ + "commands": { + "/_get chats 1 pcc=on": { + "result": { + "chats": [ + { + "chatInfo": { + "contact": { + "activeConn": { + "agentConnId": "agentConnId", + "authErrCounter": 0, + "connChatVersion": 9, + "connId": 1, + "connLevel": 0, + "connStatus": { + "type": "joined" + }, + "connType": "contact", + "contactConnInitiated": true, + "createdAt": "1970-01-01T00:00:00Z", + "entityId": 2, + "localAlias": "", + "peerChatVRange": { + "maxVersion": 1, + "minVersion": 1 + }, + "pqEncryption": true, + "pqSupport": true, + "quotaErrCounter": 0, + "viaGroupLink": false, + "xContactId": "xContactId" + }, + "chatDeleted": false, + "chatSettings": { + "enableNtfs": "all", + "favorite": false + }, + "chatTags": [], + "chatTs": "1970-01-01T00:00:00Z", + "contactGrpInvSent": false, + "contactId": 2, + "contactStatus": "rejected", + "contactUsed": true, + "createdAt": "1970-01-01T00:00:00Z", + "localDisplayName": "alice", + "mergedPreferences": { + "calls": { + "contactPreference": { + "allow": "yes" + }, + "enabled": { + "forContact": true, + "forUser": true + }, + "userPreference": { + "preference": { + "allow": "yes" + }, + "type": "user" + } + }, + "commands": [], + "files": { + "contactPreference": { + "allow": "always" + }, + "enabled": { + "forContact": true, + "forUser": true + }, + "userPreference": { + "preference": { + "allow": "always" + }, + "type": "user" + } + }, + "fullDelete": { + "contactPreference": { + "allow": "no" + }, + "enabled": { + "forContact": false, + "forUser": false + }, + "userPreference": { + "preference": { + "allow": "no" + }, + "type": "user" + } + }, + "reactions": { + "contactPreference": { + "allow": "yes" + }, + "enabled": { + "forContact": true, + "forUser": true + }, + "userPreference": { + "preference": { + "allow": "yes" + }, + "type": "user" + } + }, + "sessions": { + "contactPreference": { + "allow": "no" + }, + "enabled": { + "forContact": false, + "forUser": false + }, + "userPreference": { + "preference": { + "allow": "no" + }, + "type": "user" + } + }, + "timedMessages": { + "contactPreference": { + "allow": "yes" + }, + "enabled": { + "forContact": true, + "forUser": true + }, + "userPreference": { + "preference": { + "allow": "yes" + }, + "type": "user" + } + }, + "voice": { + "contactPreference": { + "allow": "yes" + }, + "enabled": { + "forContact": true, + "forUser": true + }, + "userPreference": { + "preference": { + "allow": "yes" + }, + "type": "user" + } + } + }, + "preparedContact": { + "connLinkToConnect": { + "connFullLink": "connFullLink", + "connShortLink": "connShortLink" + }, + "uiConnLinkType": "con" + }, + "profile": { + "displayName": "alice", + "fullName": "", + "localAlias": "", + "preferences": { + "calls": { + "allow": "yes" + }, + "commands": [], + "files": { + "allow": "always" + }, + "fullDelete": { + "allow": "no" + }, + "reactions": { + "allow": "yes" + }, + "sessions": { + "allow": "no" + }, + "timedMessages": { + "allow": "yes" + }, + "voice": { + "allow": "yes" + } + }, + "profileId": 2, + "shortDescr": "Alice" + }, + "updatedAt": "1970-01-01T00:00:00Z", + "userPreferences": {} + }, + "type": "direct" + }, + "chatItems": [ + { + "chatDir": { + "type": "directRcv" + }, + "content": { + "enabled": { + "forContact": true, + "forUser": true + }, + "feature": "calls", + "type": "rcvChatFeature" + }, + "mentions": {}, + "meta": { + "createdAt": "1970-01-01T00:00:00Z", + "deletable": false, + "editable": false, + "hasLink": false, + "itemEdited": false, + "itemId": 7, + "itemStatus": { + "type": "rcvRead" + }, + "itemText": "Audio/video calls: enabled", + "itemTs": "1970-01-01T00:00:00Z", + "showGroupAsSender": false, + "updatedAt": "1970-01-01T00:00:00Z", + "userMention": false + }, + "reactions": [] + } + ], + "chatStats": { + "minUnreadItemId": 0, + "reportsCount": 0, + "unreadChat": false, + "unreadCount": 0, + "unreadMentions": 0 + } + } + ], + "type": "apiChats", + "user": { + "activeOrder": 1, + "activeUser": true, + "agentUserId": "1", + "autoAcceptGroupInvitations": false, + "autoAcceptMemberContacts": false, + "clientService": false, + "fullPreferences": { + "calls": { + "allow": "yes" + }, + "commands": [], + "files": { + "allow": "always" + }, + "fullDelete": { + "allow": "no" + }, + "reactions": { + "allow": "yes" + }, + "sessions": { + "allow": "no" + }, + "timedMessages": { + "allow": "yes" + }, + "voice": { + "allow": "yes" + } + }, + "localDisplayName": "bob", + "profile": { + "displayName": "bob", + "fullName": "", + "image": "data:image/png;base64,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", + "localAlias": "", + "preferences": { + "calls": { + "allow": "yes" + }, + "commands": [], + "files": { + "allow": "always" + }, + "fullDelete": { + "allow": "no" + }, + "reactions": { + "allow": "yes" + }, + "sessions": { + "allow": "no" + }, + "timedMessages": { + "allow": "yes" + }, + "voice": { + "allow": "yes" + } + }, + "profileId": 1, + "shortDescr": "Bob" + }, + "sendRcptsContacts": true, + "sendRcptsSmallGroups": true, + "showNtfs": true, + "userChatRelay": false, + "userContactId": 1, + "userId": 1 + } + } + } + }, + "markdown": { + "": {} + }, + "uris": {} +} From e283e5f3d4e50929029d573dd7ff2b6388f2ffa0 Mon Sep 17 00:00:00 2001 From: "Evgeny @ SimpleX Chat" <259188159+evgeny-simplex@users.noreply.github.com> Date: Thu, 19 Nov 2026 07:31:55 +0000 Subject: [PATCH 02/20] libs: nodejs 7.1.4 (#8263) * nodejs: live test reads the updated item under the key of 7.1 and 7.2 cores * libs: nodejs 7.1.4 --- packages/simplex-chat-nodejs/package.json | 2 +- packages/simplex-chat-nodejs/src/release.ts | 14 +++++++------- packages/simplex-chat-nodejs/tests/live.test.ts | 9 +++++++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/packages/simplex-chat-nodejs/package.json b/packages/simplex-chat-nodejs/package.json index c7430c247a..25222fbfcd 100644 --- a/packages/simplex-chat-nodejs/package.json +++ b/packages/simplex-chat-nodejs/package.json @@ -1,6 +1,6 @@ { "name": "simplex-chat", - "version": "7.1.3", + "version": "7.1.4", "main": "dist/index.js", "types": "dist/index.d.ts", "gypfile": false, diff --git a/packages/simplex-chat-nodejs/src/release.ts b/packages/simplex-chat-nodejs/src/release.ts index 7587633550..a9dd64788a 100644 --- a/packages/simplex-chat-nodejs/src/release.ts +++ b/packages/simplex-chat-nodejs/src/release.ts @@ -1,16 +1,16 @@ // Written by scripts/ci/packages_release.py from the simplex-chat-libs releases. -export const LIBS_RELEASE = "core-7.1.3.0" +export const LIBS_RELEASE = "core-7.1.4.0" export const ADDON_RELEASE: string | undefined = "nodejs-addon-cce06d8" export const SHA256: {readonly [asset: string]: string} = { - "simplex-chat-libs-linux-aarch64.zip": "46e296417de8cddc0d6f800d7c634dec410a1af20ea38ff31f224ef388aaeb00", - "simplex-chat-libs-linux-x86_64-postgres.zip": "ea89b4e95836c79c887cc13a2dc9fc66e319b21ee4148ca38817539657601050", - "simplex-chat-libs-linux-x86_64.zip": "12b6ea97c64a5ea53a66f47e827dc8c0d6bc767fd44b22aab47786ac90e91d01", - "simplex-chat-libs-macos-aarch64.zip": "b7612b05cd17267f4e24efacfd16fa4a9f9b0c39b34c2f52465e34395492a452", - "simplex-chat-libs-macos-x86_64.zip": "ce7a9a2be0cd0e6782902d8ce4420e8660e4e2360d7fc0248584a0163f1a236d", - "simplex-chat-libs-windows-x86_64.zip": "a9ed55c82753d57cfddaddee78cc989b0edf3fe5fe08d7214e6f84ab43609999", + "simplex-chat-libs-linux-aarch64.zip": "5ab4be63353e49b0d24b70b154745d2e45c288903e0c17078b8f957e3633ca6b", + "simplex-chat-libs-linux-x86_64-postgres.zip": "77cf1e2c9a75b723ce18abc5c02873dbe08d37dca069a0d815dca3095143439a", + "simplex-chat-libs-linux-x86_64.zip": "d4888149b29fd9d4ca690d2a8f3763dde477b77fe1ea6927d5990137bceeab6b", + "simplex-chat-libs-macos-aarch64.zip": "32450fef49e2e38db33783fe0761f4af16463a5cd7a204f8c41875909db60b56", + "simplex-chat-libs-macos-x86_64.zip": "3ab5efc5bbc5b8ddfa6a24a4d79e318fff3df0dd4c3334c5cd9acb1b0288101c", + "simplex-chat-libs-windows-x86_64.zip": "c88e185442cb738d53d2dc2d5408c4cb9efedaa910c677ec10e8dd74c12b0223", "simplex-chat-nodejs-linux-aarch64.node": "de09cf5653772370fbd1ab2b046a9a2b68f3d2a078103befb2d4eb3e11748ebb", "simplex-chat-nodejs-linux-x86_64.node": "fda77e39a5d38b1132a6a04ef9f9cd2c939a429e709f28c81c3777684ba73603", "simplex-chat-nodejs-macos-aarch64.node": "3da7ae0064c151a0508d3f0a208a9af5647a8113df8d9164f76c786a882d68df", diff --git a/packages/simplex-chat-nodejs/tests/live.test.ts b/packages/simplex-chat-nodejs/tests/live.test.ts index 526e230c51..beb80fa445 100644 --- a/packages/simplex-chat-nodejs/tests/live.test.ts +++ b/packages/simplex-chat-nodejs/tests/live.test.ts @@ -39,8 +39,13 @@ describeIfSmpServerAvailable("Live message tests (use local SMP server)", () => const timeout = 10000 const received = (check: (meta: T.CIMeta) => boolean) => bob.wait("newChatItems", ({chatItems}) => chatItems.some(({chatItem: {meta}}) => check(meta)), timeout) + const updatedItem = (event: {chatItemUpdate?: {chatItem: T.ChatItem}; chatItem?: {chatItem: T.ChatItem}}) => + (event.chatItemUpdate ?? event.chatItem)?.chatItem const updated = (check: (meta: T.CIMeta) => boolean) => - bob.wait("chatItemUpdated", ({chatItemUpdate: {chatItem: {meta}}}) => check(meta), timeout) + bob.wait("chatItemUpdated", event => { + const item = updatedItem(event) + return item !== undefined && check(item.meta) + }, timeout) const live = new api.LiveMessage(alice, CT.Direct, bobContact.contactId, 500) const started = received(meta => meta.itemLive === true && meta.itemText === "") @@ -52,7 +57,7 @@ describeIfSmpServerAvailable("Live message tests (use local SMP server)", () => expect(await updatedLive).toBeDefined() const finalized = updated(meta => meta.itemId === itemId && meta.itemLive === false && meta.itemText === "Hello world") await live.end("Hello world") - expect((await finalized)?.chatItemUpdate.chatItem.meta.itemEdited).toBe(false) + expect(updatedItem((await finalized)!)?.meta.itemEdited).toBe(false) const emptyStarted = received(meta => meta.itemLive === true && meta.itemText === "") live.update("") From b5ee352c8f25352b078ac08831a3e184f0d3d9f3 Mon Sep 17 00:00:00 2001 From: "Evgeny @ SimpleX Chat" <259188159+evgeny-simplex@users.noreply.github.com> Date: Thu, 19 Nov 2026 13:55:59 +0000 Subject: [PATCH 03/20] mcp: session states coloured by what they need, green for working (#8265) * mcp: session states in the colours of what they need: green working, orange waiting in the chat, red idle * mcp: the space after waiting for you in the tests * mcp: a session with a background command shows working in the background --- packages/simplex-chat-mcp/REFERENCE.md | 20 +++++++------ packages/simplex-chat-mcp/TESTING.md | 2 +- packages/simplex-chat-mcp/spec/api.md | 9 +++--- packages/simplex-chat-mcp/spec/flows.md | 6 ++-- packages/simplex-chat-mcp/src/hub.ts | 10 +++---- .../simplex-chat-mcp/test/e2e/service.test.ts | 6 ++-- .../test/unit/sessions.test.ts | 28 +++++++++---------- 7 files changed, 42 insertions(+), 39 deletions(-) diff --git a/packages/simplex-chat-mcp/REFERENCE.md b/packages/simplex-chat-mcp/REFERENCE.md index 2a2dc02fbe..557b0092be 100644 --- a/packages/simplex-chat-mcp/REFERENCE.md +++ b/packages/simplex-chat-mcp/REFERENCE.md @@ -576,18 +576,20 @@ Only you see this link: it never enters Claude's context or tool results. Scan t After the first owner joins, Claude posts the list of sessions in the Main group, after its greeting: ``` -🟠 3 · simplex-chat: working -🔵 6 · website: waiting for you, 2 approvals -🔵 7 · docs: waiting for you in Claude Code -🟢 8 · app: idle +🟢 3 · simplex-chat: working +🟠 6 · website: waiting for you, 2 approvals +⛔️ 7 · docs: waiting for you in Claude Code +🔴 8 · app: idle +⚙️ 9 · api: working in the background ⚪ Not running: 5 · bio, 4 · notes, 2 · openclaw, 1 · first ``` -- A session is running while its Claude Code runs, or while cards wait for a decision in its group. Each running session has a line, by number: - - `🔵 N · NAME: waiting for you, K approvals`: K cards wait in the session's group. A tool-use card counts only while Claude Code shows its permission dialog, or while Claude Code's state can't be read. - - `🔵 N · NAME: waiting for you in Claude Code`: Claude Code waits for an answer in its own window, such as a dialog. - - `🟠 N · NAME: working`: Claude Code works on a turn, or a subagent works for it. - - `🟢 N · NAME: idle`: Claude Code waits for the next prompt, also while a background command runs. +- A session is running while its Claude Code runs, or while cards wait for a decision in its group. Each running session has a line, by number. Green is the state to keep: + - `🟢 N · NAME: working`: Claude Code works on a turn, or a subagent works for it. + - `🟠 N · NAME: waiting for you, K approvals`: K cards wait in the session's group, for a decision in the chat. A tool-use card counts only while Claude Code shows its permission dialog, or while Claude Code's state can't be read. + - `⛔️ N · NAME: waiting for you in Claude Code`: Claude Code waits for an answer in its own window, such as a dialog, which the chat can't give. + - `⚙️ N · NAME: working in the background`: Claude Code waits for the next prompt while a background command runs. The command's end starts a turn without a prompt. + - `🔴 N · NAME: idle`: Claude Code waits for the next prompt, and nothing runs. - `▶️ N · NAME: running`: Claude Code's state can't be read. - The last line names every other session of the data folder, newest first. Without any session, the list is `No sessions.` - The states are Claude Code's own: the plugin reads them from Claude Code's record of its process, `sessions/PID.json` in `CLAUDE_CONFIG_DIR` or `~/.claude`. diff --git a/packages/simplex-chat-mcp/TESTING.md b/packages/simplex-chat-mcp/TESTING.md index b0b48d50f1..4c76c9b070 100644 --- a/packages/simplex-chat-mcp/TESTING.md +++ b/packages/simplex-chat-mcp/TESTING.md @@ -245,7 +245,7 @@ In a session started as in step 2 above: - The plugin's folder had no `node_modules/.package-lock.json`. - With the same keys in `.claude/settings.json` of the folder, and without `--settings`, the run had no tool of the plugin. 19. Start Claude Code as in step 2 with an empty data folder and a machine name: `SIMPLEX_MCP_HOME=/tmp/simplex-mcp-fresh SIMPLEX_MCP_MACHINE=laptop claude --plugin-dir /tmp/simplex-plugin --dangerously-load-development-channels plugin:simplex@inline`. Exit it before the QR code shows. Start it again the same way. The QR code shows within seconds, for the group "Claude Control - laptop". Stop that service: `kill $(cat /tmp/simplex-mcp-fresh/service.lock)`. -20. With the session of step 2 running and a second session started as in step 2 in another folder, the Main group shows the list of sessions, one line for each. Ask Claude to run `sleep 20` with Bash: its line shows 🟠 working. Send `Run ls with Bash.` in its group: the line shows 🔵 waiting for you, 1 approval; tap `/approve N`, and it shows 🟠 working, then 🟢 idle when the turn ends. Press Esc during a turn: the line shows 🟢 idle within 2 seconds, although Claude Code runs no Stop hook. Ask Claude to ask you a question with AskUserQuestion: the line shows 🔵 waiting for you in Claude Code. Exit the second Claude Code: its session moves into the last line, `⚪ Not running: `. `/sessions` replies with the same text. +20. With the session of step 2 running and a second session started as in step 2 in another folder, the Main group shows the list of sessions, one line for each. Ask Claude to run `sleep 20` with Bash: its line shows 🟢 working. Send `Run ls with Bash.` in its group: the line shows 🟠 waiting for you, 1 approval; tap `/approve N`, and it shows 🟢 working, then 🔴 idle when the turn ends. Press Esc during a turn: the line shows 🔴 idle within 2 seconds, although Claude Code runs no Stop hook. Ask Claude to run `sleep 60` with Bash in the background: after its turn ends, the line shows ⚙️ working in the background until the command ends. Ask Claude to ask you a question with AskUserQuestion: the line shows ⛔️ waiting for you in Claude Code. Exit the second Claude Code: its session moves into the last line, `⚪ Not running: `. `/sessions` replies with the same text. 21. Send `Read README.md, say what you are doing before each step, and then summarize it in 30 lines.` in the group. An empty message from Claude appears at once, as a reply to your message, with typing dots. Claude's first remark or step fills it, and each later remark and the answer appear from their first line, growing by whole lines, at most every 3 seconds. The steps' lines appear between them. Each message ends without an edited mark. The answer's message ends with `Done in`, the turn's time and tokens in small print, and the chat list shows the answer. In the terminal, Claude's text appears by whole lines. 22. Send `Name a fruit.` in the group, and after the answer edit that message to `Name a vegetable.` Claude answers with a vegetable, as a reply to your message. In the transcript, the second tag has the same `item` as the first and `edited="true"`. Edit it into `/list`, and nothing happens. Turn on live mode in the app, type `Name a colour.` slowly, and send it. Claude answers once, after you send it, and the transcript has one tag with `Name a colour.` 23. Stop the service: `kill $(cat /tmp/simplex-mcp-test/service.lock)`. diff --git a/packages/simplex-chat-mcp/spec/api.md b/packages/simplex-chat-mcp/spec/api.md index 30c8a667c0..1833f4fa72 100644 --- a/packages/simplex-chat-mcp/spec/api.md +++ b/packages/simplex-chat-mcp/spec/api.md @@ -735,10 +735,11 @@ Posts: | Part | Text | Condition | |---|---|---| -| a running session | `🔵 N · NAME: waiting for you, K approvals`, `1 approval` for one | K pending cards of the session, without those cancelled by a stop. A tool-use card counts while Claude Code's state is `waiting` or unknown | -| | `🔵 N · NAME: waiting for you in Claude Code` | no card; attached; state `waiting` | -| | `🟠 N · NAME: working` | no card; attached; state `busy` | -| | `🟢 N · NAME: idle` | no card; attached; state `idle` or `shell` | +| a running session | `🟠 N · NAME: waiting for you, K approvals`, `1 approval` for one | K pending cards of the session, without those cancelled by a stop. A tool-use card counts while Claude Code's state is `waiting` or unknown | +| | `⛔️ N · NAME: waiting for you in Claude Code` | no card; attached; state `waiting` | +| | `🟢 N · NAME: working` | no card; attached; state `busy` | +| | `🔴 N · NAME: idle` | no card; attached; state `idle` | +| | `⚙️ N · NAME: working in the background` | no card; attached; state `shell` | | | `▶️ N · NAME: running` | no card; attached; no record path, no record file, or another state | | the other sessions | `⚪ Not running: N · NAME, N · NAME, K older sessions`, newest first | sessions without a card and without an attachment, or all of them while the service stops | | no session | `No sessions.` | | diff --git a/packages/simplex-chat-mcp/spec/flows.md b/packages/simplex-chat-mcp/spec/flows.md index afbd40e68b..8c9a968aea 100644 --- a/packages/simplex-chat-mcp/spec/flows.md +++ b/packages/simplex-chat-mcp/spec/flows.md @@ -1691,18 +1691,18 @@ sequenceDiagram CC->>R: status busy D->>N: every 2 s: readRecord, the session attached N->>R: read status - D->>M: showList: 🟠 N · NAME: working, then the not running line + D->>M: showList: 🟢 N · NAME: working, then the not running line M->>C: no list yet, an owner in the group: apiSendMessages #35;M, priority -1 M->>C: apiSetGroupCustomData #35;M {simplexMcpMain: true, simplexMcpList: {item, at}} C->>O: the list CC->>R: status waiting, a permission dialog CC->>S: permission_request S->>D: POST /permission - D->>M: showList: 🔵 N · NAME: waiting for you, 1 approval + D->>M: showList: 🟠 N · NAME: waiting for you, 1 approval M->>C: apiUpdateChatItem #35;M item C->>O: the list edited, no alert CC->>R: status idle - D->>M: showList: 🟢 N · NAME: idle + D->>M: showList: 🔴 N · NAME: idle M->>C: apiUpdateChatItem #35;M item Note over D,M: the list 23 hours old, or its edit refused M->>C: apiSendMessages #35;M the new list, priority -1, and its item saved diff --git a/packages/simplex-chat-mcp/src/hub.ts b/packages/simplex-chat-mcp/src/hub.ts index a072a80077..bb2f806f5a 100644 --- a/packages/simplex-chat-mcp/src/hub.ts +++ b/packages/simplex-chat-mcp/src/hub.ts @@ -65,10 +65,10 @@ const listCheckMs = 2_000 const recordReadMs = 1_000 // spec: spec/api.md#list-of-sessions const claudeStates = new Map([ - ["waiting", ["🔵", "waiting for you in Claude Code"]], - ["busy", ["🟠", "working"]], - ["idle", ["🟢", "idle"]], - ["shell", ["🟢", "idle"]], + ["waiting", ["⛔️", "waiting for you in Claude Code"]], + ["busy", ["🟢", "working"]], + ["idle", ["🔴", "idle"]], + ["shell", ["⚙️", "working in the background"]], ]) // spec: spec/api.md#list-of-sessions const unknownState: [string, string] = ["▶️", "running"] @@ -263,7 +263,7 @@ export class Session { const state = claudeStates.get(this.claudeStatus ?? "") const dialog = state === undefined || this.claudeStatus === "waiting" const cards = this.actions.pending().filter(({tool, interrupted}) => !interrupted && (dialog || tool !== "permission")).length - if (cards > 0) return `🔵 ${this.displayName}: waiting for you, ${cards} approval${cards === 1 ? "" : "s"}` + if (cards > 0) return `🟠 ${this.displayName}: waiting for you, ${cards} approval${cards === 1 ? "" : "s"}` if (!this.attached) return undefined const [emoji, text] = state ?? unknownState return `${emoji} ${this.displayName}: ${text}` diff --git a/packages/simplex-chat-mcp/test/e2e/service.test.ts b/packages/simplex-chat-mcp/test/e2e/service.test.ts index d2df3ee19d..f31e885c2e 100644 --- a/packages/simplex-chat-mcp/test/e2e/service.test.ts +++ b/packages/simplex-chat-mcp/test/e2e/service.test.ts @@ -255,17 +255,17 @@ test("the Main group shows every session in one list, the running ones with thei await until(() => attached.length === 1) const owner = await client.request("GET", "/link") const invitations = joinSessionGroups(alice, ["1 · one", "2 · two"]) - const working = received(alice.chat, ({chatItem}) => chatItem.meta.itemText === "🟠 1 · one: working\n⚪ Not running: 2 · two") + const working = received(alice.chat, ({chatItem}) => chatItem.meta.itemText === "🟢 1 · one: working\n⚪ Not running: 2 · two") const mainGroupId = await joinByLink(alice, owner.link!) const list = await working expect(list.chatInfo).toMatchObject({type: "group", groupInfo: {groupId: mainGroupId}}) await invitations const edited = (text: string): Promise => updated(alice.chat, inGroup(mainGroupId, ({chatItem}) => chatItem.meta.itemId === list.chatItem.meta.itemId && chatItem.meta.itemText === text)) - const waiting = edited("🔵 1 · one: waiting for you, 1 approval\n⚪ Not running: 2 · two") + const waiting = edited("🟠 1 · one: waiting for you, 1 approval\n⚪ Not running: 2 · two") writeFileSync(record, JSON.stringify({status: "waiting", waitingFor: "permission prompt"})) await client.request("POST", "/permission", {id: one, requestId: "abcde", toolName: "Bash", description: "Run shell command", inputPreview: "ls"}) await waiting - const idle = edited("🟢 1 · one: idle\n⚪ Not running: 2 · two") + const idle = edited("🔴 1 · one: idle\n⚪ Not running: 2 · two") writeFileSync(record, JSON.stringify({status: "idle"})) await idle const ended = edited("⚪ Not running: 2 · two, 1 · one") diff --git a/packages/simplex-chat-mcp/test/unit/sessions.test.ts b/packages/simplex-chat-mcp/test/unit/sessions.test.ts index 6bc9e62fc2..61be401878 100644 --- a/packages/simplex-chat-mcp/test/unit/sessions.test.ts +++ b/packages/simplex-chat-mcp/test/unit/sessions.test.ts @@ -2606,7 +2606,7 @@ describe("Main group", () => { expect(chat.invitations.at(-1)).toEqual({groupId: 21, viaGroupId: 10, groupMemberId: 3, memberRole: T.GroupMemberRole.Owner}) }) - it("posts the list of every session after the greeting, silent, and edits it as Claude Code's records and the cards change: working, waiting for you, waiting for you in Claude Code, idle, and the ⚪ line after an exit", async () => { + it("posts the list of every session after the greeting, silent, and edits it as Claude Code's records and the cards change: working, waiting for you, waiting for you in Claude Code, idle, working in the background, and the ⚪ line after an exit", async () => { const chat = new FakeChat() const hub = await hubWith(chat, [self]) const one = await openSession(hub, id1, stored(1, "one")) @@ -2631,15 +2631,15 @@ describe("Main group", () => { await hub.showSessions() return chat.updates.length === edits ? undefined : chat.updates.at(-1)!.text } - expect(await shows("busy")).toBe("🟠 1 · one: working\n⚪ Not running: 2 · two") + expect(await shows("busy")).toBe("🟢 1 · one: working\n⚪ Not running: 2 · two") expect(chat.updates.at(-1)).toMatchObject({chatId: 10, itemId: list}) expect(await shows("busy")).toBeUndefined() - expect(await shows("waiting")).toBe("🔵 1 · one: waiting for you in Claude Code\n⚪ Not running: 2 · two") + expect(await shows("waiting")).toBe("⛔️ 1 · one: waiting for you in Claude Code\n⚪ Not running: 2 · two") one.permission({id: id1, requestId: "abcde", toolName: "Bash", description: "Run shell command", inputPreview: "ls"}) - expect(await shows("waiting")).toBe("🔵 1 · one: waiting for you, 1 approval\n⚪ Not running: 2 · two") - expect(await shows("busy")).toBe("🟠 1 · one: working\n⚪ Not running: 2 · two") - expect(await shows("idle")).toBe("🟢 1 · one: idle\n⚪ Not running: 2 · two") - expect(await shows("shell")).toBeUndefined() + expect(await shows("waiting")).toBe("🟠 1 · one: waiting for you, 1 approval\n⚪ Not running: 2 · two") + expect(await shows("busy")).toBe("🟢 1 · one: working\n⚪ Not running: 2 · two") + expect(await shows("idle")).toBe("🔴 1 · one: idle\n⚪ Not running: 2 · two") + expect(await shows("shell")).toBe("⚙️ 1 · one: working in the background\n⚪ Not running: 2 · two") one.endPermissions() one.onLine = undefined expect(await shows("idle")).toBe("⚪ Not running: 2 · two, 1 · one") @@ -2656,18 +2656,18 @@ describe("Main group", () => { one.onLine = () => undefined one.permission({id: id1, requestId: "abcde", toolName: "Bash", description: "Run shell command", inputPreview: "ls"}) two.requestMode("host") - expect(hub.sessionsText()).toBe("🔵 1 · one: waiting for you, 1 approval\n🔵 2 · two: waiting for you, 1 approval") + expect(hub.sessionsText()).toBe("🟠 1 · one: waiting for you, 1 approval\n🟠 2 · two: waiting for you, 1 approval") one.record = join(root, "claude-1.json") writeFileSync(one.record, JSON.stringify({status: "busy"})) await hub.showSessions() - expect(hub.sessionsText()).toBe("🟠 1 · one: working\n🔵 2 · two: waiting for you, 1 approval") + expect(hub.sessionsText()).toBe("🟢 1 · one: working\n🟠 2 · two: waiting for you, 1 approval") writeFileSync(one.record, JSON.stringify({status: "compacting"})) await hub.showSessions() - expect(hub.sessionsText()).toBe("🔵 1 · one: waiting for you, 1 approval\n🔵 2 · two: waiting for you, 1 approval") + expect(hub.sessionsText()).toBe("🟠 1 · one: waiting for you, 1 approval\n🟠 2 · two: waiting for you, 1 approval") one.permission({id: id1, requestId: "fghij", toolName: "Write", description: "Write a file", inputPreview: "a.txt"}) writeFileSync(one.record, JSON.stringify({status: "waiting"})) await hub.showSessions() - expect(hub.sessionsText()).toBe("🔵 1 · one: waiting for you, 2 approvals\n🔵 2 · two: waiting for you, 1 approval") + expect(hub.sessionsText()).toBe("🟠 1 · one: waiting for you, 2 approvals\n🟠 2 · two: waiting for you, 1 approval") let stopped = false const stopping = hub.stop().then(() => (stopped = true)) await until(() => chat.updates.filter(({chatId}) => chatId === 10).at(-1)?.text === "⚪ Not running: 2 · two, 1 · one") @@ -2688,10 +2688,10 @@ describe("Main group", () => { expect(hub.sessionsText()).toBe("▶️ 1 · one: running") writeFileSync(one.record, JSON.stringify({status: "busy"})) await hub.showSessions() - expect(hub.sessionsText()).toBe("🟠 1 · one: working") + expect(hub.sessionsText()).toBe("🟢 1 · one: working") writeFileSync(one.record, '{"pid": 100, "sta') await hub.showSessions() - expect(hub.sessionsText()).toBe("🟠 1 · one: working") + expect(hub.sessionsText()).toBe("🟢 1 · one: working") writeFileSync(one.record, JSON.stringify({status: "compacting"})) await hub.showSessions() expect(hub.sessionsText()).toBe("▶️ 1 · one: running") @@ -2720,7 +2720,7 @@ describe("Main group", () => { await hub.showSessions() expect(Date.now() - started).toBeLessThan(3_000) expect(opened).toHaveBeenCalledTimes(1) - expect(hub.sessionsText()).toBe("🟠 1 · one: working") + expect(hub.sessionsText()).toBe("🟢 1 · one: working") }) it("deletes a new list whose item it could not save and posts it again at the next render, and does not send a text the core refused as too large again until the text changes", async () => { From d9830bfa910ebd23bf4430652bd5542024f40bf9 Mon Sep 17 00:00:00 2001 From: "Evgeny @ SimpleX Chat" <259188159+evgeny-simplex@users.noreply.github.com> Date: Thu, 19 Nov 2026 14:04:46 +0000 Subject: [PATCH 04/20] mcp: a readable README, and the roadmap lines of 0.3.0 (#8264) * mcp: readme by what the plugin does for its users, roadmap lines of 0.3.0 * mcp: almost every waiting state * mcp: reply, edit and react in one line * mcp: flat layout without the avatar note * mcp: sessions use flat layout * mcp: shorter lines on answers, the Main group and approvals * mcp: approvals line without the taps * mcp: live stream line * mcp: status line * mcp: shorter lines --- packages/simplex-chat-mcp/README.md | 55 ++++++++++++++++------------ packages/simplex-chat-mcp/ROADMAP.md | 14 ++++--- 2 files changed, 41 insertions(+), 28 deletions(-) diff --git a/packages/simplex-chat-mcp/README.md b/packages/simplex-chat-mcp/README.md index c855ef5a74..65864c32c9 100644 --- a/packages/simplex-chat-mcp/README.md +++ b/packages/simplex-chat-mcp/README.md @@ -10,7 +10,32 @@ With this package, Claude Code can join channels and groups, talk to bots, and e The group of a Claude Code session in the SimpleX app: a prompt, Claude's answer, and its requests to run commands, which one tap approves

-## Run Claude Code from the app +🏗️ marks what is on the [roadmap](https://github.com/simplex-chat/simplex-chat/blob/master/packages/simplex-chat-mcp/ROADMAP.md). + +## Use your agents in private chats, with the full chat UX + +- No phone number, email or account. Agents have their own profile, without access to your other chats. +- Send prompts with images and files, and see answers live. Terminal prompts sent to the chat too. +- Reply and edit messages, send reactions. +- Sessions use flat layout. +- 🏗️ Voice messages, code highlighting, widgets, etc. + +## Work with others in the same session + +- Invite people to the Main group, and they join any session's group. +- Only owners and admins can approve tool calls. +- The Main group shows every session's state. +- 🏗️ Each session as a topic in one group. +- 🏗️ Agent teams: mention an agent to message it. + +## Control your agents' activity + +- Agents ask before they act in other chats or use a tool such as Bash. +- A live stream of agent's work: tasks, tool calls, etc. +- Session and machine status. +- 🏗️ Code diffs, almost every waiting state answered from the chat, etc. + +## Start You need Node.js 22 or later, Claude Code, and the [SimpleX Chat app](https://simplex.chat/downloads/) 7.1 or later. @@ -27,41 +52,25 @@ You need Node.js 22 or later, Claude Code, and the [SimpleX Chat app](https://si claude --dangerously-load-development-channels plugin:simplex@simplex-chat ``` - If you don't want to run SimpleX MCP as a channel, start `claude` without the flag to use it as an MCP server. [Read more](https://github.com/simplex-chat/simplex-chat/blob/master/packages/simplex-chat-mcp/REFERENCE.md#install). + Scan the QR code with the SimpleX app and tap Join: the Main group "Claude Control" appears. The first start downloads the SimpleX core library, so the QR code can take a minute. - Scan the QR code with the SimpleX app and tap Join. The group "Claude Control" appears. At the first start the plugin downloads the SimpleX core library, so the QR code can take a minute. If you close Claude Code before then, the next start shows it. +3. Each Claude Code session gets its own group, such as "1 · my-project". Join it from the invitation in "Claude Control", and send prompts there. - On several machines or containers, set `SIMPLEX_MCP_MACHINE` on each, for example `SIMPLEX_MCP_MACHINE=laptop`, to name its group "Claude Control - laptop". - -3. Each Claude Code session gets its own group, such as "1 · my-project". Join it from the invitation in "Claude Control". A list there shows every session and its state: working, waiting for you or idle. - -4. Send prompts in the session's group, and Claude answers there, live as it writes. The answer's last message ends with a line in small print with the turn's time and tokens and the machine's free memory and disk, such as `Done in 2 min 51 s · 16K output tokens · 673K tokens in context · RAM 12 GB free · disk 3.4 GB free❗️`, with ❗️ when one runs low. A switch of the model or the effort level appears as one line. Reply to a message to show Claude which one you mean. Claude also gets your reactions, as emoji replies, and the new text of a prompt you edit. Prompts you type in the terminal appear there too, and Claude Code's own prompts, such as a finished background task, appear as one line each. Each step of Claude's work, such as running the tests, appears as one line, completed with its outcome when the step ends. A line also shows when Claude Code summarises the session's context. Before Claude acts in other chats or uses a tool such as Bash, it asks in the group, and one tap approves. Another tap approves the tool for the rest of the session. - -5. Optionally, add your plan's 5-hour and weekly usage to the last line of each answer, and get a status line in the terminal, with this setting in `~/.claude/settings.json`. It replaces a status line of your own. [Read more](https://github.com/simplex-chat/simplex-chat/blob/master/packages/simplex-chat-mcp/REFERENCE.md#status-line). - - ```json - "statusLine": {"type": "command", "command": "node \"${SIMPLEX_MCP_HOME:-$HOME/.simplex-mcp}/status-line.js\""} - ``` +[REFERENCE.md](https://github.com/simplex-chat/simplex-chat/blob/master/packages/simplex-chat-mcp/REFERENCE.md) covers the plugin without the channel, several machines or containers, the status line, options, recovery and security. ## Safety - Anyone in "Claude Control" can join your sessions as an admin, so only invite people you trust. -- In a session, admins and owners can prompt Claude and approve what it does. Other members can only prompt, and observers can only read. +- In a session, admins and owners can prompt the agent and approve what it does. Other members can only prompt, and observers can only read. - A tool approved for the session runs without asking until the session ends or `/revoke`. Claude Code still asks where its own rules require it, such as before a change to `.git` or `.bashrc`. - Claude Code doesn't run `!` or `/` commands sent in the group. -- Claude sends files to the group only if the group allows them. -- Claude has no SimpleX address, so nobody can contact it first. +- Agents send files to the group only if the group allows them. +- Agents have no SimpleX address, so nobody can contact them first. ## Only Claude Code, for now The agent is tested with Claude Code. Tell us which other apps and models you want to use in [an issue](https://github.com/simplex-chat/simplex-chat/issues), or contribute. -## Reference - -[REFERENCE.md](https://github.com/simplex-chat/simplex-chat/blob/master/packages/simplex-chat-mcp/REFERENCE.md) covers the plugin's options, recovery and security. It also explains shared settings for several machines or containers, and running the agent as an MCP server without the channel. - -What comes next: [Roadmap](https://github.com/simplex-chat/simplex-chat/blob/master/packages/simplex-chat-mcp/ROADMAP.md). - ## Own a part of SimpleX Business is moving into messages, and AI agents follow: an agent can ask a company's agent in a chat instead of opening the company's website, and buy there too. These chats hold plans, purchases and accounts, so with AI everyone feels the need for private and secure communication. diff --git a/packages/simplex-chat-mcp/ROADMAP.md b/packages/simplex-chat-mcp/ROADMAP.md index 548890807b..2cb4f4e7da 100644 --- a/packages/simplex-chat-mcp/ROADMAP.md +++ b/packages/simplex-chat-mcp/ROADMAP.md @@ -15,17 +15,21 @@ What comes next for Claude Code in SimpleX Chat. ## In your sessions -- ✅ Reply to a message, and Claude knows which one you mean. -- ✅ React to a message, and Claude sees your reaction. -- ✅ Allow a tool for the rest of a session with one tap. -- ✅ See when a session's context is summarised. - ✅ One list in the Main group shows every session and its state: working, waiting for you or idle. - See what Claude is doing while it works, with its code changes as diffs. -- ✅ The model, effort and usage of each session show in its description, updated as they change. +- ✅ React to a message, and Claude sees your reaction. +- ✅ Reply to a message, and Claude knows which one you mean. +- ✅ The model and effort of each session show in its description, updated as they change, and the usage of each turn in the last line of its answer. +- ✅ See when a session's context is summarised. +- ✅ Allow a tool for the rest of a session with one tap. - Each session is a topic inside one group, not a group of its own. - Claude can offer choices and other small interactive widgets in the chat. - Start a new session from the desktop app, in a folder you choose. +- Send voice messages to Claude. +- Delete your latest prompt, and Claude knows you withdrew it. +- Answer from the chat almost every time Claude Code waits for you. ## More agents - Codex and other agents, alongside Claude Code. +- Claude's subagents and teammates join the session's group with their own profiles, and a mention of one by name sends it a message. From 44a193b54f146121f2c48c770178e691f5a2518f Mon Sep 17 00:00:00 2001 From: "Evgeny @ SimpleX Chat" <259188159+evgeny-simplex@users.noreply.github.com> Date: Thu, 19 Nov 2026 14:05:45 +0000 Subject: [PATCH 05/20] mcp: 0.3.1 with simplex-chat 7.1.4 (#8266) --- packages/simplex-chat-mcp/.claude-plugin/plugin.json | 2 +- packages/simplex-chat-mcp/package-lock.json | 12 ++++++------ packages/simplex-chat-mcp/package.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/simplex-chat-mcp/.claude-plugin/plugin.json b/packages/simplex-chat-mcp/.claude-plugin/plugin.json index 848a901e13..17b10cc98e 100644 --- a/packages/simplex-chat-mcp/.claude-plugin/plugin.json +++ b/packages/simplex-chat-mcp/.claude-plugin/plugin.json @@ -1,6 +1,6 @@ { "name": "simplex", - "version": "0.3.0", + "version": "0.3.1", "description": "Each Claude Code session gets its own SimpleX group. There you prompt the session, approve its actions and tool use, and read its answers.", "author": {"name": "SimpleX Chat", "url": "https://simplex.chat"}, "homepage": "https://github.com/simplex-chat/simplex-chat/tree/stable/packages/simplex-chat-mcp#readme", diff --git a/packages/simplex-chat-mcp/package-lock.json b/packages/simplex-chat-mcp/package-lock.json index 738926f8ef..618e47c008 100644 --- a/packages/simplex-chat-mcp/package-lock.json +++ b/packages/simplex-chat-mcp/package-lock.json @@ -1,12 +1,12 @@ { "name": "@simplex-chat/mcp", - "version": "0.3.0", + "version": "0.3.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@simplex-chat/mcp", - "version": "0.3.0", + "version": "0.3.1", "bundleDependencies": [ "@modelcontextprotocol/node", "@modelcontextprotocol/server", @@ -20,7 +20,7 @@ "@modelcontextprotocol/server": "^2.3.1", "@simplex-chat/types": "^7.1.3", "qrcode": "^1.5", - "simplex-chat": "^7.1.3" + "simplex-chat": "^7.1.4" }, "bin": { "simplex-mcp": "dist/cli.js" @@ -4319,9 +4319,9 @@ "license": "ISC" }, "node_modules/simplex-chat": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/simplex-chat/-/simplex-chat-7.1.3.tgz", - "integrity": "sha512-StC2e0qZQS/L9VfHA1oWUTh3LIYSfo3Rj5hlGRZq0z2UjkH3nkbjmHI9z56316pT2EpXugPanW396Acfx+wTRA==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/simplex-chat/-/simplex-chat-7.1.4.tgz", + "integrity": "sha512-Uc4QNCAXhlsmEvySp307t59k/ke7oAWsZqYEsM6fAcufeT4LsART2KF7vzBhJZTAZQk2JOCLjwRxfpGE31tIFA==", "inBundle": true, "license": "AGPL-3.0", "dependencies": { diff --git a/packages/simplex-chat-mcp/package.json b/packages/simplex-chat-mcp/package.json index c9b2f4b239..7264f2f20a 100644 --- a/packages/simplex-chat-mcp/package.json +++ b/packages/simplex-chat-mcp/package.json @@ -1,6 +1,6 @@ { "name": "@simplex-chat/mcp", - "version": "0.3.0", + "version": "0.3.1", "description": "MCP server and Claude Code plugin that give AI agents a SimpleX profile, approved in your app", "bin": { "simplex-mcp": "dist/cli.js" @@ -30,7 +30,7 @@ "@modelcontextprotocol/server": "^2.3.1", "@simplex-chat/types": "^7.1.3", "qrcode": "^1.5", - "simplex-chat": "^7.1.3" + "simplex-chat": "^7.1.4" }, "bundleDependencies": true, "devDependencies": { From 86ce68883db81cc612ec8254e1032a0cdd655534 Mon Sep 17 00:00:00 2001 From: "Evgeny @ SimpleX Chat" <259188159+evgeny-simplex@users.noreply.github.com> Date: Thu, 19 Nov 2026 21:26:33 +0000 Subject: [PATCH 06/20] docs: testing approaches of the codebase (#8255) --- CLAUDE.md | 1 + docs/CONTRIBUTING.md | 2 + docs/contributing/TESTS.md | 301 +++++++++++++++++++++++++++++++++++++ 3 files changed, 304 insertions(+) create mode 100644 docs/contributing/TESTS.md diff --git a/CLAUDE.md b/CLAUDE.md index 2c3cceced7..f490f20416 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1,4 +1,5 @@ @docs/CONTRIBUTING.md @docs/contributing/PROJECT.md @docs/contributing/CODE.md +@docs/contributing/TESTS.md @scripts/ci/README.md diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 4207e62743..3479d43014 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -21,6 +21,8 @@ Please discuss the problem you want to solve and your detailed implementation pl ./contributing/CODE.md has details about general requirements common for `simplexmq` and `simplex-chat` repositories. +./contributing/TESTS.md has the testing approaches of this repository: the tests required for a change, how they are written and run, and where CI runs them. + CLAUDE.md in the repository root imports these files, this guide and ../scripts/ci/README.md for Claude Code; apps/ios/CLAUDE.md and apps/multiplatform/CLAUDE.md import the README of each app. ## Compiling with SQLCipher encryption enabled diff --git a/docs/contributing/TESTS.md b/docs/contributing/TESTS.md new file mode 100644 index 0000000000..b2ec7d318d --- /dev/null +++ b/docs/contributing/TESTS.md @@ -0,0 +1,301 @@ +# Testing + +The testing approaches of this repository: what is checked, how a test is written and run, and where CI runs it. The CI scopes, the reduced build and the `ci-tests` block of a pull request: [CI on GitHub's runners](../../scripts/ci/README.md). + +## Tests for a change + +| Change | Tests | +|---|---| +| Behaviour of the chat core: messages, groups, files, profiles, connections | [chat scenario test](#chat-scenario-tests) | +| Encoding of a protocol message or a JSON type, markdown, a pure function of the core | [unit test](#unit-tests) | +| Command, response, event or type of the core API | [Bot API docs](#checks-against-committed-files), regenerated
[app fixture](#app-fixtures), when an app processes it | +| Database migration | [schema dumps](#checks-against-committed-files) of SQLite and PostgreSQL
query plans | +| Directory service, badge service, remote sessions | the [suite](#suites) of the area | +| App processing of a core response or event | [app fixture](#app-fixtures), replayed in Kotlin and iOS tests | +| App screen | a preview, rendered by the [desktop](#desktop-snapshots) and [iOS](#simplex-snapshots) snapshot tests | +| Flow across app screens | a case of an [app workflow](#app-workflows) | +| Kotlin or Swift code without views | [desktopTest or commonTest](#kotlin-apps)
[SimpleX Unit Tests](#simplex-unit-tests) | +| Package, bot, website or CI script | the tests of its [scope](#packages-and-other-scopes) | +| Scope lacking CI tests | its CI coverage, in the same pull request ([Adding CI coverage](../../scripts/ci/README.md#adding-ci-coverage)) | + +## Core + +The hspec suite `simplex-chat-test` of simplex-chat.cabal, with the entry point [tests/Test.hs](../../tests/Test.hs). Building it, running it and selecting tests by hspec match patterns: [CI guide, core](../../scripts/ci/README.md#core). A pattern is a path of `describe` and `it` names, for example `/SimpleX chat client/direct tests/`. + +- A new test module is added to `other-modules` of the test suite in simplex-chat.cabal, and its spec to `main` of Test.hs. +- `tests/tmp` contains a directory per test (`tmpBracket` in Test.hs) and is emptied at the start and the end of a run (`withTmpFiles` in ChatClient.hs). +- With `CI=true`, set on GitHub's runners, the tests marked `xdescribe''` and `xit''` are skipped, and on macOS those marked `xitMacCI` ([ChatTests/Utils.hs](../../tests/ChatTests/Utils.hs)); the tests marked `xit'` are skipped on Linux. +- [tests/fixtures](../../tests/fixtures): images and files sent in the tests, TLS credentials of the test servers, and the [app fixtures](#app-fixtures) in `api`. +- In the full matrix of build.yml, the whole suite runs on Linux x86_64, with GHC 9.6.3 and 8.10.7, and on macOS aarch64; on a draft pull request, the tests matched by its `ci-tests` block run. +- Coverage: `-fhpc` added to `ghc-options` of the test suite in simplex-chat.cabal. + +### Suites + +| Pattern | Module | Checked | +|---|---|---| +| `/SimpleX chat client/` | [ChatTests.hs](../../tests/ChatTests.hs) | [chat scenarios](#chat-scenario-tests): direct, forward, group, chat relay, local, file, profile and chat list tests | +| `/names tests/` | ChatTests/Names.hs | SimpleX names, resolved by a local resolver ([NameResolver.hs](../../tests/NameResolver.hs)); SQLite only | +| `/SimpleX chat protocol/` | ProtocolTests.hs | chat protocol messages, short link data, batch limits, preferences JSON | +| `/JSON Tests/` | JSONTests.hs, JSONFixtures.hs | conversion of the Swift JSON form to the tagged form, with QuickCheck; JSON of markdown | +| `/SimpleX chat markdown/` | MarkdownTests.hs | the markdown parser | +| `/SimpleX chat view/` | ViewTests.hs | functions of the CLI view | +| `/Mobile API Tests/` | MobileTests.hs | the API of the core library (src/Simplex/Chat/Mobile.hs) and its C functions; SQLite only | +| `/Message batching/` | MessageBatching.hs | batches of messages and of relay deliveries | +| `/Valid names/` | ValidNames.hs | display names made valid | +| `/Random servers/` | RandomServers.hs | the random choice of preset servers | +| `/Operators/` | OperatorTests.hs | server operators, usage conditions, validation of user servers | +| `/Member relations/` | MemberRelationsTests.hs | member relation vectors | +| `/Image resize/` | ImageTests.hs | image resizing | +| `/Supporter badges/` | BadgeTests.hs | badge credentials and proofs | +| `/WebRTC encryption/` | WebRTCTests.hs | encryption of call media frames; SQLite only | +| `/Remote session/` | RemoteTests.hs | a desktop controlling a mobile: handshake, messages, files | +| `/SimpleX Directory service bot/`
`/SimpleX Directory names/` | Bots/DirectoryTests.hs | the directory service with chat clients (`withDirectoryService`); names: SQLite only | +| `/SimpleX Broadcast bot/` | Bots/BroadcastTests.hs | the broadcast bot; skipped when `CI=true` | +| `/SimpleX badge service/` | Bots/BadgeService/*Tests.hs | configuration, web server and schema, catalog, groups, invoice waiters, payment providers, store receipts; the providers are local fakes (`Fake*.hs`) | +| `/SimpleX badge service e2e/` | Bots/BadgeService/BotTests.hs, GroupIntegrationTests.hs | the badge service bot with chat clients | +| `/Schema dump/`
`/Postgres schema dump/`
`/Bot API docs/`
`/Save query plans/` | SchemaDump.hs, PostgresSchemaDump.hs, APIDocs.hs | [committed files](#checks-against-committed-files) | + +### Chat scenario tests + +- Checked: chat cores of several clients connected through a test SMP server, by the terminal output of each client, and by queries of a client's database for a state absent from the output. +- Pattern, registered with `it "" testDirectMessage` in the spec of its module: + + ```haskell + testDirectMessage :: HasCallStack => TestParams -> IO () + testDirectMessage = + testChat2 aliceProfile bobProfile $ \alice bob -> do + connectUsers alice bob + alice #> "@bob hello" + bob <# "alice> hello" + ``` + +- Helpers of [ChatClient.hs](../../tests/ChatClient.hs) and [ChatTests/Utils.hs](../../tests/ChatTests/Utils.hs): + + | Helper | Use | + |---|---| + | `testChat2` … `testChat5`, `testChatCfgOpts2` | clients with new databases | + | `withNewTestChat`, `withTestChat` | one client with a new database; a restart with its database | + | `withNewTestChatCfgOpts` | a client with a `ChatConfig` and `ChatOpts`, such as `chatHooks` or `markRead = False` | + | `connectUsers`, `createGroup2`, `createGroup3` | a contact; a group of 2 or 3 members | + | `##>`, `#>`, `send` | a command and its echo; a message and its sent item, time removed; a command alone | + | `<##`, `<#`, `<##.`, `.<##` | the next line; the next line, time removed; its prefix; its suffix | + | `<###`, `concurrentlyN_` | lines in any order; lines of several clients at once | + | `#$>` | a command and a function of its output line, as in `("/_get chat @2 count=100", chat, [...])` | + | `withCCTransaction`, `shouldEventuallyReturn` | a query of the client's database; a value polled for 20 s | + | `withXFTPServer`, `withSmpServer'`, `withSmpServerAndNames` | an XFTP server; another SMP server; an SMP server with a names resolver | + | `versionTestMatrix2`, `testCfgVPrev`, `testCfgV1` | clients of the previous and of the first supported versions | + | `withTestOutput` | the terminal output of the clients printed | + +- Run: `/SimpleX chat client/ tests/`, for example `/SimpleX chat client/group tests/`. +- CI: build-linux, step "Run tests". +- Pitfalls: + - The output of every client is read to its end: a test fails when a client prints a line within 0.1 s after the test (`packages/simplex-chat-client/types/typescript/src/*.ts
packages/simplex-chat-python/src/simplex_chat/types/_*.py | the API docs in bots/src/API/Docs (`testGenerate` in [APIDocs.hs](../../tests/APIDocs.hs)) | +| `/Schema dump/` | src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql | SQLite migrations, dumped with `sqlite3` | +| `/Postgres schema dump/` | src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql | PostgreSQL migrations, dumped with `pg_dump` | +| `/Save query plans/` | chat_query_plans.txt and agent_query_plans.txt in src/Simplex/Chat/Store/SQLite/Migrations | the queries recorded in the run (`chatQueryStats`, `agentQueryStats`) | +| recording tests | tests/fixtures/api | [app fixtures](#app-fixtures) | + +- Bot API docs also fail on a command, response or event of the API that is neither documented in bots/src/API/Docs nor listed in `cliCommands`, `undocumentedCommands`, `undocumentedResponses` or `undocumentedEvents`, on a type of a documented one missing from Docs/Types.hs, and on a documented command without responses. They run with GHC 9.6 and later (`MIN_VERSION_base(4,18,0)`), in SQLite builds. +- Schema dump also checks down migrations (exceptions in `skipComparisonForDownMigrations`), STRICT tables, and the output of `.lint fkey-indexes` against chat_lint.sql, an empty file, so that the test fails for a foreign key without an index. +- Save query plans is skipped when `CI=true`. The plans are of the queries of that run only, so the files are committed from a local run of the whole suite. + +### PostgreSQL + +- Run: + + ```sh + cabal test simplex-chat-test --constraint 'simplexmq +client_postgres' --constraint 'simplex-chat +client_postgres' --ghc-options=-O0 --test-option=-m --test-option='/SimpleX chat client/' + ``` + + The flags `client_postgres` of simplexmq and simplex-chat, as in scripts/desktop/build-lib-linux.sh; `dbPostgres` is defined for the tests. +- Needed: a PostgreSQL server that accepts the role `postgres` without a password, and `pg_dump`. The role `test_chat_user` and the database `test_chat_db` are created at the start of a run and dropped at its end (`withTestDB` in Test.hs); each client has its own schema, dropped after each test (`dropTestSchemas` in ChatClient.hs). +- Left out of PostgreSQL builds: Schema dump, Bot API docs, WebRTC encryption, Mobile API Tests, both names suites, Save query plans. +- CI: local runs only; build.yml builds the PostgreSQL library for releases (build-linux-postgres). +- Pitfall: the Postgres schema dump calls `sed -i ''` (BSD sed) unless `CI=true`. + +## App fixtures + +The core's responses and events are recorded by core tests in [tests/fixtures/api](../../tests/fixtures/api) and replayed by Kotlin and iOS tests in place of the core library, so that app code is tested on the output of the current core. + +```mermaid +flowchart LR + CT["core test
tests/ChatTests"] -->|"apiFixture
eventsFixture"| F["tests/fixtures/api"] + F --> T["Kotlin desktopTest
iOS SimpleX Unit Tests"] + T -->|"recorded responses
in place of the core"| V["app functions and views"] + T -->|"recorded events"| P["processReceivedMsg"] + V --> M["ChatModel, alerts, notifications"] + P --> M +``` + +### Recording + +Helpers of [ChatTests/Utils.hs](../../tests/ChatTests/Utils.hs), called in a chat scenario test: + +| Helper | Written to `tests/fixtures/api/.json` | +|---|---| +| `apiFixture fixture cc placeholders FixtureRequests {frCommands, frMarkdown, frUris}` | an object with `commands`, `markdown` and `uris`, keyed by the request: the response to each command, encoded by `chatSendCmd` of the core library's API; `chatParseMarkdown` of each text; `chatParseUri` of each link | +| `nameFixture fixture cc name` | `apiFixture` of `/_connect plan 1 ` and of the markdown of the name, in `names/` | +| `eventsFixture fixture events steps` | an array of the events appended by `recordItemEvent events`, in `eventHook` of `chatHooks`, during `steps`: `newChatItems` and `chatItemUpdated`, encoded as `chatRecvMsg` encodes them | +| `nameMovedFixture` | a `nameMoved` event, built from the IDs of the named contacts and groups | + +Examples: `testPlanKnownNameAvailable` in ChatTests/Names.hs, `testDirectMessageUpdatePrevItem` and `testMissedCall` in ChatTests/Direct.hs. + +Stable recordings: + +- Values of each run are replaced by `stableJSON`: + + | Fields | Replaced by | + |---|---| + | `createdAt`
`updatedAt`
`chatTs`
`userMemberProfileSentAt`
`itemTs` | `1970-01-01T00:00:00Z` | + | `agentConnId`
`xContactId`
`connFullLink`
`connShortLink`
`contactLink`
`groupLink`
`viaGroupLinkUri`
`simplexUri`
`memberId`
`memberPubKey`
`publicGroupId`
`businessId`
`customerId`
`itemSharedMsgId` | the field name | + | `groupRelays` | `"groupRelay"` per element | + + A field with a new value in each run is added to this list. +- Strings of the test, such as links, are replaced by the `placeholders` of `apiFixture`, in keys and values: `[(cLink, "CONTACT_LINK")]` in `testPlanAddressContactViaAddress`, so that the app test connects to `CONTACT_LINK`. +- The recorded state is awaited first: the response to an update is recorded after the item status in the database is `snd_rcvd ok complete` (`shouldEventuallyReturn` in `testDirectMessageUpdatePrevItem`), and the steps of `eventsFixture` end after the expected number of events (`testMissedCall`). +- The client whose events are recorded has `markRead = False`: the CLI marks received items read when it prints them (`runTerminalOutput` in src/Simplex/Chat/Terminal/Output.hs), while the apps receive unread items. +- Recordings are in the tagged JSON form of builds without the `swift` flag. + +### Replay + +| | Kotlin, common/src/commonMain | iOS | +|---|---|---| +| Commands | `chatSendCmdRetry`, platform/Core.kt | `sendSimpleXCmdStr`, SimpleXChat/API.swift | +| Markdown | `chatParseMarkdown`, platform/Core.kt | `parseSimpleXMarkdownText`, SimpleXChat/API.swift | +| Links | `chatParseUri`, platform/Core.kt | `parseSanitizeUri`, SimpleXChat/API.swift | +| Events | `ChatController.processReceivedMsg`, model/SimpleXAPI.kt | `processReceivedMsg`, Shared/Model/SimpleXAPI.swift | +| Notifications | `ntfManager`, platform/NtfManager.kt | `NtfManager.shared`, Shared/Model/NtfManager.swift | +| Recording read by | `fixtureText` | `fixtureJSON`, then `singleFieldJSON` to the Swift JSON form | +| Tests | [NameAlertsTest.kt](../../apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/NameAlertsTest.kt), [ChatItemUpdateTest.kt](../../apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/ChatItemUpdateTest.kt) | [NameAlertsTests.swift](../../apps/ios/SimpleX%20Unit%20Tests/NameAlertsTests.swift), [ChatItemUpdateTests.swift](../../apps/ios/SimpleX%20Unit%20Tests/ChatItemUpdateTests.swift) | + +- Pattern: `recorded(fixture)` in the NameAlerts tests sets the first three seams to lookups in the recording; the test fails at tear-down on a request without a recorded response, unless the request is checked with `assertRequested`. The ChatItemUpdate tests decode the recorded events, pass each to `processReceivedMsg` and compare `ChatModel`. Tear-down restores the seams and clears the model. +- Run and CI: [Kotlin apps](#kotlin-apps), [SimpleX Unit Tests](#simplex-unit-tests). CI runs the kotlin and ios scopes for a change in tests/fixtures/api (`BUILD_CHANGES` in scripts/ci/packages_release.py). The recording tests are core tests, selected in the `ci-tests` block by the patterns of the [CI guide, core](../../scripts/ci/README.md#core). +- Pitfalls: + - `singleFieldJSON` converts each object with a `type` field, except `MsgContent`, recognized by its tags. The core encodes other types with `type` in both JSON forms: the types of `taggedObjectJSON` in src, such as `MsgChatLink`, `LinkContent`, `MsgScope` and `ChatBotCommand`, and `MsgReaction`, by its own instance. A recording with them requires another conversion rule. + - The tests use the app's singletons, such as `ChatModel` and `AlertManager`: each test restores what it changes. + - The core is reached only through the replaced seams: the Kotlin test JVM does not load the core library, and the iOS app host in CI is linked with stub libraries. + +## Kotlin apps + +In apps/multiplatform: + +| Source set | Gradle task | Contents | +|---|---|---| +| common/src/commonTest | `:common:desktopTest` | tests of common code (kotlin.test) | +| common/src/desktopTest | `:common:desktopTest` | JVM tests: Compose views with `runComposeUiTest`, layout positions with `renderScene` and `Modifier.record` ([LayoutRecorder.kt](../../apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/LayoutRecorder.kt)), files with `withTempDir`, [app fixtures](#app-fixtures), [snapshots](#desktop-snapshots) | +| android/src/test | `:android:testFossDebugUnitTest` | a template test, `ExampleUnitTest` | +| android/src/androidTest | `connectedFossDebugAndroidTest`, with a device or an emulator | a template test, `ExampleInstrumentedTest` | + +- Run: `./gradlew :common:desktopTest`; one class: `./gradlew :common:desktopTest --tests chat.simplex.app.ChatItemUpdateTest`. The CI command: [CI guide, kotlin](../../scripts/ci/README.md#kotlin). +- CI: build.yml, step "Build and test Kotlin apps" (kotlin scope); desktop-linux, app job. +- Pitfalls: + - The working directory is apps/multiplatform/common: recordings are read from `../../../tests/fixtures/api`, sources from `src/`. + - The tests use the app's singletons, such as `ChatModel`, `appPrefs` and `simplexWindowState`: they are restored in `@AfterTest`. + - The test JVM does not load the core library: code that calls it is tested with the replaced seams of [app fixtures](#replay). + +### Desktop snapshots + +- Checked: each `@Preview` of commonMain and desktopMain, rendered in the light and dark themes by `SnapshotTest` ([SnapshotTest.kt](../../apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/SnapshotTest.kt)), equals its reference in [common/src/desktopTest/snapshots](../../apps/multiplatform/common/src/desktopTest/snapshots), within 8 of 255 per colour channel ([snapshots-compare.py](../../scripts/ci/snapshots-compare.py)). +- Write: a new `@Preview` is added to `previewScenes`, with `chatItemFontScales` for a chat item, or to `previewsCallingCore` when its layout calls the core library; `everyPreviewIsRendered` fails otherwise. A preview uses `previewDate` in place of the current time. +- Record and check: with `scripts/ci/snapshots-remote.py desktop record`, desktop-linux renders the previews of the pushed branch, and the renders replace the references, for review and commit; with `check`, the renders that differ are listed. +- Run, from apps/multiplatform, then from the repository root: + + ```sh + SNAPSHOT_DIR= ./gradlew -Psimplex.assets.dir=../../assets :common:desktopTest --tests chat.simplex.app.SnapshotTest + python3 scripts/ci/snapshots-compare.py apps/multiplatform/common/src/desktopTest/snapshots + ``` + +- CI: desktop-linux, step "Compare snapshots"; in build.yml, the previews are rendered without a comparison. +- Details: [desktop-linux README](../../scripts/ci/desktop-linux/README.md), "Snapshots". + +## iOS app + +In apps/ios, SimpleX.xcodeproj: + +| Target | Kind | Scheme | CI | +|---|---|---|---| +| SimpleX Unit Tests | unit tests hosted by the app | SimpleX Unit Tests | build.yml, build-ios, step "Run iOS unit tests" (ios scope) | +| SimpleX Snapshots | unit tests hosted by the app: preview renders and tests of a running chat | SimpleX (iOS) | ios-sim, after the smoke test | +| Tests iOS | UI tests of Xcode's template | SimpleX (iOS) | local runs only | + +A new test file is added to its target in project.pbxproj: a PBXBuildFile, a PBXFileReference, the target's group and its Sources phase. + +### SimpleX Unit Tests + +- Checked: app code on [app fixtures](#app-fixtures) and other logic of the app. +- Write: an `XCTestCase` in [apps/ios/SimpleX Unit Tests](../../apps/ios/SimpleX%20Unit%20Tests); `fixtureJSON`, `singleFieldJSON` and `waitFor` are at file scope of NameAlertsTests.swift. +- Run, on macOS: `scripts/ci/ios-stub-libs.sh`, then the `xcodebuild test` command of the step "Run iOS unit tests" of build-ios in build.yml; or Product > Test with the scheme SimpleX Unit Tests. +- Pitfalls: + - The stubs replace the libraries in apps/ios/Libraries/sim, where scripts/ios/prepare.sh puts the core built for the simulator. + - With the stubs, the app opens its database error screen and calls the core no more. + - The tests run with `-testLanguage en -testRegion US`; a test of dates sets `NSTimeZone.default` to UTC. + +### SimpleX Snapshots + +- Checked: each `PreviewProvider` of apps/ios, rendered in the light and dark themes, equals its reference in [References](../../apps/ios/SimpleX%20Snapshots/References), within 8 of 255 per colour channel; previews marked `allSizes` are rendered at three content sizes. [SnapshotTests.swift](../../apps/ios/SimpleX%20Snapshots/SnapshotTests.swift) also contains assertion tests of layout functions, calls and VoIP pushes; the VoIP push tests require a running chat (`waitUntilChatActive`). +- Write: a new `PreviewProvider` is added to `previewScenes()`, or to `EXCLUDED` of [check-previews.py](../../apps/ios/SimpleX%20Snapshots/check-previews.py) when its renders differ between runs; check-previews.py fails on a `#Preview`. A preview uses `previewDate` in place of the current time. +- Record and check: `scripts/ci/snapshots-remote.py ios record|check`, as for [desktop](#desktop-snapshots). +- Run, from the repository root, with the core in apps/ios/Libraries/sim and a simulator where the app has a running chat: `SIM_UDID= scripts/ci/ios-sim/snapshots.sh ` ([snapshots.sh](../../scripts/ci/ios-sim/snapshots.sh)). +- CI: build-ios runs check-previews.py; ios-sim renders and compares at the end of the smoke test, whose step fails on a difference. +- Details: [ios-sim README](../../scripts/ci/ios-sim/README.md), "Snapshots". + +### Tests iOS + +Xcode's UI test template: `testExample` launches the app, `testLaunchPerformance` measures its launch, `testLaunch` attaches a screenshot of the launch screen. It is in the test action of the scheme SimpleX (iOS), with SimpleX Snapshots: `xcodebuild test -scheme "SimpleX (iOS)"` of [apps/ios/README.md](../../apps/ios/README.md) runs both. + +## App workflows + +The app built from a branch, its core included, driven on a device by scripts and, on request, by Claude following a test plan, with an optional test backend (relay, directory, names server, peers). + +| Workflow | App | Smoke test | Claude plan | README | +|---|---|---|---|---| +| `ios-sim` | iOS app in an iPhone simulator | onboarding
images sent in a group
snapshots | device-test-plan.md, cases per layout in claude-scope | [ios-sim](../../scripts/ci/ios-sim/README.md) | +| `desktop-linux` | desktop app on a virtual display, Ubuntu | desktopTest with snapshots
onboarding
a local group
both layouts
images sent | claude-test.md, claude-scope | [desktop-linux](../../scripts/ci/desktop-linux/README.md) | +| `android-emu` | debug APK in an Android emulator | onboarding
a local group
both layouts
images sent | claude-test.md, claude-scope | [android](../../scripts/ci/android/README.md) | + +- Write: a scripted case in the workflow's `smoke-test.sh`, with its `ui` driver; a Claude plan in the files of the table, with `backend: yes` in claude-scope when the cases use the test backend. +- Run: by hand only, on any branch: [CI guide, Starting a run](../../scripts/ci/README.md#starting-a-run). Each run uploads the app for manual tests. +- Pitfalls: + - A run with `claude` and `backend: yes` in claude-scope also requires the input `backend`, or its plan job fails. + - A Claude run requires the branch rule of the GitHub environment `app-sim-claude` to include the branch. + - The Android app runs under ARM translation: with the input `release`, the released app runs in the same emulator, to tell an app failure from the emulator's. + +## Packages and other scopes + +| Scope | Tests | Run | +|---|---|---| +| packages: Node.js library | [packages/simplex-chat-nodejs/tests](../../packages/simplex-chat-nodejs/tests), jest:
unit tests `*.unit.test.ts`, with `core` functions mocked
tests of the add-on and of library downloads
live tests with a local smp-server (`describeIfSmpServerAvailable`: `SMP_SERVER`, or a download on Linux) | `scripts/ci/package-tests.sh build linux-x86_64`
`scripts/ci/package-tests.sh test` | +| packages: Python library | [packages/simplex-chat-python/tests](../../packages/simplex-chat-python/tests), pytest, with a fake libsimplex (`FakeLib`) | as above | +| packages: TypeScript types | generated by [Bot API docs](#checks-against-committed-files), compiled by package-tests.sh | as above | +| mcp | [packages/simplex-chat-mcp/test](../../packages/simplex-chat-mcp/test), jest:
`test/unit`
`test/e2e`, with a local smp-server and xftp-server
manual checks: [TESTING.md](../../packages/simplex-chat-mcp/TESTING.md) | `scripts/ci/scope-tests.sh mcp` | +| support-bot | [apps/simplex-support-bot/bot.test.ts](../../apps/simplex-support-bot/bot.test.ts), vitest, with `simplex-chat` and `@simplex-chat/types` replaced by test/__mocks__ | `scripts/ci/scope-tests.sh support-bot` | +| support-bot-light | [apps/simplex-support-bot-light/tests](../../apps/simplex-support-bot-light/tests), pytest, with `FakeChatApi` of conftest.py; ruff, pyright | `scripts/ci/scope-tests.sh support-bot-light` | +| website | [website/test](../../website/test), `node --test` of src/js/simplex-lib.jsc | `npm test` in website | +| badge-web | [apps/simplex-badge-service/web/test](../../apps/simplex-badge-service/web/test), `node --test` of the compiled tests, in UTC | `npm ci`, `npm test` in apps/simplex-badge-service/web | +| ci-scripts | [scripts/ci/test_packages_release.py](../../scripts/ci/test_packages_release.py), unittest of packages_release.py | `python3 scripts/ci/test_packages_release.py` | + +CI of each scope: [CI guide, Scopes](../../scripts/ci/README.md#scopes). Scopes lacking CI tests, with tests run locally: + +| Scope | Run | Notes | +|---|---|---| +| ts-client | `npm test` in packages/simplex-chat-client/typescript | prettier, eslint and jest; client.test.ts is skipped | +| webrtc | `npm test` in packages/simplex-chat-webrtc | fullstack.test.js requires `SIMPLEX_CHAT` and `SMP_SERVER`, the paths of the chat CLI and of smp-server | +| calculator-bot | `npm test` in apps/simplex-calculator-bot | calculatorBot.test.ts: smp-server from `SMP_SERVER` or a download on Linux, and tests/fixtures/tls | From f795d0a17a93d1f5822b887bc73e42fb3919b97c Mon Sep 17 00:00:00 2001 From: "Evgeny @ SimpleX Chat" <259188159+evgeny-simplex@users.noreply.github.com> Date: Thu, 19 Nov 2026 21:31:36 +0000 Subject: [PATCH 07/20] docs: app changes come with app tests on the core's recorded responses (#8252) --- docs/CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 3479d43014..7262803694 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -95,6 +95,7 @@ For some complex features we create feature branches that will be merged once re 4. Mark the pull request ready for review once it is ready. CI then runs the full matrix on each push, and the code owners are requested for review. 5. Mark it as a draft again when more work is needed. After the approval, the pull request is merged by squash once CI passes. 6. A change to a scope without CI tests adds its build and tests to CI in the same pull request. +7. A change of the apps' code adds, in the same pull request, app tests of all its changes on the core's real responses: core tests record the responses and events in tests/fixtures/api, and the Kotlin and iOS tests run the app code on them, with any platform service the code calls mocked (CI guide: "App test fixtures"). ## Differences between GHC 8.10.7 and GHC 9.6.3 From 804242661e854ca1a3b646684482d8337edd3f38 Mon Sep 17 00:00:00 2001 From: "Evgeny @ SimpleX Chat" <259188159+evgeny-simplex@users.noreply.github.com> Date: Fri, 20 Nov 2026 08:45:18 +0000 Subject: [PATCH 08/20] ci: decide the library claim from the written releases (#8137) * ci: test the library claim when reads return the previous releases * ci: decide the library claim from the written releases --- scripts/ci/packages_release.py | 14 ++++---- scripts/ci/test_packages_release.py | 54 ++++++++++++++++++++--------- 2 files changed, 45 insertions(+), 23 deletions(-) diff --git a/scripts/ci/packages_release.py b/scripts/ci/packages_release.py index 9a10f5b721..57d959f17a 100644 --- a/scripts/ci/packages_release.py +++ b/scripts/ci/packages_release.py @@ -651,15 +651,15 @@ def read_releases() -> tuple[dict, str | None]: return tomllib.loads(base64.b64decode(file["content"]).decode()), file["sha"] -def record_releases(entries: list[tuple[str, str]], commit: str) -> str: - """Adds the entries in one commit of simplex-chat-libs and returns that commit.""" +def record_releases(entries: list[tuple[str, str]], commit: str) -> tuple[dict, str]: + """Adds the entries in one commit of simplex-chat-libs and returns the releases of that commit with its sha.""" message = ", ".join(f"{key} {version}" for key, version in entries) attempt = 1 while True: releases, blob = read_releases() updated = add_releases(releases, entries, commit) if blob and updated == releases: - return libs_api(f"commits?path={RELEASES_FILE}&per_page=1")[0]["sha"] + return updated, libs_api(f"commits?path={RELEASES_FILE}&per_page=1")[0]["sha"] body = { "message": message, "content": base64.b64encode(render_releases(updated).encode()).decode(), @@ -667,7 +667,7 @@ def record_releases(entries: list[tuple[str, str]], commit: str) -> str: **({"sha": blob} if blob else {}), } try: - return libs_api(f"contents/{RELEASES_FILE}", "PUT", body)["commit"]["sha"] + return updated, libs_api(f"contents/{RELEASES_FILE}", "PUT", body)["commit"]["sha"] except urllib.error.HTTPError as e: # 409 and 422: another writer changed or created the file since it was read if e.code not in (409, 422) or attempt == RECORD_ATTEMPTS: @@ -746,8 +746,7 @@ def claim_core(version: str, commit: str, branch: str) -> None: return if problem := types_problem(version, releases, branch): sys.exit(problem) - libs_commit = record_releases([(core_key(branch), version)], commit) - releases, _ = read_releases() + releases, libs_commit = record_releases([(core_key(branch), version)], commit) if recorded_core_commit(releases, version) == commit: print("claim=new") print(f"commit={libs_commit}") @@ -894,7 +893,8 @@ def record(args: argparse.Namespace) -> None: entries = [(key, version) for key, version in versions if version] if not entries: sys.exit("nothing to record") - print(record_releases(entries, args.commit)) + _, libs_commit = record_releases(entries, args.commit) + print(libs_commit) def test_names() -> None: diff --git a/scripts/ci/test_packages_release.py b/scripts/ci/test_packages_release.py index 6b7603eae5..58031f92a2 100644 --- a/scripts/ci/test_packages_release.py +++ b/scripts/ci/test_packages_release.py @@ -88,6 +88,10 @@ def listed_release(tag: str, assets: list[str], n: int, draft: bool = False, bod return {"id": n, "tag_name": tag, "draft": draft, "body": body, **github_release(assets, n)} +def releases_file(releases: dict, blob: str) -> dict: + return {"content": base64.b64encode(render_releases(releases).encode()).decode(), "sha": blob} + + def state(**overrides) -> State: current = State( libs_tag="core-1.0.0.1", @@ -339,9 +343,6 @@ class ReleasesFileTest(unittest.TestCase): class RecordReleasesTest(unittest.TestCase): - def file(self, releases, blob): - return {"content": base64.b64encode(render_releases(releases).encode()).decode(), "sha": blob} - def conflict(self): error = urllib.error.HTTPError("url", 409, "Conflict", email.message.Message(), io.BytesIO()) self.addCleanup(error.close) @@ -355,13 +356,13 @@ class RecordReleasesTest(unittest.TestCase): return None if method == "GET" else {"commit": {"sha": "libs1"}} with mock.patch.object(packages_release, "libs_api", api): - self.assertEqual(record_releases([("core", "7.1.0.12")], "sx1"), "libs1") + self.assertEqual(record_releases([("core", "7.1.0.12")], "sx1"), ({"core": {"7.1.0.12": "sx1"}}, "libs1")) _, method, body = calls[1] self.assertEqual((method, body["message"], "sha" in body), ("PUT", "core 7.1.0.12", False)) self.assertEqual(tomllib.loads(base64.b64decode(body["content"]).decode()), {"core": {"7.1.0.12": "sx1"}}) def test_retries_when_another_writer_changed_the_file(self): - reads = iter([self.file({"core": {"1": "a"}}, "blob1"), self.file({"core": {"1": "a", "2": "b"}}, "blob2")]) + reads = iter([releases_file({"core": {"1": "a"}}, "blob1"), releases_file({"core": {"1": "a", "2": "b"}}, "blob2")]) puts = [] def api(path, method="GET", body=None): @@ -372,21 +373,19 @@ class RecordReleasesTest(unittest.TestCase): raise self.conflict() return {"commit": {"sha": "libs2"}} + written = {"core": {"1": "a", "2": "b"}, "npm": {"simplex-chat": {"3": "sx3"}}} with mock.patch.object(packages_release, "libs_api", api): - self.assertEqual(record_releases([("npm/simplex-chat", "3")], "sx3"), "libs2") + self.assertEqual(record_releases([("npm/simplex-chat", "3")], "sx3"), (written, "libs2")) self.assertEqual([body["sha"] for body in puts], ["blob1", "blob2"]) - self.assertEqual( - tomllib.loads(base64.b64decode(puts[1]["content"]).decode()), - {"core": {"1": "a", "2": "b"}, "npm": {"simplex-chat": {"3": "sx3"}}}, - ) + self.assertEqual(tomllib.loads(base64.b64decode(puts[1]["content"]).decode()), written) def test_recorded_entries_return_the_last_commit_of_the_file(self): def api(path, method="GET", body=None): self.assertEqual(method, "GET") - return [{"sha": "libs0"}] if path.startswith("commits") else self.file({"core": {"1": "a"}}, "blob1") + return [{"sha": "libs0"}] if path.startswith("commits") else releases_file({"core": {"1": "a"}}, "blob1") with mock.patch.object(packages_release, "libs_api", api): - self.assertEqual(record_releases([("core", "1")], "other"), "libs0") + self.assertEqual(record_releases([("core", "1")], "other"), ({"core": {"1": "a"}}, "libs0")) class GitRepoTest(unittest.TestCase): @@ -640,7 +639,7 @@ class PackageStateTest(GitRepoTest): with ( mock.patch.object(packages_release, "ROOT", self.repo), mock.patch.object(packages_release, "python_project", return_value="simplex-chat"), - mock.patch.object(packages_release, "record_releases", return_value="libs1") as record, + mock.patch.object(packages_release, "record_releases", return_value=({}, "libs1")) as record, contextlib.redirect_stdout(io.StringIO()), ): packages_release.main(["record", "--commit", "sx1", "--mcp", "0.2.0"]) @@ -786,11 +785,10 @@ class PublishReleaseTest(unittest.TestCase): class ClaimCoreTest(unittest.TestCase): def claim(self, recorded, after_record=None, problem=None, version="7.1.0.12", branch="master"): - reads = iter([(recorded, "blob"), (after_record or recorded, "blob")]) - self.record = mock.Mock(return_value="libs1") + self.record = mock.Mock(return_value=(after_record or recorded, "libs1")) output = io.StringIO() with ( - mock.patch.object(packages_release, "read_releases", lambda: next(reads)), + mock.patch.object(packages_release, "read_releases", return_value=(recorded, "blob")), mock.patch.object(packages_release, "record_releases", self.record), mock.patch.object(packages_release, "types_problem", return_value=problem), contextlib.redirect_stdout(output), @@ -836,6 +834,30 @@ class ClaimCoreTest(unittest.TestCase): claimed = {"core": {"master": {"7.1.0.11": "sx0", "7.1.0.12": "sx2"}}} self.assertEqual(self.claim({"core": {"master": {"7.1.0.11": "sx0"}}}, claimed), ["claim=skip"]) + def test_written_claim_is_new_when_reads_return_the_previous_file(self): + previous = {"core": {"master": {"7.1.0.11": "sx0"}}} + puts = [] + + def api(path, method="GET", body=None): + if method == "GET": + return releases_file(previous, "blob1") + puts.append(body) + return {"commit": {"sha": "libs1"}} + + output = io.StringIO() + with ( + mock.patch.object(packages_release, "libs_api", api), + mock.patch.object(packages_release, "types_problem", return_value=None), + contextlib.redirect_stdout(output), + ): + claim_core("7.1.0.12", "sx1", "master") + self.assertEqual(output.getvalue().splitlines(), ["claim=new", "commit=libs1"]) + self.assertEqual([body["sha"] for body in puts], ["blob1"]) + self.assertEqual( + tomllib.loads(base64.b64decode(puts[0]["content"]).decode()), + {"core": {"master": {"7.1.0.11": "sx0", "7.1.0.12": "sx1"}}}, + ) + class TypesProblemTest(unittest.TestCase): def problem(self, types, changed=True, published=False, releases=None): From 14c0fa04a08afebb23cb7138c65f017f9abc9339 Mon Sep 17 00:00:00 2001 From: "Evgeny @ SimpleX Chat" <259188159+evgeny-simplex@users.noreply.github.com> Date: Fri, 20 Nov 2026 11:44:41 +0000 Subject: [PATCH 09/20] tests: record name fixtures after the channel join settles (#8250) --- tests/ChatTests/Names.hs | 10 ++++++++++ tests/fixtures/api/names/plan-known-failed.json | 1 + tests/fixtures/api/names/search-team.json | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/ChatTests/Names.hs b/tests/ChatTests/Names.hs index 6a2f1eedba..1453d64c16 100644 --- a/tests/ChatTests/Names.hs +++ b/tests/ChatTests/Names.hs @@ -322,6 +322,7 @@ testChannelDomainVerify ps = withSmpServerAndNames ps $ \reg -> alice ##> "/_verify domain #1" alice <## "SimpleX name #team verified" memberJoinChannel "team" [cath] [alice] shortLink fullLink bob + settleTeamJoin alice cath bob bob ##> "/_verify domain #1" bob <## "SimpleX name #team verified" -- the name is re-pointed to a different link: verification fails @@ -1007,10 +1008,18 @@ joinVerifiedTeam reg alice cath bob = do registerName reg teamSimplexName (channelNameRecord "team.simplex" (T.pack shortLink)) setChannelDomain alice cath "alice" "team" "team.simplex" memberJoinChannel "team" [cath] [alice] shortLink fullLink bob + settleTeamJoin alice cath bob bob ##> "/_verify domain #1" bob <## "SimpleX name #team verified" pure shortLink +settleTeamJoin :: HasCallStack => TestCC -> TestCC -> TestCC -> IO () +settleTeamJoin alice cath bob = do + alice #> "#team hi" + cath <# "#team> hi" + bob <# "#team> hi [>>]" + waitQueuedLinkUpdates alice + knownGroupPlan :: HasCallStack => String -> String -> TestCC -> IO () knownGroupPlan g name cc = do cc <## ("group link: known group #" <> g) @@ -1099,6 +1108,7 @@ withTeamChats test = withChannelChats $ \reg alice cath bob -> do alice <## "new contact address set" connectBobByName "@team.simplex" alice bob joinChannelByName "team" alice cath bob + settleTeamJoin alice cath bob test reg contactLink channelLink alice bob testNameRecordOrWarning :: IO () diff --git a/tests/fixtures/api/names/plan-known-failed.json b/tests/fixtures/api/names/plan-known-failed.json index d353142e9e..7a2872e115 100644 --- a/tests/fixtures/api/names/plan-known-failed.json +++ b/tests/fixtures/api/names/plan-known-failed.json @@ -161,6 +161,7 @@ "connShortLink": "connShortLink" } }, + "rosterVersion": 0, "updatedAt": "1970-01-01T00:00:00Z", "useRelays": true, "userMemberProfileSentAt": "1970-01-01T00:00:00Z", diff --git a/tests/fixtures/api/names/search-team.json b/tests/fixtures/api/names/search-team.json index 4a323cd752..84fc33d23a 100644 --- a/tests/fixtures/api/names/search-team.json +++ b/tests/fixtures/api/names/search-team.json @@ -89,7 +89,7 @@ } }, "groupSummary": { - "currentMembers": 2, + "currentMembers": 3, "publicMemberCount": 1 }, "localAlias": "", @@ -161,6 +161,7 @@ "connShortLink": "connShortLink" } }, + "rosterVersion": 0, "updatedAt": "1970-01-01T00:00:00Z", "useRelays": true, "userMemberProfileSentAt": "1970-01-01T00:00:00Z", From 1966ac32e3f316acb66d8b928d680f4f12782ce5 Mon Sep 17 00:00:00 2001 From: "Evgeny @ SimpleX Chat" <259188159+evgeny-simplex@users.noreply.github.com> Date: Fri, 20 Nov 2026 12:28:26 +0000 Subject: [PATCH 10/20] core, ci: update sqlcipher-simple to 0.4.19.0 and simplexmq (#8270) * update sqlcipher-simple to 0.4.19.0 * sqlcipher-simple from simplex-chat/sqlcipher-simple * update simplexmq * ci: restore source repositories only for the same cabal.project * ci: keep restored source checkouts only at their pinned commits --- cabal.project | 4 ++-- scripts/ci/prune-old-builds.sh | 7 +++++++ scripts/nix/sha256map.nix | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cabal.project b/cabal.project index 8b9737a40e..7c7fe8ac23 100644 --- a/cabal.project +++ b/cabal.project @@ -21,7 +21,7 @@ constraints: zip +disable-bzip2 +disable-zstd source-repository-package type: git location: https://github.com/simplex-chat/simplexmq.git - tag: fdbcb24d86460977382e1237591cd505c3b37fa1 + tag: d38bcf50131d59f027d170731e4ea22031650611 source-repository-package type: git @@ -36,7 +36,7 @@ source-repository-package source-repository-package type: git location: https://github.com/simplex-chat/sqlcipher-simple.git - tag: a46bd361a19376c5211f1058908fc0ae6bf42446 + tag: 6bf2796de625dca678c70e98560010c6ec7ed635 source-repository-package type: git diff --git a/scripts/ci/prune-old-builds.sh b/scripts/ci/prune-old-builds.sh index 520fb6bf45..f2a7b88f4b 100755 --- a/scripts/ci/prune-old-builds.sh +++ b/scripts/ci/prune-old-builds.sh @@ -6,4 +6,11 @@ for dir in "$@"; do if [ -d "$dir/build" ]; then find "$dir/build" -mindepth 3 -maxdepth 3 -type d -name 'simplex-chat-*' ! -name "simplex-chat-$version" -exec rm -rf {} + fi + for src in "$dir"/src/*/; do + [ -e "$src.git" ] || continue + rev=$(git -C "$src" rev-parse HEAD 2>/dev/null || true) + if [ -z "$rev" ] || ! grep -q "tag: $rev" cabal.project; then + rm -rf "$src" + fi + done done diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix index 3db71b94b7..3b9632effe 100644 --- a/scripts/nix/sha256map.nix +++ b/scripts/nix/sha256map.nix @@ -1,8 +1,8 @@ { - "https://github.com/simplex-chat/simplexmq.git"."fdbcb24d86460977382e1237591cd505c3b37fa1" = "0w384jwxfaw8n7fvcc55c8076dpiclb29vgmh7vdzhwyz20grk44"; + "https://github.com/simplex-chat/simplexmq.git"."d38bcf50131d59f027d170731e4ea22031650611" = "1qd18bqg6zji5s6rcaw63rdbyj82sc5jn1apfq2pbkxs9cybwjyy"; "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38"; "https://github.com/simplex-chat/direct-sqlcipher.git"."2330df3dc8c4b660674d3c02d76bb86f66c2abee" = "11pfj1vqsjdl26nplkr2l6z1xj7cn153qijj5gknmlzq3krn7x1i"; - "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl"; + "https://github.com/simplex-chat/sqlcipher-simple.git"."6bf2796de625dca678c70e98560010c6ec7ed635" = "0mgkm2d6c4vsv689niy2fi0q58pk13mpvm4idzmn0vhwyi2wmv1g"; "https://github.com/simplex-chat/aeson.git"."aab7b5a14d6c5ea64c64dcaee418de1bb00dcc2b" = "0jz7kda8gai893vyvj96fy962ncv8dcsx71fbddyy8zrvc88jfrr"; "https://github.com/simplex-chat/haskell-terminal.git"."f708b00009b54890172068f168bf98508ffcd495" = "0zmq7lmfsk8m340g47g5963yba7i88n4afa6z93sg9px5jv1mijj"; "https://github.com/simplex-chat/android-support.git"."9aa09f148089d6752ce563b14c2df1895718d806" = "0pbf2pf13v2kjzi397nr13f1h3jv0imvsq8rpiyy2qyx5vd50pqn"; From d08e249ea56a96560d0aafa278c3ca9d648fc1cb Mon Sep 17 00:00:00 2001 From: "Evgeny @ SimpleX Chat" <259188159+evgeny-simplex@users.noreply.github.com> Date: Fri, 20 Nov 2026 12:29:04 +0000 Subject: [PATCH 11/20] android, desktop, ios: copy markdown files with line breaks, and the whole file with one button (#8269) * android, desktop: test copying lines from the markdown text view * android, desktop: keep line breaks in text copied from markdown files * android, desktop: check the last copied text in the markdown view test * android, desktop, ios: button to copy the whole markdown file * android, desktop: test the markdown file copy button * android, desktop, ios: ask before copying markdown files over 128 KB * android, desktop, ios: title the markdown copy alerts File too large * ios: test the markdown file copy button * android, desktop, ios: preview the markdown file view and test the copy limit * android, desktop, ios: snapshot references of the markdown file view --- .../Chat/ChatItem/MarkdownFileView.swift | 43 +++++- .../MarkdownFileView-dark-large.png | Bin 0 -> 18217 bytes .../MarkdownFileView-light-large.png | Bin 0 -> 20769 bytes .../ios/SimpleX Snapshots/SnapshotTests.swift | 1 + .../MarkdownFileTests.swift | 26 ++++ apps/ios/SimpleX.xcodeproj/project.pbxproj | 4 + .../views/chat/item/MarkdownFileView.kt | 98 +++++++++++-- .../moko-resources/base/strings.xml | 3 + .../chat/simplex/app/MarkdownFileViewTest.kt | 134 ++++++++++++++++++ .../kotlin/chat/simplex/app/SnapshotTest.kt | 1 + ....PreviewMarkdownFileView-dark-font-100.png | Bin 0 -> 17560 bytes ...PreviewMarkdownFileView-light-font-100.png | Bin 0 -> 16070 bytes 12 files changed, 294 insertions(+), 16 deletions(-) create mode 100644 apps/ios/SimpleX Snapshots/References/MarkdownFileView-dark-large.png create mode 100644 apps/ios/SimpleX Snapshots/References/MarkdownFileView-light-large.png create mode 100644 apps/ios/SimpleX Unit Tests/MarkdownFileTests.swift create mode 100644 apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/MarkdownFileViewTest.kt create mode 100644 apps/multiplatform/common/src/desktopTest/snapshots/MarkdownFileView.PreviewMarkdownFileView-dark-font-100.png create mode 100644 apps/multiplatform/common/src/desktopTest/snapshots/MarkdownFileView.PreviewMarkdownFileView-light-font-100.png diff --git a/apps/ios/Shared/Views/Chat/ChatItem/MarkdownFileView.swift b/apps/ios/Shared/Views/Chat/ChatItem/MarkdownFileView.swift index 555ff9d429..508606e124 100644 --- a/apps/ios/Shared/Views/Chat/ChatItem/MarkdownFileView.swift +++ b/apps/ios/Shared/Views/Chat/ChatItem/MarkdownFileView.swift @@ -3,6 +3,7 @@ import SimpleXChat import Ink private let MAX_MARKDOWN_VIEW_SIZE: Int64 = 1_048_576 +private let MAX_MARKDOWN_COPY_SIZE: Int64 = 131_072 private let MAX_MARKDOWN_LINE_LENGTH = 15_000 private let MAX_MARKDOWN_NESTING = 16 private let MAX_MARKDOWN_LINK_NESTING = 4 @@ -27,7 +28,7 @@ func showMarkdownFile(_ file: CIFile) { let hasBidiControls = text.unicodeScalars.contains(where: isBidiControl) await MainActor.run { showAppSheet { - MarkdownFileView(file: file, fileSource: fileSource, lines: shownLines, html: html, hasBidiControls: hasBidiControls) + MarkdownFileView(file: file, fileSource: fileSource, text: text, lines: shownLines, html: html, hasBidiControls: hasBidiControls) } } } catch { @@ -166,10 +167,31 @@ private func openMarkdownFileLink(_ url: URL) { } } +func copyMarkdownFile(_ file: CIFile, _ text: String) { + if file.fileSize > MAX_MARKDOWN_COPY_SIZE { + showAlert( + NSLocalizedString("File too large", comment: "alert title"), + message: String.localizedStringWithFormat( + NSLocalizedString("Your file is %@. Do you want to copy it?", comment: "alert message"), + ByteCountFormatter.string(fromByteCount: file.fileSize, countStyle: .binary) + ), + actions: {[ + cancelAlertAction, + UIAlertAction(title: NSLocalizedString("Copy", comment: "alert button"), style: .default) { _ in + UIPasteboard.general.string = text + } + ]} + ) + } else { + UIPasteboard.general.string = text + } +} + struct MarkdownFileView: View { @AppStorage(DEFAULT_MARKDOWN_FILE_TEXT_VIEW) private var textView = false let file: CIFile let fileSource: CryptoFile + let text: String let lines: [String] let html: String? let hasBidiControls: Bool @@ -203,6 +225,11 @@ struct MarkdownFileView: View { .navigationBarTitleDisplayMode(.inline) .toolbar { ToolbarItemGroup(placement: .navigationBarTrailing) { + Button { + copyMarkdownFile(file, text) + } label: { + Image(systemName: "doc.on.doc") + } if html != nil { Button { textView.toggle() @@ -221,3 +248,17 @@ struct MarkdownFileView: View { .navigationViewStyle(.stack) } } + +struct MarkdownFileView_Previews: PreviewProvider { + static var previews: some View { + let text = "# Release notes\n\n- markdown files in chats\n- a button to copy the file\n" + MarkdownFileView( + file: CIFile.getSample(fileName: "notes.md", fileSize: Int64(text.utf8.count), filePath: "notes.md"), + fileSource: CryptoFile.plain("notes.md"), + text: text, + lines: text.components(separatedBy: "\n"), + html: nil, + hasBidiControls: false + ) + } +} diff --git a/apps/ios/SimpleX Snapshots/References/MarkdownFileView-dark-large.png b/apps/ios/SimpleX Snapshots/References/MarkdownFileView-dark-large.png new file mode 100644 index 0000000000000000000000000000000000000000..a9969a11869059f0347ea6f46ac1d55c1443b57c GIT binary patch literal 18217 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 R{ [SnapshotScene] { SnapshotScene(IntegrityErrorItemView_Previews.self, allSizes: true), SnapshotScene(LargeLinkPreview_Previews.self, allSizes: true), SnapshotScene(LocalAuthView_Previews.self), + SnapshotScene(MarkdownFileView_Previews.self, device: true), SnapshotScene(MarkdownHelp_Previews.self), SnapshotScene(MarkedDeletedItemView_Previews.self, allSizes: true), SnapshotScene(MemberAdmissionView_Previews.self), diff --git a/apps/ios/SimpleX Unit Tests/MarkdownFileTests.swift b/apps/ios/SimpleX Unit Tests/MarkdownFileTests.swift new file mode 100644 index 0000000000..92e931f3e5 --- /dev/null +++ b/apps/ios/SimpleX Unit Tests/MarkdownFileTests.swift @@ -0,0 +1,26 @@ +import XCTest +import UIKit +@testable import SimpleX +@testable import SimpleXChat + +final class MarkdownFileTests: XCTestCase { + @MainActor + func testCopyAsksAbove128KB() async throws { + let text = "alpha\n\ngamma" + UIPasteboard.general.string = "unchanged" + copyMarkdownFile(CIFile.getSample(fileSize: 131_072), text) + XCTAssertEqual(UIPasteboard.general.string, text) + UIPasteboard.general.string = "unchanged" + copyMarkdownFile(CIFile.getSample(fileSize: 131_073), text) + try await waitFor { (getTopViewController() as? UIAlertController)?.isBeingPresented == false } + let alert = try XCTUnwrap(getTopViewController() as? UIAlertController) + XCTAssertEqual(alert.title, "File too large") + XCTAssertEqual(alert.message, "Your file is 128 KB. Do you want to copy it?") + XCTAssertEqual(UIPasteboard.general.string, "unchanged") + let copy = try XCTUnwrap(alert.actions.first { $0.title == "Copy" }) + let handler = unsafeBitCast(copy.value(forKey: "handler") as AnyObject, to: (@convention(block) (UIAlertAction) -> Void).self) + await withCheckedContinuation { done in alert.dismiss(animated: false) { done.resume() } } + handler(copy) + XCTAssertEqual(UIPasteboard.general.string, text) + } +} diff --git a/apps/ios/SimpleX.xcodeproj/project.pbxproj b/apps/ios/SimpleX.xcodeproj/project.pbxproj index 530bc4c124..3242c7ea27 100644 --- a/apps/ios/SimpleX.xcodeproj/project.pbxproj +++ b/apps/ios/SimpleX.xcodeproj/project.pbxproj @@ -272,6 +272,7 @@ E5AEC0C22F9C000100270665 /* SnapshotTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5AEC0C12F9C000100270665 /* SnapshotTests.swift */; }; 4E57A1E70000000000000006 /* NameAlertsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E57A1E70000000000000005 /* NameAlertsTests.swift */; }; 4E57A1E70000000000000014 /* ChatItemUpdateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E57A1E70000000000000013 /* ChatItemUpdateTests.swift */; }; + 6D4F1C2A9B3E000000000002 /* MarkdownFileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D4F1C2A9B3E000000000001 /* MarkdownFileTests.swift */; }; E5AEC0AF2F91A73500270665 /* ComposeChatLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5AEC0AE2F91A73500270665 /* ComposeChatLinkView.swift */; }; E5C0BBE82F82B45500EA7527 /* SimpleXAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E5C0BBE72F82B45500EA7527 /* SimpleXAssets.xcassets */; }; E5C0BBEB2F82B45500EA7527 /* SharedAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E5C0BBEA2F82B45500EA7527 /* SharedAssets.xcassets */; }; @@ -684,6 +685,7 @@ E5AEC0C32F9C000100270665 /* SimpleX Snapshots.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SimpleX Snapshots.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 4E57A1E70000000000000005 /* NameAlertsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NameAlertsTests.swift; sourceTree = ""; }; 4E57A1E70000000000000013 /* ChatItemUpdateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemUpdateTests.swift; sourceTree = ""; }; + 6D4F1C2A9B3E000000000001 /* MarkdownFileTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkdownFileTests.swift; sourceTree = ""; }; 4E57A1E70000000000000007 /* SimpleX Unit Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SimpleX Unit Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; E5AEC0AE2F91A73500270665 /* ComposeChatLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeChatLinkView.swift; sourceTree = ""; }; E5C0BBE72F82B45500EA7527 /* SimpleXAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = SimpleXAssets.xcassets; sourceTree = ""; }; @@ -1038,6 +1040,7 @@ children = ( 4E57A1E70000000000000005 /* NameAlertsTests.swift */, 4E57A1E70000000000000013 /* ChatItemUpdateTests.swift */, + 6D4F1C2A9B3E000000000001 /* MarkdownFileTests.swift */, ); path = "SimpleX Unit Tests"; sourceTree = ""; @@ -1926,6 +1929,7 @@ files = ( 4E57A1E70000000000000006 /* NameAlertsTests.swift in Sources */, 4E57A1E70000000000000014 /* ChatItemUpdateTests.swift in Sources */, + 6D4F1C2A9B3E000000000002 /* MarkdownFileTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkdownFileView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkdownFileView.kt index a763e47d43..7681120144 100644 --- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkdownFileView.kt +++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/MarkdownFileView.kt @@ -1,18 +1,22 @@ package chat.simplex.common.views.chat.item import SectionBottomSpacer +import androidx.compose.desktop.ui.tooling.preview.Preview import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.items import androidx.compose.foundation.text.selection.SelectionContainer import androidx.compose.material.* import androidx.compose.runtime.* +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.painter.BitmapPainter +import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.platform.UriHandler +import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString @@ -25,6 +29,7 @@ import chat.simplex.common.model.* import chat.simplex.common.model.ChatController.appPrefs import chat.simplex.common.platform.* import chat.simplex.common.ui.theme.DEFAULT_PADDING +import chat.simplex.common.ui.theme.SimpleXTheme import chat.simplex.common.ui.theme.WarningOrange import chat.simplex.common.views.chat.topPaddingToContent import chat.simplex.common.views.helpers.* @@ -41,6 +46,7 @@ import dev.icerock.moko.resources.compose.painterResource import dev.icerock.moko.resources.compose.stringResource import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.first +import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext import org.intellij.markdown.MarkdownElementTypes import org.intellij.markdown.ast.ASTNode @@ -56,6 +62,8 @@ import java.util.Base64 private const val DATA_IMAGE = "data:image/" private val IMAGE_TYPES = listOf(ImageFileType.JPEG, ImageFileType.PNG) private const val MAX_MARKDOWN_VIEW_SIZE: Long = 1_048_576 +private const val MAX_MARKDOWN_COPY_SIZE = 131_072 +private const val MAX_ANDROID_COPY_SIZE = 524_288 private const val MAX_MARKDOWN_LINE_LENGTH = 15_000 private const val MAX_MARKDOWN_DEPTH = 32 private const val MAX_MARKDOWN_TABLE_ROWS = 200 @@ -67,7 +75,9 @@ private val bidiControlChar = Regex("[\\u061C\\u200E\\u200F\\u202A-\\u202E\\u206 private val invisibleCharMarkerStyle = SpanStyle(color = WarningOrange) -private class MarkdownDocument(val lines: List, val formatted: State.Success?, val hasBidiControls: Boolean) +internal class MarkdownLine(val text: String, val lineBreak: Boolean) + +internal class MarkdownDocument(val text: String, val lines: List, val formatted: State.Success?, val hasBidiControls: Boolean) fun isMarkdownFile(file: CIFile): Boolean = file.fileSize <= MAX_MARKDOWN_VIEW_SIZE && file.fileName.substringAfterLast('.', "").lowercase() in listOf("md", "markdown") @@ -90,26 +100,31 @@ fun showMarkdownFile(file: CIFile) { AlertManager.shared.showAlertMsg(generalGetString(MR.strings.error), e.message) return@withLongRunningApi } - val text = decodedText(bytes) - val lines = text.lines() - val formatted = if (lines.all { it.length <= MAX_MARKDOWN_LINE_LENGTH }) formattedWithinLimits(text) else null - val document = MarkdownDocument( - lines.flatMap { line -> line.chunked(MAX_MARKDOWN_LINE_LENGTH).ifEmpty { listOf("") } }, - formatted, - bidiControlChar.containsMatchIn(text) - ) + val document = markdownDocument(bytes) withContext(Dispatchers.Main) { if (appPlatform.isDesktop && ModalManager.center.isTopModalOpen(ModalViewId.MARKDOWN_FILE)) ModalManager.center.closeModal() - ModalManager.center.showModal(id = ModalViewId.MARKDOWN_FILE, endButtons = { - if (formatted != null) MarkdownViewSwitch() - MarkdownFileSaveButton(file, bytes) - }) { + ModalManager.center.showModal(id = ModalViewId.MARKDOWN_FILE, endButtons = { MarkdownFileButtons(file, bytes, document) }) { key(this) { MarkdownFileView(file.fileName, document) } } } } } +internal suspend fun markdownDocument(bytes: ByteArray): MarkdownDocument { + val text = decodedText(bytes) + val lines = text.lines() + val formatted = if (lines.all { it.length <= MAX_MARKDOWN_LINE_LENGTH }) formattedWithinLimits(text) else null + return MarkdownDocument( + text, + lines.flatMapIndexed { i, line -> + val chunks = line.chunked(MAX_MARKDOWN_LINE_LENGTH).ifEmpty { listOf("") } + chunks.mapIndexed { j, chunk -> MarkdownLine(chunk, lineBreak = i < lines.lastIndex && j == chunks.lastIndex) } + }, + formatted, + bidiControlChar.containsMatchIn(text) + ) +} + private fun decodedText(bytes: ByteArray): String = Charsets.UTF_8.newDecoder() .onMalformedInput(CodingErrorAction.REPLACE) @@ -145,6 +160,39 @@ private fun MarkdownViewSwitch() { } } +@Composable +private fun MarkdownFileButtons(file: CIFile, bytes: ByteArray, document: MarkdownDocument) { + MarkdownFileCopyButton(document.text, bytes.size, if (appPlatform.isAndroid) MAX_ANDROID_COPY_SIZE else null) + if (document.formatted != null) MarkdownViewSwitch() + MarkdownFileSaveButton(file, bytes) +} + +@Composable +internal fun MarkdownFileCopyButton(text: String, fileSize: Int, maxSize: Int?) { + val clipboard = LocalClipboardManager.current + IconButton({ + val copy = { + clipboard.setText(AnnotatedString(text)) + showToast(generalGetString(MR.strings.copied)) + } + when { + maxSize != null && fileSize > maxSize -> AlertManager.shared.showAlertMsg( + generalGetString(MR.strings.markdown_file_too_large), + String.format(generalGetString(MR.strings.markdown_file_copy_limit), formatBytes(maxSize.toLong())) + ) + fileSize > MAX_MARKDOWN_COPY_SIZE -> AlertManager.shared.showAlertDialog( + title = generalGetString(MR.strings.markdown_file_too_large), + text = String.format(generalGetString(MR.strings.markdown_file_copy_large), formatBytes(fileSize.toLong())), + confirmText = generalGetString(MR.strings.copy_verb), + onConfirm = copy + ) + else -> copy() + } + }) { + Icon(painterResource(MR.images.ic_content_copy), stringResource(MR.strings.copy_verb), tint = MaterialTheme.colors.primary) + } +} + @Composable private fun MarkdownFileSaveButton(file: CIFile, bytes: ByteArray) { val saveFileLauncher = rememberFileChooserLauncher(false, bytes) { to: URI? -> @@ -156,14 +204,17 @@ private fun MarkdownFileSaveButton(file: CIFile, bytes: ByteArray) { } @Composable -private fun MarkdownFileView(fileName: String, document: MarkdownDocument) { +internal fun MarkdownFileView(fileName: String, document: MarkdownDocument) { val textView = remember { appPrefs.markdownFileTextView.state } val formatted = document.formatted if (textView.value || formatted == null) { SelectionContainer { MarkdownFileColumn(fileName, document.hasBidiControls) { items(document.lines) { line -> - Text(remember(line) { withInvisibleCharMarkers(line) }, Modifier.padding(horizontal = DEFAULT_PADDING), fontFamily = FontFamily.Monospace) + Box(Modifier.padding(horizontal = DEFAULT_PADDING)) { + Text(remember(line) { withInvisibleCharMarkers(line.text) }, fontFamily = FontFamily.Monospace) + if (line.lineBreak) SelectableLineBreak() + } } } } @@ -172,6 +223,11 @@ private fun MarkdownFileView(fileName: String, document: MarkdownDocument) { } } +@Composable +private fun BoxScope.SelectableLineBreak() { + Text("\n", Modifier.align(Alignment.BottomEnd).height(1.dp).clearAndSetSemantics {}) +} + private fun withInvisibleCharMarkers(line: String): AnnotatedString = buildAnnotatedString { var start = 0 invisibleChar.findAll(line).forEach { @@ -294,3 +350,15 @@ private fun hasImageSignature(base64: String): Boolean { val header = runCatching { Base64.getDecoder().decode(base64.take(12)) }.getOrNull() ?: return false return IMAGE_TYPES.any { it.matches(header) } } + +@Preview +@Composable +fun PreviewMarkdownFileView() { + val bytes = remember { "# Release notes\n\n- markdown files in chats\n- a button to copy the file\n".encodeToByteArray() } + val document = remember { runBlocking { markdownDocument(bytes) } } + SimpleXTheme { + ModalView(close = {}, endButtons = { MarkdownFileButtons(CIFile.getSample(fileName = "notes.md"), bytes, document) }) { + MarkdownFileView("notes.md", document) + } + } +} diff --git a/apps/multiplatform/common/src/commonMain/moko-resources/base/strings.xml b/apps/multiplatform/common/src/commonMain/moko-resources/base/strings.xml index af5b3a089d..27cf5f7f17 100644 --- a/apps/multiplatform/common/src/commonMain/moko-resources/base/strings.xml +++ b/apps/multiplatform/common/src/commonMain/moko-resources/base/strings.xml @@ -721,6 +721,9 @@ Formatted view Text view This file has text direction characters. The text can be shown in a different order than it is written. + File too large + Only files up to %s can be copied. Save the file to open it in another app. + Your file is %s. Do you want to copy it? Loading the file Please, wait while the file is being loaded from the linked mobile File error diff --git a/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/MarkdownFileViewTest.kt b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/MarkdownFileViewTest.kt new file mode 100644 index 0000000000..14bb297d90 --- /dev/null +++ b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/MarkdownFileViewTest.kt @@ -0,0 +1,134 @@ +package chat.simplex.app + +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.input.key.Key +import androidx.compose.ui.platform.ClipEntry +import androidx.compose.ui.platform.Clipboard +import androidx.compose.ui.platform.ClipboardManager +import androidx.compose.ui.platform.LocalClipboard +import androidx.compose.ui.platform.LocalClipboardManager +import androidx.compose.ui.platform.NativeClipboard +import androidx.compose.ui.test.ExperimentalTestApi +import androidx.compose.ui.test.onNodeWithContentDescription +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.onRoot +import androidx.compose.ui.test.performClick +import androidx.compose.ui.test.performKeyInput +import androidx.compose.ui.test.performMouseInput +import androidx.compose.ui.test.pressKey +import androidx.compose.ui.test.runComposeUiTest +import androidx.compose.ui.text.AnnotatedString +import chat.simplex.common.model.ChatController.appPrefs +import chat.simplex.common.simplexWindowState +import chat.simplex.common.views.chat.item.MarkdownFileCopyButton +import chat.simplex.common.views.chat.item.MarkdownFileView +import chat.simplex.common.views.chat.item.markdownDocument +import chat.simplex.common.views.helpers.AlertManager +import chat.simplex.common.views.helpers.LocalAppBarHandler +import chat.simplex.common.views.helpers.rememberAppBarHandler +import kotlinx.coroutines.runBlocking +import java.awt.datatransfer.DataFlavor +import java.awt.datatransfer.Transferable +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertNull + +@OptIn(ExperimentalTestApi::class) +class MarkdownFileViewTest { + @Test + fun copiedSelectionKeepsLineBreaks() = runComposeUiTest { + val textView = appPrefs.markdownFileTextView.get() + appPrefs.markdownFileTextView.set(true) + try { + val clipboard = RecordingClipboard() + val document = runBlocking { markdownDocument("alpha\n\ngamma".toByteArray()) } + setContent { + CompositionLocalProvider(LocalClipboard provides clipboard, LocalAppBarHandler provides rememberAppBarHandler()) { + MarkdownFileView("test.md", document) + } + } + val first = onNodeWithText("alpha").fetchSemanticsNode().boundsInRoot + val last = onNodeWithText("gamma").fetchSemanticsNode().boundsInRoot + onRoot().performMouseInput { + moveTo(Offset(first.left + 1f, first.center.y)) + press() + moveTo(Offset(last.right + 10f, last.center.y)) + release() + } + onRoot().performKeyInput { pressKey(Key.Copy) } + waitForIdle() + assertEquals("alpha\n\ngamma", clipboard.text) + } finally { + appPrefs.markdownFileTextView.set(textView) + } + } + + @Test + fun copyButtonWarnsAbove128KB() = runComposeUiTest { + var copied: String? = null + val clipboard = object : ClipboardManager { + override fun setText(annotatedString: AnnotatedString) { copied = annotatedString.text } + override fun getText(): AnnotatedString? = null + } + val document = runBlocking { markdownDocument("alpha\n\ngamma".toByteArray()) } + var fileSize by mutableStateOf(131_072) + try { + setContent { + CompositionLocalProvider(LocalClipboardManager provides clipboard) { + MarkdownFileCopyButton(document.text, fileSize, null) + } + AlertManager.shared.showInView() + } + onNodeWithContentDescription("Copy").performClick() + assertEquals("alpha\n\ngamma", copied) + copied = null + fileSize = 131_073 + onNodeWithContentDescription("Copy").performClick() + onNodeWithText("Your file is 128 KB. Do you want to copy it?").assertExists() + assertNull(copied) + onNodeWithText("Copy").performClick() + assertEquals("alpha\n\ngamma", copied) + } finally { + AlertManager.shared.hideAllAlerts() + simplexWindowState.toasts.clear() + } + } + + @Test + fun copyButtonRefusesAboveHardLimit() = runComposeUiTest { + var copied: String? = null + val clipboard = object : ClipboardManager { + override fun setText(annotatedString: AnnotatedString) { copied = annotatedString.text } + override fun getText(): AnnotatedString? = null + } + try { + setContent { + CompositionLocalProvider(LocalClipboardManager provides clipboard) { + MarkdownFileCopyButton("alpha", 524_289, 524_288) + } + AlertManager.shared.showInView() + } + onNodeWithContentDescription("Copy").performClick() + onNodeWithText("Only files up to 512 KB can be copied. Save the file to open it in another app.").assertExists() + assertNull(copied) + } finally { + AlertManager.shared.hideAllAlerts() + } + } +} + +private class RecordingClipboard : Clipboard { + var text: String? = null + + override suspend fun getClipEntry(): ClipEntry? = null + + override suspend fun setClipEntry(clipEntry: ClipEntry?) { + text = (clipEntry?.nativeClipEntry as Transferable).getTransferData(DataFlavor.stringFlavor) as String + } + + override val nativeClipboard: NativeClipboard get() = this +} diff --git a/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/SnapshotTest.kt b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/SnapshotTest.kt index 69c657e2a7..1d4f9c7167 100644 --- a/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/SnapshotTest.kt +++ b/apps/multiplatform/common/src/desktopTest/kotlin/chat/simplex/app/SnapshotTest.kt @@ -99,6 +99,7 @@ private val previewScenes = listOf( SnapshotScene("DeletedItemView.PreviewDeletedItemView", chatItemFontScales) { PreviewDeletedItemView() }, SnapshotScene("IntegrityErrorItemView.IntegrityErrorItemViewPreview", chatItemFontScales) { IntegrityErrorItemViewPreview() }, SnapshotScene("MarkedDeletedItemView.PreviewMarkedDeletedItemView", chatItemFontScales) { PreviewMarkedDeletedItemView() }, + SnapshotScene("MarkdownFileView.PreviewMarkdownFileView") { PreviewMarkdownFileView() }, SnapshotScene("ChatHelpView.PreviewChatHelpLayout") { PreviewChatHelpLayout() }, SnapshotScene("ChatListNavLinkView.PreviewChatListNavLinkDirect") { PreviewChatListNavLinkDirect() }, SnapshotScene("ChatListNavLinkView.PreviewChatListNavLinkGroup") { PreviewChatListNavLinkGroup() }, diff --git a/apps/multiplatform/common/src/desktopTest/snapshots/MarkdownFileView.PreviewMarkdownFileView-dark-font-100.png b/apps/multiplatform/common/src/desktopTest/snapshots/MarkdownFileView.PreviewMarkdownFileView-dark-font-100.png new file mode 100644 index 0000000000000000000000000000000000000000..1e04eb43d51ea82f65c6729fff81e36033ee67cc GIT binary patch literal 17560 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 QM(9+Pv>p~IJbC#)04b|tZ2$lO literal 0 HcmV?d00001 diff --git a/apps/multiplatform/common/src/desktopTest/snapshots/MarkdownFileView.PreviewMarkdownFileView-light-font-100.png b/apps/multiplatform/common/src/desktopTest/snapshots/MarkdownFileView.PreviewMarkdownFileView-light-font-100.png new file mode 100644 index 0000000000000000000000000000000000000000..37b173d0e926a606749b9ce5e4ce328bacb8f2d9 GIT binary patch literal 16070 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 Date: Fri, 20 Nov 2026 14:36:57 +0000 Subject: [PATCH 12/20] docs: names conditions describe upgradeable registry contracts (#8277) * docs: names conditions describe upgradeable registry contracts * docs: names conditions without the immutability after stabilization --------- Co-authored-by: brenzi-agent <346870783+brenzi-agent@users.noreply.github.com> --- docs/NAMES-CONDITIONS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/NAMES-CONDITIONS.md b/docs/NAMES-CONDITIONS.md index ad244fe752..7c5700eb4e 100644 --- a/docs/NAMES-CONDITIONS.md +++ b/docs/NAMES-CONDITIONS.md @@ -4,7 +4,7 @@ You accept these Conditions of Use of SimpleX Names ("Names Conditions") by regi **SimpleX names**. A name is a record controlled by your key. The record can contain links to addresses in the SimpleX Network. "Community names" are marked in the registry as referring to specific communities, usually cities or territories. -**Registry**. The .simplex names registry is a set of contracts on the Ethereum blockchain. Name registrations, records, subnames and controlling addresses are stored in immutable contracts. Other contracts may be updated during a stabilization period, expected to last 12 to 24 months from the first registration. +**Registry**. The .simplex names registry is a set of contracts on the Ethereum blockchain. The contracts may be updated during a stabilization period, expected to last 12 to 24 months from the first registration. **What the registry allows**. From 3631fa90c5524e16e275ff2dcaf8f27acd841dd8 Mon Sep 17 00:00:00 2001 From: sh-agents Date: Fri, 20 Nov 2026 14:41:13 +0000 Subject: [PATCH 13/20] ci: reproducible Linux builds of 7.1 releases (#8276) * ci: plan reproducible Linux builds of 7.1 releases * ci: reproduce Linux builds with the cabal store path of releases * ci: reproduce releases with the current reproduce script * ci: build in the image with the cabal directory of releases * ci: reproduce releases on the Ubuntu 24.04 runner * ci: correct the failure history and rollout in the plan --------- Co-authored-by: sh-agents <350651734+sh-agents@users.noreply.github.com> --- .github/workflows/reproduce-schedule.yml | 5 +- Dockerfile.build | 1 + plans/2026-11-20-reproduce-cabal-dir.md | 63 ++++++++++++++++++++++++ scripts/simplex-chat-reproduce-builds.sh | 1 + 4 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 plans/2026-11-20-reproduce-cabal-dir.md diff --git a/.github/workflows/reproduce-schedule.yml b/.github/workflows/reproduce-schedule.yml index 0febed4c87..0aa14b21df 100644 --- a/.github/workflows/reproduce-schedule.yml +++ b/.github/workflows/reproduce-schedule.yml @@ -7,7 +7,7 @@ on: jobs: reproduce: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Get latest release shell: bash @@ -22,9 +22,6 @@ jobs: - name: Checkout code uses: actions/checkout@v3 - with: - ref: ${{ env.TAG }} - repository: simplex-chat/simplex-chat # Otherwise we run out of disk space with Docker build - name: Free disk space diff --git a/Dockerfile.build b/Dockerfile.build index f18f608612..1cb683b72e 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -98,6 +98,7 @@ WORKDIR /home/${USER_NAME} # Setup basic env variables (required) ENV HOME="/home/${USER_NAME}" USER="${USER_NAME}" +ENV CABAL_DIR="$HOME/.cabal" # Adjust PATH ENV PATH="$HOME/.cabal/bin:$HOME/.ghcup/bin:$PATH" diff --git a/plans/2026-11-20-reproduce-cabal-dir.md b/plans/2026-11-20-reproduce-cabal-dir.md new file mode 100644 index 0000000000..7b08394ca4 --- /dev/null +++ b/plans/2026-11-20-reproduce-cabal-dir.md @@ -0,0 +1,63 @@ +# Reproducible Linux builds of 7.1 releases + +## Problem + +For v7.1.2, v7.1.3 and v7.1.4, scripts/simplex-chat-reproduce-builds.sh reports a sha256 mismatch for every Linux artifact of the release: + +- simplex-chat-ubuntu-22_04-x86_64 and simplex-chat-ubuntu-24_04-x86_64, with their .deb packages; +- simplex-desktop-ubuntu-22_04-x86_64.deb and simplex-desktop-ubuntu-24_04-x86_64.deb; +- simplex-desktop-x86_64.AppImage. + +The scheduled workflow "Reproduce latest release" has failed on each run since 2026-09-30, for three causes: + +| Runs | Latest release | Failure | +|---|---|---| +| 2026-09-30 to 2026-11-08 | v7.0.3 | the AppImage only differs | +| 2026-11-09 to 2026-11-15 | v7.1.2, then v7.1.3 | all seven artifacts differ | +| from 2026-11-16 | v7.1.3, then v7.1.4 | the AppImage is not built: `ubuntu-latest` is ubuntu-26.04, where FUSE inside the container fails (`fusermount3: mount failed: Permission denied`), so no hash is compared | + +The mismatch of v7.1.4 is known from a local run of the script; the scheduled runs of v7.1.4 compared no hashes. + +This change addresses the second and third causes. The first is outside it: the AppImage of v7.1.4 differs only as the second cause implies (see Cause). + +## Cause + +The binaries contain the absolute paths of the cabal store: + +- the CLI: the five install paths of simplexmq in `.rodata`, from its `Paths_` module; +- the Haskell shared libraries of the desktop app: their RUNPATH. + +| Build | cabal store | +|---|---| +| release, build.yml | `/home/builder/.cabal/store`, from `-e CABAL_DIR=/home/builder/.cabal` of `docker run` | +| reproduce script | `/home/builder/.local/state/cabal/store`, the XDG default of cabal 3.10 without `~/.cabal` | + +Dockerfile.build of 7.1 installs ghcup without its bootstrap script, which wrote `/home/builder/.cabal/config` into the image before, so the script's builds moved to the XDG paths. + +The differences in the v7.1.4 artifacts are consistent with these paths alone: + +- CLI: `.rodata` is 0x40 bytes longer, five paths of 12 more bytes; the other sections have equal sizes; +- CLI .deb: only `usr/bin/simplex-chat` differs; +- desktop .deb and AppImage: only the Haskell libraries differ, and their strings differ only in the store path; the AppImage runtime differs only in `.digest_md5`. + +## Change + +1. scripts/simplex-chat-reproduce-builds.sh: `docker run` sets `CABAL_DIR=/home/builder/.cabal`, as build.yml does. +2. .github/workflows/reproduce-schedule.yml: + - the checkout is the commit of the workflow run, not the release tag, so that the fixed script reproduces the releases made before the fix. #6485 set the tag; docs/REPRODUCE.md tells users to run the script of master against a tag, and the workflow now runs the script of its own branch against the tag. A release tagged on master is checked by the script of stable until master is merged into stable. The script builds the tag from its own clone, as before. + - `runs-on: ubuntu-24.04`, the image of the runs that built the AppImage until 2026-11-15. `APPIMAGE_EXTRACT_AND_RUN=1` in the container would avoid FUSE on any runner; whether its AppImage equals the release's is unverified. +3. Dockerfile.build: `ENV CABAL_DIR="$HOME/.cabal"`, so that a build in the image of a later release uses the store path of releases also without `-e CABAL_DIR`, as a person running `docker run` by hand; `PATH` of the image already contains `$HOME/.cabal/bin`. + +Scheduled runs use the workflow of the default branch, stable: the fix applies to them after master is merged into stable. Until then, a dispatch of the workflow on master runs it. + +```mermaid +flowchart LR + W["reproduce-schedule.yml
ubuntu-24.04"] -->|"checkout: workflow commit"| S["simplex-chat-reproduce-builds.sh"] + S -->|"git clone, checkout TAG"| B["build in Dockerfile.build of TAG
CABAL_DIR=/home/builder/.cabal"] + B --> C["sha256 of each artifact"] + R["release assets of TAG"] --> C +``` + +## Verification + +"Reproduce latest release" is dispatched on the head of this branch in the fork. The change is verified when its step "Check if build has been reproduced" finds `_sha256sums` for v7.1.4. diff --git a/scripts/simplex-chat-reproduce-builds.sh b/scripts/simplex-chat-reproduce-builds.sh index 5d18b226a8..0f49033afe 100755 --- a/scripts/simplex-chat-reproduce-builds.sh +++ b/scripts/simplex-chat-reproduce-builds.sh @@ -70,6 +70,7 @@ for os_pair in ${oses}; do --device /dev/fuse \ --cap-add SYS_ADMIN \ --security-opt apparmor:unconfined \ + -e CABAL_DIR=/home/builder/.cabal \ -v "${tempdir}/${repo_name}:/project" \ "${image_name}" From 9abdf30ec581c215e5a19f7dcb189be20c05be83 Mon Sep 17 00:00:00 2001 From: "Evgeny @ SimpleX Chat" <259188159+evgeny-simplex@users.noreply.github.com> Date: Fri, 20 Nov 2026 19:09:44 +0000 Subject: [PATCH 14/20] website: remove the webinar promotion (#8281) * website: remove the webinar invitation from the home page * website: redirect the livestream page to Wefunder --- website/src/css/design3.css | 8 -------- website/src/index.html | 3 --- website/src/livestream.html | 8 ++++---- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/website/src/css/design3.css b/website/src/css/design3.css index 933351eab3..dabcebc901 100644 --- a/website/src/css/design3.css +++ b/website/src/css/design3.css @@ -1039,14 +1039,6 @@ main .section-bg { --cover-fade-ramp: 48px; } - section.cover:has(p.webinar) { - --cover-phone-top: calc(var(--cover-text-b) + 16px + var(--cover-area-off) + var(--sec-vwu) * 9.15); - } - - p.webinar .webinar-q { - display: none; - } - section.cover, .chrome-ios section.cover, .safari-ios section.cover, diff --git a/website/src/index.html b/website/src/index.html index 4151313c56..2925915a64 100644 --- a/website/src/index.html +++ b/website/src/index.html @@ -154,9 +154,6 @@ active_home: true

{{ "index-hero-h2" | i18n({}, lang) | safe }}

{{ "index-hero-p1" | i18n({}, lang) | safe }}

{{ "index-hero-own-part" | i18n({}, lang) | safe }} {{ "index-hero-invest" | i18n({}, lang) | safe }}

- {% if lang == 'en' %} -

Who owns your identity? Join our webinar on Nov 19.

- {% endif %}
3M{{ "index-hero-downloads" | i18n({}, lang) }}
600K{{ "index-hero-monthly-users" | i18n({}, lang) }}
diff --git a/website/src/livestream.html b/website/src/livestream.html index 704ed09589..d10fc65d30 100644 --- a/website/src/livestream.html +++ b/website/src/livestream.html @@ -1,9 +1,9 @@ --- layout: layouts/redirect.html -title: "SimpleX: Who Owns Your Identity in the AI Economy?" -description: "Live webinar with Evgeny Poberezkin and Bruce McCarthy, November 19, 2026, 18:00 UTC" +title: "Invest in SimpleX Chat" +description: "SimpleX Chat equity crowdfunding on Wefunder" permalink: /livestream/ -destinationURI: "https://us06web.zoom.us/webinar/register/1517941548300/WN_20s72h57RyyYzOwoIRVUUQ" -destinationText: Register for the webinar +destinationURI: "https://wefunder.com/simplex.chat?utm_source=livestream" +destinationText: Invest in SimpleX Chat templateEngineOverride: njk --- From d6e6e99b6050db58fea89bffda8fa4a78a2f4c1f Mon Sep 17 00:00:00 2001 From: brenzi-agent Date: Sat, 21 Nov 2026 13:36:56 +0100 Subject: [PATCH 15/20] mcp server: recall the chat history in a new agent session (#8141) * mcp server: recall the chat history in a new agent session * docs: chat history in receive for a new agent session * mcp server: type the history page for the compiler * mcp server: recall the chat history after a compaction too * docs: history plan changes with the message helpers of master Claude-Session: https://claude.ai/code/session_01AV2VpomCCQNciqggT9gr75 * docs: drop anchor remapping from the docs table of the history plan Claude-Session: https://claude.ai/code/session_01AV2VpomCCQNciqggT9gr75 --------- Co-authored-by: brenzi-agent <346870783+brenzi-agent@users.noreply.github.com> --- packages/simplex-chat-mcp/REFERENCE.md | 5 +- packages/simplex-chat-mcp/TESTING.md | 1 + packages/simplex-chat-mcp/spec/README.md | 2 +- packages/simplex-chat-mcp/spec/api.md | 12 ++- .../simplex-chat-mcp/spec/architecture.md | 4 +- packages/simplex-chat-mcp/spec/flows.md | 8 +- packages/simplex-chat-mcp/src/messages.ts | 11 ++ packages/simplex-chat-mcp/src/tools.ts | 18 +++- .../simplex-chat-mcp/test/unit/http.test.ts | 2 + .../test/unit/messages.test.ts | 101 ++++++++++++++++++ plans/2026-10-19-mcp-server.md | 17 ++- plans/2026-11-12-mcp-history.md | 73 +++++++++++++ 12 files changed, 236 insertions(+), 18 deletions(-) create mode 100644 plans/2026-11-12-mcp-history.md diff --git a/packages/simplex-chat-mcp/REFERENCE.md b/packages/simplex-chat-mcp/REFERENCE.md index 557b0092be..82426c5c8c 100644 --- a/packages/simplex-chat-mcp/REFERENCE.md +++ b/packages/simplex-chat-mcp/REFERENCE.md @@ -299,7 +299,7 @@ Six tools: |---|---| | `connect` | Joins a contact, bot, business, group or channel by a link or a SimpleX name, as the agent's profile or incognito. Returns the chat, its profile, welcome message, the commands a bot advertises, and the messages so far. | | `send` | Sends a message, with a file of this computer when asked, and returns every message received in that chat after it, until none arrives for `idle` seconds (30 by default). A directory bot's search results arrive this way. | -| `receive` | Returns the chat's unread messages and those that arrive while it waits, waiting for one when asked. | +| `receive` | Returns the chat's unread messages and those that arrive while it waits, waiting for one when asked. With `history`, it also returns up to 50 messages before the new ones, the agent's own included. | | `download` | Downloads the file of a received message to the data folder and returns its full path. | | `list` | Lists the agent's chats with unread counts and `approved: true` for chats approved for all messages, and its actions without a result. | | `leave` | Deletes a contact, or leaves a group, business chat or channel, and deletes the chat; the contact or the members are notified. | @@ -348,6 +348,8 @@ answer each one in that chat, and call receive again after every answer, until I Approve the connection in "My Agent", and accept the request in the app if it asks. On the card of the agent's first answer, tap `all`: its later answers to you need no approval. +In a new Claude Code session, give the same prompt again. The agent can recall the conversation: `receive` with `history` returns up to 50 earlier messages of that chat, its own answers included. + ## Several agents Each agent is its own process, with its own data folder, port, agent control chat and Claude Code server: @@ -367,6 +369,7 @@ Add an entry with the URL `http://127.0.0.1:5226/mcp` and the header `Authorizat |---|---| | The server was not running when Claude Code started | Start the server, then run `/mcp reconnect all` in Claude Code (2.1.284 or later). | | The server restarted while Claude Code was running | Claude Code reconnects up to five times within about 30 seconds. After that, in an interactive session, run `/mcp reconnect all`; `claude -p` runs and Agent SDK sessions keep retrying for about half an hour. Open calls fail, and pending actions are cancelled; the agent's repeated call creates a new request. | +| The Claude Code session ended or was compacted | Ask the agent to recall the chat: `receive` with `history` returns up to 50 messages before the new ones, the agent's own included. | | A second server was started on the same data folder | It exits with `Another server uses (PID N). If no server runs, remove /lock.` | | Every owner left the agent control chat or was removed | `connect`, `send`, `download` and `leave` fail. Without `--owners`, the server logs `No owners in the agent control chat.` and prints a new link; join with it. With an `--owners` list, the agent posts and the server logs `No owners remain: restart the server with --reset-owners --owners`. | | The agent was removed from the agent control chat, the chat was deleted, or the agent lost its owner role | `connect`, `send`, `download` and `leave` fail, and the server logs `The agent lost its control chat. Restart the server with --reset-owners.` | diff --git a/packages/simplex-chat-mcp/TESTING.md b/packages/simplex-chat-mcp/TESTING.md index 4c76c9b070..3af22f510c 100644 --- a/packages/simplex-chat-mcp/TESTING.md +++ b/packages/simplex-chat-mcp/TESTING.md @@ -64,6 +64,7 @@ The directory by its address (`docs/DIRECTORY.md`): 4. `Check for new messages from the directory, waiting up to 60 seconds.` `receive` with `wait`. 5. `List your chats and pending actions.` `list`. 6. Reject one card with its `/reject @N A`: the call returns `status: rejected`; the card ends with `Rejected by Alice.` `/pending` lists the waiting cards. +7. Start a new Claude Code session and ask: `Recall your conversation with the directory.` `receive` with `history`: the last messages of the chat, oldest first, Claude's own with the agent's name and `from_type: agent`. Approval of all messages to a chat, and leaving: diff --git a/packages/simplex-chat-mcp/spec/README.md b/packages/simplex-chat-mcp/spec/README.md index 01d8e2c812..235df831f6 100644 --- a/packages/simplex-chat-mcp/spec/README.md +++ b/packages/simplex-chat-mcp/spec/README.md @@ -184,7 +184,7 @@ graph TD | [`tools.ts`](../src/tools.ts) | tool schemas, descriptions, handlers, connect plans, perform steps, downloads, files to send, chat owners | | [`actions.ts`](../src/actions.ts) | action records, state machine, expiry timers, per-session limits, stop | | [`control.ts`](../src/control.ts) | agent control chat and session groups: link, owners, owner commands, cards, counter | -| [`messages.ts`](../src/messages.ts) | message items and their files, item watch, waits, unread paging, display names, durations | +| [`messages.ts`](../src/messages.ts) | message items and their files, item watch, waits, unread and history paging, display names, durations | | [`core.ts`](../src/core.ts) | one SimpleX core: init, user, network config, temp folder, event buffer, profile update | | [`files.ts`](../src/files.ts) | data folders, lock, token, `headers.json`, `server.json`, session folders, socket path, service log | | [`log.ts`](../src/log.ts) | log lines, error texts, shell quoting | diff --git a/packages/simplex-chat-mcp/spec/api.md b/packages/simplex-chat-mcp/spec/api.md index 1833f4fa72..12fdeec79b 100644 --- a/packages/simplex-chat-mcp/spec/api.md +++ b/packages/simplex-chat-mcp/spec/api.md @@ -204,7 +204,7 @@ The perform fails with `file: PATH changed after the request.` when the file's r ### 1.4 `receive` -Handler: [`AgentTools.receive`](../src/tools.ts). Schemas: input [`receiveSchema`](../src/tools.ts), output [`receiveOutput`](../src/tools.ts). +Handler: [`AgentTools.receive`](../src/tools.ts). History: [`historyMessages`](../src/tools.ts), [`historyItems`](../src/messages.ts). Schemas: input [`receiveSchema`](../src/tools.ts), output [`receiveOutput`](../src/tools.ts). Input: @@ -213,14 +213,16 @@ Input: | `chat` | string | | required | `@N` or `#N` of the agent | | `wait` | number | 0 to 86400 | 0 | seconds to wait when no message is new | | `limit` | integer | 1 to 100 | 50 | most messages returned | +| `history` | integer | 1 to 50 | | most message items returned in `history` | -Output (all fields always present): +Output (`history` only with its input): | Field | Value | |---|---| | `chat` | the chat reference | | `messages` | unread received messages in chat order, then received messages that arrived during the call; live items left out; at most `limit` | | `more` | new messages not returned, overflow, and unread items left unread by the page reads | +| `history` | at most `history` message items: the last ones before the first item of `messages`, or the last ones of the chat when `messages` is empty, in chat order; sent items included; new and live items, and items with `itemDeleted` (deleted, blocked or moderated), left out; read after the wait | Tool errors: `No chat CHAT. list shows the agent's chats.` for an invalid reference, the control chat, or a store error of the first read, `initial` 1 ([`AgentTools.receive`](../src/tools.ts)); other chat errors, a store error of a later page read included, as their error text ([`errorText`, `chatErrorText`](../src/log.ts)). @@ -333,9 +335,9 @@ Tool errors: `No chat CHAT. list shows the agent's chats.` when no action with t |---|---|---|---| | `chat` | string | always | chat reference of the item | | `item` | integer | always | `meta.itemId` | -| `from` | string | always | `groupRcv`: member display name
`directRcv`: contact display name
`channelRcv`: channel display name
sent items in `connect`: the agent's name in that chat | +| `from` | string | always | `groupRcv`: member display name
`directRcv`: contact display name
`channelRcv`: channel display name
sent items in `connect` and in `history` of `receive`: the agent's name in that chat | | `from_member` | integer | `groupRcv` | `groupMemberId` | -| `from_type` | string | when the profile has a peer type | sender's `peerType`; the agent's own for its non-incognito items in `connect` | +| `from_type` | string | when the profile has a peer type | sender's `peerType`; the agent's own for its non-incognito items in `connect` and in `history` of `receive` | | `time` | string | always | `meta.itemTs` | | `text` | string | always | `msgContent.text` | | `file` | object | a received item with a file | below | @@ -366,7 +368,7 @@ Tool errors: `No chat CHAT. list shows the agent's chats.` when no action with t | `path` | `received`: the download path | | `error` | `failed`: the error text ([`fileError`, `fileStatusError`, `fileErrorText`, `srvErrorText`](../src/log.ts)) | -Only received message items (`rcvMsgContent`) are returned by `send` and `receive`; `connect` also returns sent ones (`sndMsgContent`) ([`ChatItemsWatch.collect`](../src/messages.ts), [`AgentTools.connectedChat`](../src/tools.ts)). +Only received message items (`rcvMsgContent`) are returned in `responses` of `send` and in `messages` of `receive`; `connect` and `history` of `receive` also return sent ones (`sndMsgContent`) ([`ChatItemsWatch.collect`, `historyItems`](../src/messages.ts), [`AgentTools.connectedChat`, `historyMessages`](../src/tools.ts)). Command ([`commandsOf`](../src/tools.ts), schema [`commandSchema`](../src/tools.ts)): diff --git a/packages/simplex-chat-mcp/spec/architecture.md b/packages/simplex-chat-mcp/spec/architecture.md index 430b7a879c..738955151f 100644 --- a/packages/simplex-chat-mcp/spec/architecture.md +++ b/packages/simplex-chat-mcp/spec/architecture.md @@ -268,6 +268,7 @@ Hooks are bound in [`startAgent`](../src/serve.ts), where `actions` is created: | `fileOffer`, `fileContent` | file fields of an item; message content of a file | | `getChat`, `receivingFiles`, `markRead` | `apiGetChat` and `apiChatItemsRead` by chat reference; the IDs of a chat's files in status `rcvAccepted`, `rcvTransfer` or `rcvWarning`, paged | | `unreadItems` | unread items of a chat after its `initial` read, paged | +| `historyItems` | message items of a chat before an item, or at its end, paged; new and live items, and items with `itemDeleted`, left out | | `reportProgress`, `nextChange`, `awaitResponses` | waits | | `duration` | a time rounded to whole milliseconds: `41 ms`, `2.0 s`, `42 s`, `4 min 12 s`, `1 h 5 min`, for the step lines and the end line of the plugin | | `validName`, `viewName` | display name rules and `@name` form | @@ -690,9 +691,10 @@ The server writes the tappable form `/'...'` only in the card's command line ([` | `wait` | 0 to 86400 s | [`connectSchema`, `sendSchema`, `receiveSchema`, `downloadSchema`](../src/tools.ts) | | `idle` | 1 to 300 s, default 30 | [`connectSchema`, `sendSchema`, `defaultIdle`](../src/tools.ts) | | `limit` | 1 to 100, default 50 | [`sendSchema`, `receiveSchema`, `defaultLimit`](../src/tools.ts) | +| `receive.history` | 1 to 50 | [`receiveSchema`](../src/tools.ts) | | `connect` snapshot | last 50 items | [`messagesOnConnect`](../src/tools.ts) | | collected items per action or call | 100, then their IDs kept as overflow until deleted | [`maxCollected`, `ChatItemsWatch.collect`](../src/messages.ts) | -| unread page | 100 items | [`pageSize`](../src/messages.ts) | +| unread and history page | 100 items | [`pageSize`](../src/messages.ts) | | chat list read | one read of 1000000 chats | [`maxChats`](../src/tools.ts) | | `download` wait, default | 60 s | [`downloadWait`](../src/tools.ts) | | download check | every 60 s | [`downloadCheck`](../src/tools.ts) | diff --git a/packages/simplex-chat-mcp/spec/flows.md b/packages/simplex-chat-mcp/spec/flows.md index 8c9a968aea..a78500aa59 100644 --- a/packages/simplex-chat-mcp/spec/flows.md +++ b/packages/simplex-chat-mcp/spec/flows.md @@ -287,16 +287,17 @@ sequenceDiagram participant W as ChatItemsWatch participant C as Core participant D as Peer - A->>T: receive {chat: #35;12, wait: 3600, limit: 50} + A->>T: receive {chat: #35;12, wait: 3600, limit: 50, history: 20} T->>W: collect #35;12 into arrived T->>C: apiGetChat #35;12 initial 1 C-->>T: chatStats.unreadCount 0 T-->>A: progress: No new messages in #35;12, waiting until TIME. D->>C: post, item 40 C->>W: newChatItems: arrived + T->>C: apiGetChat #35;12 before 40 count 100 T->>C: apiChatItemsRead #35;12 [40] T->>W: stop collecting - T-->>A: {chat: #35;12, messages: [40], more: 0} + T-->>A: {chat: #35;12, messages: [40], more: 0, history} ``` Notes: @@ -306,8 +307,9 @@ Notes: - `more`: the arrived messages not returned, the overflow and the unread items not read ([`AgentTools.receive`](../src/tools.ts)). - Items received while the pages are read are returned once ([`AgentTools.receive`](../src/tools.ts)). - Exact progress text: `No new messages in CHAT; waiting until TIME.` ([`AgentTools.receive`](../src/tools.ts)). +- With `history`, after the wait the server reads pages of 100 items: `before` the first returned message, or `last` when none is returned, then `before` the first item of the previous page, until it holds `history` message items that are not new or live and have no `itemDeleted`, or a page is short; the agent's own items are named as in `connect` ([`AgentTools.receive`, `historyMessages`](../src/tools.ts), [`historyItems`](../src/messages.ts)). -Source: [`AgentTools.receive`](../src/tools.ts), [`unreadItems`, `isNewMessage`, `reportProgress`, `nextChange`, `awaitResponses`](../src/messages.ts). +Source: [`AgentTools.receive`, `historyMessages`](../src/tools.ts), [`unreadItems`, `isNewMessage`, `historyItems`, `reportProgress`, `nextChange`, `awaitResponses`](../src/messages.ts). --- diff --git a/packages/simplex-chat-mcp/src/messages.ts b/packages/simplex-chat-mcp/src/messages.ts index 37adc8898c..8eb09810a1 100644 --- a/packages/simplex-chat-mcp/src/messages.ts +++ b/packages/simplex-chat-mcp/src/messages.ts @@ -370,6 +370,17 @@ function isNewMessage(item: T.ChatItem): boolean { return item.content.type === "rcvMsgContent" && isNew(item) && !isLive(item) } +// spec: spec/architecture.md#messages-historyitems +export async function historyItems(chat: api.ChatApi, ref: string, before: number | undefined, count: number): Promise { + const items: T.ChatItem[] = [] + for (let pagination: T.ChatPagination = before === undefined ? {type: "last", count: pageSize} : {type: "before", chatItemId: before, count: pageSize}; ; ) { + const page: T.ChatItem[] = (await getChat(chat, ref, pagination)).chatItems + items.unshift(...page.filter(item => isMessageItem(item) && !isNew(item) && !isLive(item) && item.meta.itemDeleted === undefined)) + if (items.length >= count || page.length < pageSize) return items.slice(-count) + pagination = {type: "before", chatItemId: page[0].meta.itemId, count: pageSize} + } +} + // spec: spec/architecture.md#messages-reportprogress export function reportProgress(call: ToolCall, message: () => string): () => void { call.progress(message()) diff --git a/packages/simplex-chat-mcp/src/tools.ts b/packages/simplex-chat-mcp/src/tools.ts index 318eb2a995..1fbf811042 100644 --- a/packages/simplex-chat-mcp/src/tools.ts +++ b/packages/simplex-chat-mcp/src/tools.ts @@ -26,6 +26,7 @@ import { fileOffer, filePaths, getChat, + historyItems, isChatRef, isLive, isMessageItem, @@ -70,6 +71,7 @@ export interface ReceiveInput { chat: string wait?: number limit?: number + history?: number } // spec: spec/architecture.md#tools-inputs @@ -312,6 +314,7 @@ const receiveSchema: Schema = { chat: {type: "string", description: "Chat reference from connect or list: @N or #N."}, wait: {type: "number", minimum: 0, maximum: 86400, description: "Seconds to wait for a new message when none is unread. Default 0."}, limit: {type: "integer", minimum: 1, maximum: 100, description: "Most messages returned. Default 50; the rest stay unread."}, + history: {type: "integer", minimum: 1, maximum: 50, description: "Number of messages returned in history: the last ones before the new messages, yours included."}, }, required: ["chat"], additionalProperties: false, @@ -382,6 +385,7 @@ const receiveOutput: Schema = { chat: {type: "string", description: "Chat reference."}, messages: {type: "array", items: messageSchema, description: "New messages: the unread ones, then those that arrived during the call."}, more: {type: "integer", description: "New messages not returned; call receive again for them."}, + history: {type: "array", items: messageSchema, description: "With the input history: the last messages of the chat before the new ones, oldest first, yours included; not marked read."}, }, required: ["chat", "messages", "more"], } @@ -467,7 +471,8 @@ Send bot commands as text, for example /help. When a message has a file with sta // spec: spec/architecture.md#tools-instructions const receiveDescription = `Returns the new messages of a chat: the unread ones, then those that arrive during the call. With wait, it waits up to wait seconds when no message is new. -The returned messages are marked read; more counts the new ones not returned. It needs no approval. When a message has a file with status offered, call download when your user's task needs it.` +The returned messages are marked read; more counts the new ones not returned. It needs no approval. When a message has a file with status offered, call download when your user's task needs it. +With history N, it also returns the last N messages of the chat before the new ones, yours included, not marked read; at the start of a session, and after your context was compacted, call receive with history to recall the conversation.` // spec: spec/architecture.md#tools-instructions const downloadDescription = `Downloads the file of a received message to this computer and returns its full path. @@ -1344,7 +1349,7 @@ export class AgentTools { // spec: spec/api.md#tool-receive private async receive(input: ReceiveInput, call: ToolCall): Promise { - const {chat, wait = 0, limit = defaultLimit} = input + const {chat, wait = 0, limit = defaultLimit, history} = input if (!isChatRef(chat) || chat === this.agent.controlChat()) throw unknownChat(chat) const arrived = new Collected() const stop = this.agent.watch.collect(chat, arrived) @@ -1371,15 +1376,22 @@ export class AgentTools { } } const returned = fresh().slice(0, limit) + const recalled = history === undefined ? undefined : await this.historyMessages(chat, chatInfo, returned[0]?.chatItem.meta.itemId, history) if (call.signal.aborted) return undefined await markRead(this.agent.chat, chat, [...returned.map(({chatItem}) => chatItem.meta.itemId), ...skipped]) if (call.signal.aborted) return undefined - return {chat, messages: await this.toMessages(returned), more: arrived.items.length - returned.length + arrived.overflow.size + unreadRest} + return {chat, messages: await this.toMessages(returned), more: arrived.items.length - returned.length + arrived.overflow.size + unreadRest, ...defined({history: recalled})} } finally { stop() } } + // spec: spec/api.md#tool-receive + private async historyMessages(chat: string, chatInfo: T.ChatInfo, before: number | undefined, count: number): Promise { + const items = await historyItems(this.agent.chat, chat, before, count) + return this.toMessages(items.map(chatItem => ({chatInfo, chatItem}))) + } + // spec: spec/api.md#tool-list private async listChats(): Promise { const chats: object[] = [] diff --git a/packages/simplex-chat-mcp/test/unit/http.test.ts b/packages/simplex-chat-mcp/test/unit/http.test.ts index a8808223de..b9deb28c45 100644 --- a/packages/simplex-chat-mcp/test/unit/http.test.ts +++ b/packages/simplex-chat-mcp/test/unit/http.test.ts @@ -165,6 +165,8 @@ describe("MCP", () => { expect(await text({chat: "@4", text: "x", wait: -1})).toMatch(/data\/wait must be >= 0$/) expect(await text({chat: "@4", text: "x", colour: "red"})).toMatch(/data must NOT have additional properties$/) expect(await text({text: "x"})).toMatch(/data must have required property 'chat'$/) + const {result} = await body(await post(modern("tools/call", {name: "receive", arguments: {chat: "@4", history: 51}}), modernHeaders("tools/call", "receive"))) + expect(result).toMatchObject({isError: true, content: [{type: "text", text: "Input validation error: Invalid arguments for tool receive: data/history must be <= 50"}]}) expect(actions.all()).toHaveLength(0) }) diff --git a/packages/simplex-chat-mcp/test/unit/messages.test.ts b/packages/simplex-chat-mcp/test/unit/messages.test.ts index 9a1b56b8ce..0f0b278337 100644 --- a/packages/simplex-chat-mcp/test/unit/messages.test.ts +++ b/packages/simplex-chat-mcp/test/unit/messages.test.ts @@ -424,6 +424,107 @@ describe("receive", () => { expect(second).toMatchObject({messages: [{item: 23}], more: 0}) }) + it("returns as history the last messages before the new ones, oldest first, yours under your name, without live, deleted and other items, and marks only the new ones read", async () => { + const chat = new FakeChat() + const fromSwitchback: T.CIDirection = {type: "groupRcv", groupMember: member(44, "Switchback")} + const read = {status: "rcvRead"} + const connected = {...item(12, "connected", fromSwitchback, read), content: {type: "rcvGroupEvent", rcvGroupEvent: {type: "memberConnected"}}} as unknown as T.ChatItem + const deleted = item(13, "removed", fromSwitchback, read) + deleted.meta.itemDeleted = {type: "deleted", chatType: T.ChatType.Group} + const items = [ + item(9, "hello", fromSwitchback, read), + item(10, "trail map?", fromSwitchback, read), + item(11, "here it is", {type: "groupSnd"}), + connected, + deleted, + item(14, "Ridge", fromSwitchback, {...read, live: true}), + item(15, "anything else?", {type: "groupSnd"}), + item(16, "size 44?", fromSwitchback), + item(17, "map updated", {type: "groupSnd"}), + item(18, "and 45?", fromSwitchback), + item(19, "and 46?", fromSwitchback), + ] + chat.chats.set("#15", {chatInfo: groupChat(group(15, "Trail", member(1, "agent"))), items}) + const {tools} = agentTools(chat) + const result = (await tools.call("receive", {chat: "#15", limit: 2, history: 3}, signal().call))!.structuredContent as {messages: {item: number}[]; more: number; history: object[]} + expect(result.messages.map(({item}) => item)).toEqual([16, 18]) + expect(result.more).toBe(1) + const sent = {chat: "#15", from: "agent", from_type: "agent", time: "2026-10-17T10:00:00Z", new: false, mentions_me: false} + expect(result.history).toEqual([ + {chat: "#15", item: 10, from: "Switchback", from_member: 44, time: "2026-10-17T10:00:00Z", text: "trail map?", new: false, mentions_me: false}, + {...sent, item: 11, text: "here it is"}, + {...sent, item: 15, text: "anything else?"}, + ]) + expect(chat.commands.filter(cmd => cmd.startsWith("/_read"))).toEqual(["/_read chat items #15 16,18"]) + }) + + it("returns as history the latest messages when none is new, and no history without the input", async () => { + const chat = new FakeChat() + chat.chats.set("@4", {chatInfo: direct(contact(4, "Switchback")), items: [item(10, "hi", {type: "directRcv"}, {status: "rcvRead"}), item(11, "hello", {type: "directSnd"})]}) + const {tools} = agentTools(chat) + expect((await tools.call("receive", {chat: "@4", history: 50}, signal().call))!.structuredContent).toEqual({ + chat: "@4", + messages: [], + more: 0, + history: [ + {chat: "@4", item: 10, from: "Switchback", time: "2026-10-17T10:00:00Z", text: "hi", new: false, mentions_me: false}, + {chat: "@4", item: 11, from: "agent", from_type: "agent", time: "2026-10-17T10:00:00Z", text: "hello", new: false, mentions_me: false}, + ], + }) + expect((await tools.call("receive", {chat: "@4"}, signal().call))!.structuredContent).not.toHaveProperty("history") + expect(chat.commands.filter(cmd => cmd.startsWith("/_read"))).toEqual([]) + }) + + it("reads history when the call returns, after the wait", async () => { + const chat = new FakeChat() + chat.chats.set("@4", {chatInfo: direct(contact(4, "Switchback")), items: [item(10, "hi", {type: "directRcv"}, {status: "rcvRead"}), item(11, "hello", {type: "directSnd"})]}) + const {tools, watch} = agentTools(chat) + const {call, progress} = signal() + const receiving = tools.call("receive", {chat: "@4", wait: 30, history: 2}, call) + await settled() + expect(progress[0]).toMatch(/^No new messages in @4; waiting until /) + watch.deliver([chat.addItem("@4", item(12, "still there?", {type: "directSnd"})), chat.addItem("@4", item(13, "yes", {type: "directRcv"}))]) + const result = (await receiving)!.structuredContent as {messages: {item: number}[]; history: {item: number}[]} + expect(result.messages.map(({item}) => item)).toEqual([13]) + expect(result.history.map(({item}) => item)).toEqual([11, 12]) + }) + + it("leaves out of history a new message whose event has not arrived, and the next call returns it", async () => { + const chat = new FakeChat() + chat.chats.set("@4", {chatInfo: direct(contact(4, "Switchback")), items: [item(10, "hi", {type: "directRcv"}, {status: "rcvRead"}), item(11, "hello", {type: "directSnd"})]}) + const {tools, watch} = agentTools(chat) + const receiving = tools.call("receive", {chat: "@4", wait: 30, history: 5}, signal().call) + await settled() + chat.addItem("@4", item(12, "still there?", {type: "directRcv"})) + watch.deliver([chat.addItem("@4", item(13, "hello?", {type: "directRcv"}))]) + const result = (await receiving)!.structuredContent as {messages: {item: number}[]; history: {item: number}[]} + expect(result.messages.map(({item}) => item)).toEqual([13]) + expect(result.history.map(({item}) => item)).toEqual([10, 11]) + const next = (await tools.call("receive", {chat: "@4"}, signal().call))!.structuredContent as {messages: {item: number}[]} + expect(next.messages.map(({item}) => item)).toEqual([12]) + }) + + it("reads history in pages of 100 items, before the first new message or from the end, until it holds the messages", async () => { + const chat = new FakeChat() + const undecrypted = Array.from({length: 150}, (_, i) => ({...item(10 + i, "", {type: "directRcv"}, {status: "rcvRead"}), content: {type: "rcvDecryptionError"}}) as unknown as T.ChatItem) + const items = [item(1, "hi", {type: "directRcv"}, {status: "rcvRead"}), item(2, "hello", {type: "directSnd"}), ...undecrypted, item(160, "still there?", {type: "directSnd"}), item(161, "yes", {type: "directRcv"})] + chat.chats.set("@4", {chatInfo: direct(contact(4, "Switchback")), items}) + const {tools} = agentTools(chat) + const first = (await tools.call("receive", {chat: "@4", history: 3}, signal().call))!.structuredContent as {history: {item: number}[]} + expect(first.history.map(({item}) => item)).toEqual([1, 2, 160]) + const second = (await tools.call("receive", {chat: "@4", history: 1}, signal().call))!.structuredContent as {history: {item: number}[]} + expect(second.history.map(({item}) => item)).toEqual([161]) + expect(chat.commands.filter(cmd => /^\/_get chat @4 (count|before)=/.test(cmd))).toEqual(["/_get chat @4 before=161 count=100", "/_get chat @4 before=61 count=100", "/_get chat @4 count=100"]) + }) + + it("returns your messages in history under your incognito name", async () => { + const chat = new FakeChat() + chat.chats.set("#15", {chatInfo: groupChat(group(15, "Trail", {...member(1, "Quiet Fox"), memberContactProfileId: 99})), items: [item(11, "here it is", {type: "groupSnd"})]}) + const {tools} = agentTools(chat) + const result = (await tools.call("receive", {chat: "#15", history: 1}, signal().call))!.structuredContent as {history: object[]} + expect(result.history).toEqual([{chat: "#15", item: 11, from: "Quiet Fox", time: "2026-10-17T10:00:00Z", text: "here it is", new: false, mentions_me: false}]) + }) + it("names the agent in a quote of its own message by its name in the chat, the incognito name included", async () => { const chat = new FakeChat() const incognito = {...contact(4, "Ridgeline"), activeConn: {connId: 204, connStatus: {type: "ready"}, customUserProfileId: 77}} as unknown as T.Contact diff --git a/plans/2026-10-19-mcp-server.md b/plans/2026-10-19-mcp-server.md index 94a80058a1..0c18f2d64b 100644 --- a/plans/2026-10-19-mcp-server.md +++ b/plans/2026-10-19-mcp-server.md @@ -1,6 +1,6 @@ # SimpleX MCP server 0.2: plan -Status: draft · 2026-10-17, files and leave 2026-10-30 (`plans/2026-10-30-mcp-files-and-leave.md`) · person-facing manual: `REFERENCE.md`, the plugin in short in `README.md`. Code references: master `139ce5f8c` (`/code/simplex-chat-6`), unless marked `9711dcfc9` (core 7.1.0.11); `simplex-chat` 7.1.0-beta.10.2 loads core 7.1.0.20. Pending decisions: section Open. +Status: draft · 2026-10-17, files and leave 2026-10-30 (`plans/2026-10-30-mcp-files-and-leave.md`), history 2026-11-12 (`plans/2026-11-12-mcp-history.md`) · person-facing manual: `REFERENCE.md`, the plugin in short in `README.md`. Code references: master `139ce5f8c` (`/code/simplex-chat-6`), unless marked `9711dcfc9` (core 7.1.0.11); `simplex-chat` 7.1.0-beta.10.2 loads core 7.1.0.20. Pending decisions: section Open. ## Scope @@ -705,6 +705,7 @@ input field type rule chat string required; a chat of the agent wait number optional; seconds to wait when no message is new; 0 to 86400; default 0 limit number optional; 1 to 100; default 50 +history number optional; 1 to 50; most message items returned in history ``` ``` @@ -712,6 +713,7 @@ result field type present chat string always messages Message[] always; the new messages, up to limit: the unread ones in chat order, then those that arrive during the call more number always; new messages not returned +history Message[] with history; up to history message items: the last ones before the first of messages, or the last ones of the chat when messages is empty, in chat order; sent items included; new and live items, and items with itemDeleted (deleted, blocked or moderated), left out ``` - New: a received message that is unread when the call reads its page, or that arrives during the call. The returned ones are marked read; another call marking one read after this call collected it does not remove it. @@ -1360,8 +1362,11 @@ receive(input, ctx): none new and wait > 0: wait for newChatItems of chat until one is new | wait | signal progress at once and every 60 s: "No new messages in ; waiting until