Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/src/main/kotlin/ai/opencode/core/sharing/SharedKeys.kt
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ object SharedKeys {
/** Phone-local, server-scoped (`serverID|sessionID`) like pins: muted sessions never reach Catch Up or an unread badge. */
val mutedSessionKeys = SharedKey.fileStorage<Set<String>>(FileDirectory.Documents, "muted-sessions.json", emptySet())

/** Phone-local, server-scoped (`serverID|sessionID`) like pins: hidden sessions leave the drawer's list but still turn up in search. */
val hiddenSessionKeys = SharedKey.fileStorage<Set<String>>(FileDirectory.Documents, "hidden-sessions.json", emptySet())

val initializedInboxServerIDs =
SharedKey.fileStorage<Set<String>>(FileDirectory.Documents, "initialized-inbox-servers.json", emptySet())

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ object TestIsolationGuard {
sharedProbe("Shared.uploadUnsupportedServerIDs", SharedKeys.uploadUnsupportedServerIDs, "[]"),
sharedProbe("Shared.pinnedSessionKeys", SharedKeys.pinnedSessionKeys, "[]"),
sharedProbe("Shared.mutedSessionKeys", SharedKeys.mutedSessionKeys, "[]"),
sharedProbe("Shared.hiddenSessionKeys", SharedKeys.hiddenSessionKeys, "[]"),
sharedProbe("Shared.favoriteModelIDs", SharedKeys.favoriteModelIDs, "[]"),
sharedProbe("Shared.appTheme", ThemeSharedKeys.appTheme, "System"),
sharedProbe("Shared.appearanceColorScheme", ThemeSharedKeys.appearanceColorScheme, "System"),
Expand Down
14 changes: 7 additions & 7 deletions docs/parity/drawer.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ class HomeFeature : Reducer<HomeFeature.State, HomeFeature.Action> {
val pendingOpenReadState: Map<String, PendingOpenReadState> = emptyMap(),
/** Mirror of `SharedKeys.mutedSessionKeys`. */
val mutedSessionKeys: Set<String> = emptySet(),
/** Mirror of `SharedKeys.hiddenSessionKeys`. */
val hiddenSessionKeys: Set<String> = emptySet(),
/** Mirror of `SharedKeys.sidebarShown`: beside a wide window's sidebar, whether it shows. */
val isSidebarShown: Boolean = true,
/**
Expand Down Expand Up @@ -575,6 +577,7 @@ class HomeFeature : Reducer<HomeFeature.State, HomeFeature.Action> {
sessionSeenWatermarks = shared(SharedKeys.sessionSeenWatermarks).value,
manuallyUnreadSessionKeys = shared(SharedKeys.manuallyUnreadSessionKeys).value,
mutedSessionKeys = shared(SharedKeys.mutedSessionKeys).value,
hiddenSessionKeys = shared(SharedKeys.hiddenSessionKeys).value,
isSidebarShown = shared(SharedKeys.sidebarShown).value,
showsWhatsNewButton = WhatsNewFeature.State().showsButton,
initializedInboxServerIDs = shared(SharedKeys.initializedInboxServerIDs).value,
Expand Down Expand Up @@ -706,6 +709,7 @@ class HomeFeature : Reducer<HomeFeature.State, HomeFeature.Action> {
data object UnsentDraftsChanged : Action
data class TogglePin(val sessionID: String) : Action
data class ToggleMute(val sessionID: String) : Action
data class ToggleHidden(val sessionID: String) : Action
data class MovePinUp(val sessionID: String) : Action
data class MovePinDown(val sessionID: String) : Action
data class DrawerPinZoneCrossed(val entered: Boolean) : Action
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ private fun HomeFeature.coreRoute(state: State, action: Action): Reduced<State,
is Action.DrawerRowPressed,
is Action.TogglePin,
is Action.ToggleMute,
is Action.ToggleHidden,
is Action.MovePinUp,
is Action.MovePinDown,
is Action.DrawerPinZoneCrossed,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,16 @@ internal fun HomeFeature.reduceDrawer(state: State, action: Action): HomeReduced
return Reduced(s.reconcilingCatchUp())
}

is Action.ToggleHidden -> {
if (state.sessions.none { it.id == action.sessionID }) return Reduced(state)
haptics.play(Haptic.selection)
val key = state.sessionKey(action.sessionID)
return Reduced(
if (state.isHidden(action.sessionID)) state.updatingHiddenSessionKeys { it - key }
else state.updatingHiddenSessionKeys { it + key },
)
}

is Action.MovePinUp -> {
val ids = state.pinnedSessions.map { it.id }
val index = ids.indexOf(action.sessionID)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ internal fun HomeFeature.State.updatingSessionSeenWatermarks(transform: (Session
internal fun HomeFeature.State.updatingMutedSessionKeys(transform: (Set<String>) -> Set<String>): HomeFeature.State =
writingThrough(SharedKeys.mutedSessionKeys, mutedSessionKeys, transform) { copy(mutedSessionKeys = it) }

/** `$hiddenSessionKeys.withLock { … }`. */
internal fun HomeFeature.State.updatingHiddenSessionKeys(transform: (Set<String>) -> Set<String>): HomeFeature.State =
writingThrough(SharedKeys.hiddenSessionKeys, hiddenSessionKeys, transform) { copy(hiddenSessionKeys = it) }

/** `$initializedInboxServerIDs.withLock { … }`. */
internal fun HomeFeature.State.updatingInitializedInboxServerIDs(transform: (Set<String>) -> Set<String>): HomeFeature.State =
writingThrough(SharedKeys.initializedInboxServerIDs, initializedInboxServerIDs, transform) { copy(initializedInboxServerIDs = it) }
Expand Down Expand Up @@ -159,11 +163,15 @@ val HomeFeature.State.firstSessionProject: OpenCodeProject?
/**
* Root sessions only: subagents' sessions are kept for their family's activity but open from their
* parent, as on desktop. Archived sessions stay out of every list. Searching adds the server's
* matches from every session; results of an earlier query show only while they still match.
* matches from every session; results of an earlier query show only while they still match. Hidden
* sessions show only while searching.
*/
val HomeFeature.State.visibleSessions: List<OpenCodeSession>
get() {
if (search.isEmpty()) return sessions.filter { it.parentID == null && !it.isArchived }
if (search.isEmpty()) {
val hidden = hiddenSessionIDs
return sessions.filter { it.parentID == null && !it.isArchived && it.id !in hidden }
}
val local = sessions.filter { it.parentID == null && !it.isArchived && it.title.contains(search, ignoreCase = true) }
val found = sessionPages.search
if (found == null || found.results.isEmpty()) return local
Expand All @@ -180,6 +188,18 @@ val HomeFeature.State.visibleSessions: List<OpenCodeSession>
return local + extra
}

/** This server's hidden sessions by ID, worked out once for a loop over the sessions rather than a key built per session. */
val HomeFeature.State.hiddenSessionIDs: Set<String>
get() {
if (hiddenSessionKeys.isEmpty()) return emptySet()
val prefix = server.persistenceID + "|"
val ids = HashSet<String>()
for (key in hiddenSessionKeys) {
if (key.startsWith(prefix)) ids += key.removePrefix(prefix)
}
return ids
}

val HomeFeature.State.pinnedSessions: List<OpenCodeSession> get() = drawerSessions.pinned

val HomeFeature.State.recentSessions: List<OpenCodeSession> get() = drawerSessions.recents
Expand Down Expand Up @@ -519,6 +539,7 @@ fun HomeFeature.State.syncingSeenWatermark(detail: SessionFeature.State, session

fun HomeFeature.State.sessionKey(id: String): String = "${server.persistenceID}|$id"
fun HomeFeature.State.isPinned(id: String): Boolean = sessionKey(id) in pinnedSessionKeys
fun HomeFeature.State.isHidden(id: String): Boolean = sessionKey(id) in hiddenSessionKeys

/**
* One implementation, in `StatusSnapshot`, so the drawer's bulk loops and a single question here
Expand Down Expand Up @@ -605,6 +626,7 @@ fun HomeFeature.State.purgingSession(sessionID: String): HomeFeature.State {
.clearingSeenWatermark(sessionID)
.updatingManuallyUnreadSessionKeys { it - key }
.updatingMutedSessionKeys { it - key }
.updatingHiddenSessionKeys { it - key }
if (s.lastViewedSessionIDs[serverID] == sessionID) s = s.updatingLastViewedSessionIDs { it - serverID }
return s
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ internal fun State.adoptingSearchResultFor(action: Action): State {
is Action.SessionTapped -> action.sessionID
is Action.TogglePin -> action.sessionID
is Action.ToggleMute -> action.sessionID
is Action.ToggleHidden -> action.sessionID
is Action.MarkRead -> action.sessionID
is Action.MarkUnread -> action.sessionID
is Action.DeleteSessionTapped -> action.sessionID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import ai.opencode.feature.drawer.ServerSwapTarget
import ai.opencode.feature.drawer.ServerSwitchNote
import ai.opencode.feature.drawer.drawerListFooter
import ai.opencode.feature.drawer.drawerSessions
import ai.opencode.feature.drawer.hiddenSessionIDs
import ai.opencode.feature.drawer.placeholderSession
import ai.opencode.feature.drawer.statusSnapshot
import ai.opencode.feature.drawer.style.DrawerSectionHeaderKind
Expand Down Expand Up @@ -64,6 +65,8 @@ data class DrawerListRow(
val selected: Boolean,
val indicator: Indicator,
val muted: Boolean,
/** Hidden from the list; it shows only while searching. */
val hidden: Boolean = false,
val unread: Boolean,
val isLifted: Boolean,
val time: String,
Expand All @@ -84,6 +87,7 @@ data class DrawerListRow(
val parts = mutableListOf<String>()
if (isPinnedSection) parts += localized(R.string.drawer_row_pinned_state)
if (muted) parts += localized(R.string.drawer_row_muted_state)
if (hidden) parts += localized(R.string.drawer_row_hidden_state)
if (unsent == Unsent.Failed) parts += localized(R.string.drawer_row_unsent_failed_state)
if (unsent == Unsent.Sending) parts += localized(R.string.drawer_row_unsent_sending_state)
val status = when (indicator) {
Expand Down Expand Up @@ -205,13 +209,15 @@ data class DrawerListModel(
val recents = sessions.recents
val rows = LinkedHashMap<String, DrawerListRow>()
val headerFollows = HashMap<DrawerSectionHeaderKind, Boolean>()
val hiddenIDs = state.hiddenSessionIDs

fun row(session: OpenCodeSession, pinned: Boolean) = DrawerListRow(
session = session,
isPinnedSection = pinned,
selected = inputs.selectedSessionID == session.id,
indicator = status.indicator(session),
muted = status.isMuted(session.id),
hidden = session.id in hiddenIDs,
unread = status.isUnread(session),
isLifted = liftedID == session.id,
time = timestamp(session.updatedAt, now),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ class DrawerListRowActions(
val togglePin: () -> Unit,
val toggleRead: () -> Unit,
val toggleMute: () -> Unit,
val toggleHidden: () -> Unit,
val delete: () -> Unit,
val movePinUp: () -> Unit,
val movePinDown: () -> Unit,
Expand Down Expand Up @@ -145,6 +146,7 @@ fun DrawerListSessionCell(
val pinLabel = if (row.isPinnedSection) stringResource(R.string.drawer_unpin) else stringResource(R.string.drawer_pin)
val readLabel = if (row.unread) stringResource(R.string.drawer_mark_as_read) else stringResource(R.string.drawer_mark_as_unread)
val muteLabel = if (row.muted) stringResource(R.string.drawer_unmute) else stringResource(R.string.drawer_mute)
val hideLabel = if (row.hidden) stringResource(R.string.drawer_unhide) else stringResource(R.string.drawer_hide)
val deleteLabel = stringResource(CoreR.string.common_delete)
val moveUpLabel = stringResource(R.string.drawer_move_up)
val moveDownLabel = stringResource(R.string.drawer_move_down)
Expand Down Expand Up @@ -329,6 +331,7 @@ fun DrawerListSessionCell(
add(CustomAccessibilityAction(pinLabel) { currentActions.togglePin(); true })
add(CustomAccessibilityAction(readLabel) { currentActions.toggleRead(); true })
add(CustomAccessibilityAction(muteLabel) { currentActions.toggleMute(); true })
add(CustomAccessibilityAction(hideLabel) { currentActions.toggleHidden(); true })
}
add(CustomAccessibilityAction(deleteLabel) { currentActions.delete(); true })
if (row.isPinnedSection) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ private fun rowActions(
togglePin = { store.send(HomeFeature.Action.TogglePin(id)) },
toggleRead = { store.send(if (unread) HomeFeature.Action.MarkRead(id) else HomeFeature.Action.MarkUnread(id)) },
toggleMute = { store.send(HomeFeature.Action.ToggleMute(id)) },
toggleHidden = { store.send(HomeFeature.Action.ToggleHidden(id)) },
delete = { store.send(HomeFeature.Action.DeleteSessionTapped(id)) },
movePinUp = { store.send(HomeFeature.Action.MovePinUp(id)) },
movePinDown = { store.send(HomeFeature.Action.MovePinDown(id)) },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ import ai.opencode.feature.drawer.HomeFeature
import ai.opencode.feature.drawer.InboxSidebarFeature
import ai.opencode.feature.drawer.R
import ai.opencode.feature.drawer.inboxSidebarArchivedRows
import ai.opencode.feature.drawer.isHidden
import ai.opencode.feature.drawer.isMuted
import ai.opencode.feature.drawer.isPinned
import ai.opencode.feature.drawer.isUnread
import ai.opencode.feature.drawer.visibleSessions
import ai.opencode.feature.system.SessionWindowTarget
import ai.opencode.feature.system.WindowsClient
import androidx.compose.animation.core.Animatable
Expand Down Expand Up @@ -183,8 +185,8 @@ internal fun DrawerSelectionBar(

/**
* The chosen sessions' actions: Mark as Read (Mark as Unread when none is unread), Archive and
* Delete as icons; Mute or Unmute, Pin or Unpin (the regular list; the Inbox Sidebar has no pins)
* and, for one session where the device has several windows, Open in New Window behind ⋮.
* Delete as icons; Mute or Unmute, Pin or Unpin (the regular list; the Inbox Sidebar has no pins),
* Hide or Unhide and, for one session where the device has several windows, Open in New Window behind ⋮.
* Each action ends the selection.
*/
internal fun selectionActions(
Expand All @@ -194,14 +196,16 @@ internal fun selectionActions(
): Pair<List<DrawerRowMenuItem>, List<DrawerRowMenuItem>> {
val state = store.state
val ids = selection.ids.toList()
val sessions = state.sessions.filter { it.id in selection.ids }
val sessions = state.visibleSessions.filter { it.id in selection.ids }
var anyUnread = false
var allMuted = true
var allPinned = true
var allHidden = true
for (session in sessions) {
if (state.isUnread(session)) anyUnread = true
if (!state.isMuted(session.id)) allMuted = false
if (!state.isPinned(session.id)) allPinned = false
if (!state.isHidden(session.id)) allHidden = false
}

val main = listOf(
Expand Down Expand Up @@ -254,6 +258,14 @@ internal fun selectionActions(
},
)
}
overflow.add(
DrawerRowMenuItem(if (allHidden) localized(R.string.drawer_unhide) else localized(R.string.drawer_hide), if (allHidden) SFSymbol.Eye else SFSymbol.EyeSlash) {
for (session in sessions) {
if (state.isHidden(session.id) == allHidden) store.send(HomeFeature.Action.ToggleHidden(session.id))
}
selection.clear()
},
)
val windows = dependency(WindowsClient)
if (ids.size == 1 && windows.isAvailable()) {
overflow.add(
Expand Down
3 changes: 3 additions & 0 deletions feature/drawer/src/main/res/values-am/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
<string name="drawer_mark_as_unread">እንዳልተነበበ ምልክት አድርግ</string>
<string name="drawer_mute">ድምፅ አጥፋ</string>
<string name="drawer_unmute">ድምፅ ክፈት</string>
<string name="drawer_hide">ደብቅ</string>
<string name="drawer_unhide">አትደብቅ</string>
<string name="drawer_move_up">ወደ ላይ አንቀሳቅስ</string>
<string name="drawer_move_down">ወደ ታች አንቀሳቅስ</string>

Expand Down Expand Up @@ -121,6 +123,7 @@
<!-- Session row state for TalkBack -->
<string name="drawer_row_pinned_state">የተሰኩ</string>
<string name="drawer_row_muted_state">ድምፀ ከል የተደረገ</string>
<string name="drawer_row_hidden_state">የተደበቁ</string>
<string name="drawer_row_needs_input_state">የእርስዎን ግቤት ይፈልጋል</string>
<string name="drawer_row_working_state">በመስራት ላይ</string>
<string name="drawer_row_unread_state">ያልተነበቡ</string>
Expand Down
3 changes: 3 additions & 0 deletions feature/drawer/src/main/res/values-az/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
<string name="drawer_mark_as_unread">Oxunmamış kimi işarələ</string>
<string name="drawer_mute">Səssizə al</string>
<string name="drawer_unmute">Səsi aç</string>
<string name="drawer_hide">Gizlət</string>
<string name="drawer_unhide">Göstər</string>
<string name="drawer_move_up">Yuxarı keçir</string>
<string name="drawer_move_down">Aşağı keçir</string>

Expand Down Expand Up @@ -121,6 +123,7 @@
<!-- Session row state for TalkBack -->
<string name="drawer_row_pinned_state">Bərkidilmiş</string>
<string name="drawer_row_muted_state">Səssizə alınmış</string>
<string name="drawer_row_hidden_state">Gizlədilib</string>
<string name="drawer_row_needs_input_state">Müdaxiləniz lazımdır</string>
<string name="drawer_row_working_state">İşləyir</string>
<string name="drawer_row_unread_state">Oxunmamış</string>
Expand Down
3 changes: 3 additions & 0 deletions feature/drawer/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
<string name="drawer_mark_as_unread">Маркиране като непрочетено</string>
<string name="drawer_mute">Заглушаване</string>
<string name="drawer_unmute">Отмяна на заглушаването</string>
<string name="drawer_hide">Скриване</string>
<string name="drawer_unhide">Показване</string>
<string name="drawer_move_up">Преместване нагоре</string>
<string name="drawer_move_down">Преместване надолу</string>

Expand Down Expand Up @@ -121,6 +123,7 @@
<!-- Session row state for TalkBack -->
<string name="drawer_row_pinned_state">Закачена</string>
<string name="drawer_row_muted_state">Заглушена</string>
<string name="drawer_row_hidden_state">Скрити</string>
<string name="drawer_row_needs_input_state">Изисква се отговор</string>
<string name="drawer_row_working_state">Работи</string>
<string name="drawer_row_unread_state">Непрочетена</string>
Expand Down
3 changes: 3 additions & 0 deletions feature/drawer/src/main/res/values-bn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
<string name="drawer_mark_as_unread">অপঠিত হিসেবে চিহ্নিত করুন</string>
<string name="drawer_mute">মিউট করুন</string>
<string name="drawer_unmute">আনমিউট করুন</string>
<string name="drawer_hide">লুকান</string>
<string name="drawer_unhide">দেখান</string>
<string name="drawer_move_up">উপরে সরান</string>
<string name="drawer_move_down">নিচে সরান</string>

Expand Down Expand Up @@ -121,6 +123,7 @@
<!-- Session row state for TalkBack -->
<string name="drawer_row_pinned_state">পিন করা</string>
<string name="drawer_row_muted_state">মিউট করা</string>
<string name="drawer_row_hidden_state">লুকানো</string>
<string name="drawer_row_needs_input_state">আপনার ইনপুট প্রয়োজন</string>
<string name="drawer_row_working_state">কাজ চলছে</string>
<string name="drawer_row_unread_state">অপঠিত</string>
Expand Down
Loading
Loading