yilsem/aiturk-mobil
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

test(connect): phase 5 — restart lands on the selected profile, no login (#827)

Browse Source 
* test(connect): pin restart-with-scoped-profile token resolution (phase 5)

* fix(profiles): scope switch via un-clamped active-profile state

The switch persisted the server profile through serverStore.selectedProfileId,
whose selfHealed() clamps ids absent from the local connection list — server
profiles like "meow" never exist there, so the scope silently reset to
default and the re-dialed socket created the fresh session in the wrong
profile (live logcat 2026-08-06: session.create carried profile=default
right after switching to meow).

- AuthManager: prefs-backed activeProfileId state, immune to the clamp,
  restored on startup; resetAuthStateForTest clears it
- ProfileScopeInterceptor + WsProfileParams + ChatViewModel fetchContextUsage:
  read the active profile instead of the connection selection
- ProfileSwitchCoordinator: write activeProfileId; dial the socket on
  Dispatchers.IO (the ticket mint did blocking I/O on the main thread —
  NetworkOnMainThreadException — and fell back to a 1s reconnect)
- ProfilesViewModel: inject the IO dispatcher; ProfilesViewModelTest drops
  its static Dispatchers mock (JVM-wide bleed class)
- Tests: WsProfileParams/Interceptor tests use the real prefs-backed state
  instead of mockkObject(AuthManager) (re-mock breaks in suite order after
  real AuthManager init); AuthManagerTest + Issue647ProfileUrlTest cancel
  the init() DataStore scope in tearDown (UncaughtExceptionsBeforeTest
  phantoms); regression test pins the clamp on the old path vs the new state

* fix(profiles): resolve getter/property JVM collision; de-poison slash test

- AuthManager.activeProfileId (StateFlow) and a getActiveProfileId()
  function generated the same JVM getter name — calls silently resolved to
  the property getter at runtime (ReadonlyStateFlow -> String
  ClassCastException, CI unit red 2026-08-06). Function removed; callers
  read activeProfileId.value.
- ChatViewModel: inject ioDispatcher (38 sites) so SlashCommandDispatchRpcTest
  can drop its mockkStatic(Dispatchers) bleed without racing real IO.
- SlashCommandDispatchRpcTest: drop the static Dispatchers mock (JVM-wide
  bleed; CI cross-wired COMMAND_DISPATCH captures in suite order), construct
  the VM with the test dispatcher.

---------

Co-authored-by: M57 <hy4ri@users.noreply.github.com>
This commit is contained in:
M57andM57 authored and GitHub committed 2026-08-06 15:07:35 +03:00
1 parent dd8dabecb0
commit d9f437939a
14 files changed
+225 -73
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/m57/hermescontrol/ui/chat/ChatViewModel.kt
+1 -1
View File
@@ -2263,7 +2263,7 @@ class ChatViewModel(
*/
fun fetchContextUsage() {
val sessionId = _uiState.value.currentSessionId ?: return
val profile = AuthManager.getSelectedProfileId()
val profile = AuthManager.activeProfileId.value
viewModelScope.launch(ioDispatcher) {
// Denominator fallback: full context window (cheap, public, rarely
// changes). The RPC's context_max below overrides it when present.
app/src/main/java/com/m57/hermescontrol/ui/profiles/ProfilesViewModel.kt
+20 -18
View File
@@ -20,6 +20,7 @@ import com.m57.hermescontrol.data.remote.NetworkResult
import com.m57.hermescontrol.data.remote.safeApiCall
import com.m57.hermescontrol.data.session.ProfileSwitchCoordinator
import com.m57.hermescontrol.ui.common.ToastHost
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.coroutineScope
@@ -52,8 +53,9 @@ data class ProfilesUiState(
val isSearchingHub: Boolean = false,
)
class ProfilesViewModel :
ViewModel(),
class ProfilesViewModel(
private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
) : ViewModel(),
ToastHost {
private val _uiState = MutableStateFlow(ProfilesUiState())
val uiState: StateFlow<ProfilesUiState> = _uiState.asStateFlow()
@@ -63,9 +65,9 @@ class ProfilesViewModel :
viewModelScope.launch {
try {
coroutineScope {
val profilesDeferred = async(Dispatchers.IO) { safeApiCall { ApiClient.hermesApi.getProfiles() } }
val profilesDeferred = async(ioDispatcher) { safeApiCall { ApiClient.hermesApi.getProfiles() } }
val activeDeferred =
async(Dispatchers.IO) { safeApiCall { ApiClient.hermesApi.getActiveProfile() } }
async(ioDispatcher) { safeApiCall { ApiClient.hermesApi.getActiveProfile() } }
val profilesResult = profilesDeferred.await()
val activeResult = activeDeferred.await()
@@ -130,7 +132,7 @@ class ProfilesViewModel :
_uiState.update { it.copy(isLoadingSoul = true, selectedSoulContent = null) }
viewModelScope.launch {
val result =
withContext(Dispatchers.IO) {
withContext(ioDispatcher) {
safeApiCall { ApiClient.hermesApi.getProfileSoul(profileName) }
}
when (result) {
@@ -161,7 +163,7 @@ class ProfilesViewModel :
) {
viewModelScope.launch {
val result =
withContext(Dispatchers.IO) {
withContext(ioDispatcher) {
safeApiCall {
ApiClient.hermesApi.updateProfileSoul(
profileName,
@@ -198,7 +200,7 @@ class ProfilesViewModel :
) {
viewModelScope.launch {
val result =
withContext(Dispatchers.IO) {
withContext(ioDispatcher) {
safeApiCall {
ApiClient.hermesApi.updateProfileModel(
profileName,
@@ -238,7 +240,7 @@ class ProfilesViewModel :
viewModelScope.launch {
_uiState.update { it.copy(isLoading = true) }
val result =
withContext(Dispatchers.IO) {
withContext(ioDispatcher) {
safeApiCall {
ApiClient.hermesApi.cloneProfile(
sourceProfileName,
@@ -275,7 +277,7 @@ class ProfilesViewModel :
viewModelScope.launch {
_uiState.update { it.copy(isLoading = true) }
val result =
withContext(Dispatchers.IO) {
withContext(ioDispatcher) {
safeApiCall {
ApiClient.hermesApi.updateProfileDescription(
profileName,
@@ -313,7 +315,7 @@ class ProfilesViewModel :
viewModelScope.launch {
_uiState.update { it.copy(isLoading = true) }
val result =
withContext(Dispatchers.IO) {
withContext(ioDispatcher) {
safeApiCall {
ApiClient.hermesApi.renameProfile(
oldName,
@@ -347,7 +349,7 @@ class ProfilesViewModel :
viewModelScope.launch {
_uiState.update { it.copy(isLoading = true) }
val result =
withContext(Dispatchers.IO) {
withContext(ioDispatcher) {
safeApiCall { ApiClient.hermesApi.deleteProfile(name) }
}
when (result) {
@@ -376,7 +378,7 @@ class ProfilesViewModel :
_uiState.update { it.copy(isAutoDescribing = true) }
viewModelScope.launch {
val result =
withContext(Dispatchers.IO) {
withContext(ioDispatcher) {
safeApiCall {
ApiClient.hermesApi.describeProfileAuto(
name,
@@ -425,7 +427,7 @@ class ProfilesViewModel :
_uiState.update { it.copy(isLoadingSetupCommand = true, setupCommand = null) }
viewModelScope.launch {
val result =
withContext(Dispatchers.IO) {
withContext(ioDispatcher) {
safeApiCall { ApiClient.hermesApi.getProfileSetupCommand(name) }
}
when (result) {
@@ -454,7 +456,7 @@ class ProfilesViewModel :
_uiState.update { it.copy(isLoadingBuilderData = true, errorMessage = null) }
viewModelScope.launch {
val result =
withContext(Dispatchers.IO) {
withContext(ioDispatcher) {
safeApiCall { ApiClient.hermesApi.getModelOptions() }
}
when (result) {
@@ -502,8 +504,8 @@ class ProfilesViewModel :
viewModelScope.launch {
try {
coroutineScope {
val modelsDeferred = async(Dispatchers.IO) { safeApiCall { ApiClient.hermesApi.getModelOptions() } }
val skillsDeferred = async(Dispatchers.IO) { safeApiCall { ApiClient.hermesApi.getSkills() } }
val modelsDeferred = async(ioDispatcher) { safeApiCall { ApiClient.hermesApi.getModelOptions() } }
val skillsDeferred = async(ioDispatcher) { safeApiCall { ApiClient.hermesApi.getSkills() } }
val modelsResult = modelsDeferred.await()
val skillsResult = skillsDeferred.await()
@@ -545,7 +547,7 @@ class ProfilesViewModel :
_uiState.update { it.copy(isSearchingHub = true) }
viewModelScope.launch {
val result =
withContext(Dispatchers.IO) {
withContext(ioDispatcher) {
safeApiCall { ApiClient.hermesApi.searchSkillsHub(query) }
}
when (result) {
@@ -577,7 +579,7 @@ class ProfilesViewModel :
_uiState.update { it.copy(isLoading = true) }
viewModelScope.launch {
val result =
withContext(Dispatchers.IO) {
withContext(ioDispatcher) {
safeApiCall { ApiClient.hermesApi.createProfile(request) }
}
when (result) {