mirror of
https://github.com/stablyai/orca.git
synced 2026-11-16 02:47:34 +00:00
fix(sleep): keep the asleep mark outside the layout (asleepBrowserWorktreeIds); sleep writes no layout (NEW-01)
This commit is contained in:
+6
-1
@@ -1,3 +1,4 @@
|
||||
import { selectAwakeBrowserTabsByWorktree } from '@/components/sidebar/workspace-actions/sleep/browser-tab-sleep'
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
|
||||
import { useAppStore } from '@/store'
|
||||
import { useRepoById } from '@/store/repos/use-repository-catalog'
|
||||
@@ -107,7 +108,11 @@ export function useWorktreeContextMenuModel({
|
||||
selectMenuScopedMap(menuOpen, s.ptyIdsByTabId, EMPTY_PTY_IDS_BY_TAB_ID)
|
||||
)
|
||||
const browserTabsByWorktree = useAppStore((s) =>
|
||||
selectMenuScopedMap(menuOpen, s.browserTabsByWorktree, EMPTY_BROWSER_TABS_BY_WORKTREE)
|
||||
selectMenuScopedMap(
|
||||
menuOpen,
|
||||
selectAwakeBrowserTabsByWorktree(s),
|
||||
EMPTY_BROWSER_TABS_BY_WORKTREE
|
||||
)
|
||||
)
|
||||
const unifiedTabsByWorktree = useAppStore((s) =>
|
||||
selectMenuScopedMap(menuOpen, s.unifiedTabsByWorktree, EMPTY_UNIFIED_TABS_BY_WORKTREE)
|
||||
|
||||
+2
-2
@@ -11,7 +11,7 @@ import { getWorkspaceDeleteLineage } from '../deletion/workspace-delete-lineage'
|
||||
type WorkspaceActivityMaps = {
|
||||
tabsByWorktree: Record<string, { id: string }[]>
|
||||
ptyIdsByTabId: Record<string, string[]>
|
||||
browserTabsByWorktree: Record<string, { id: string; sleptAt?: number | null }[]>
|
||||
browserTabsByWorktree: Record<string, { id: string }[]>
|
||||
unifiedTabsByWorktree: Record<string, Tab[]>
|
||||
agentStatusByPaneKey: Record<string, { structuredHostOwned?: true }>
|
||||
structuredChatSleptAtByPaneKey: StructuredChatSleptAtByPaneKey
|
||||
@@ -30,7 +30,7 @@ export function hasSleepableWorkspaceActivity(
|
||||
const tabs = activity.tabsByWorktree[worktreeId] ?? []
|
||||
return (
|
||||
tabs.some((tab) => tabHasLivePty(activity.ptyIdsByTabId, tab.id)) ||
|
||||
(activity.browserTabsByWorktree[worktreeId] ?? []).some((tab) => !tab.sleptAt) ||
|
||||
(activity.browserTabsByWorktree[worktreeId] ?? []).length > 0 ||
|
||||
// An idle-ended chat still needs Sleep to hide it, even when its legacy tab has no host stamp.
|
||||
(activity.unifiedTabsByWorktree[worktreeId] ?? []).some(
|
||||
(tab) =>
|
||||
|
||||
+29
-21
@@ -4,27 +4,36 @@ import type { BrowserWorkspace } from '../../../../../../shared/browser-workspac
|
||||
type State = {
|
||||
activeWorktreeId: string | null
|
||||
browserTabsByWorktree: Record<string, BrowserWorkspace[]>
|
||||
browserPagesByWorkspace: Record<string, unknown[]>
|
||||
asleepBrowserWorktreeIds: Record<string, number>
|
||||
browserPagesByWorkspace: Record<string, never[]>
|
||||
activeBrowserTabIdByWorktree: Record<string, string>
|
||||
}
|
||||
|
||||
const mocks = vi.hoisted(() => {
|
||||
const listeners = new Set<(state: unknown) => void>()
|
||||
const listeners = new Set<(state: State) => void>()
|
||||
const initial: State = {
|
||||
activeWorktreeId: null,
|
||||
browserTabsByWorktree: {},
|
||||
asleepBrowserWorktreeIds: {},
|
||||
browserPagesByWorkspace: {},
|
||||
activeBrowserTabIdByWorktree: {}
|
||||
}
|
||||
const store = {
|
||||
state: {} as Record<string, unknown>,
|
||||
getState: () => store.state,
|
||||
setState: (change: (state: Record<string, unknown>) => Record<string, unknown>) => {
|
||||
state: initial,
|
||||
getState: (): State => store.state,
|
||||
setState: (change: (state: State) => Partial<State>): void => {
|
||||
store.state = { ...store.state, ...change(store.state) }
|
||||
for (const listener of listeners) {
|
||||
listener(store.state)
|
||||
}
|
||||
},
|
||||
subscribe: (listener: (state: unknown) => void) => {
|
||||
subscribe: (listener: (state: State) => void): (() => void) => {
|
||||
listeners.add(listener)
|
||||
return () => listeners.delete(listener)
|
||||
}
|
||||
}
|
||||
return { store, evicted: [] as string[] }
|
||||
const evicted: string[] = []
|
||||
return { store, evicted }
|
||||
})
|
||||
vi.mock('@/store', () => ({ useAppStore: mocks.store }))
|
||||
vi.mock('@/store/slices/browser/cleanup/browser-webview-cleanup', () => ({
|
||||
@@ -32,9 +41,8 @@ vi.mock('@/store/slices/browser/cleanup/browser-webview-cleanup', () => ({
|
||||
mocks.evicted.push(worktreeId)
|
||||
}))
|
||||
|
||||
const { sleepWorktreeBrowserTabs, installBrowserTabWakeOnOpen } = await import(
|
||||
'./browser-tab-sleep'
|
||||
)
|
||||
const { sleepWorktreeBrowserTabs, installBrowserTabWakeOnOpen, selectAwakeBrowserTabsByWorktree } =
|
||||
await import('./browser-tab-sleep')
|
||||
const { isInactiveWorkspace } = await import('@/lib/worktree-activity-state')
|
||||
|
||||
const tab = (id: string): BrowserWorkspace => ({
|
||||
@@ -50,13 +58,16 @@ const tab = (id: string): BrowserWorkspace => ({
|
||||
createdAt: 1
|
||||
})
|
||||
|
||||
const state = (): State => mocks.store.getState() as unknown as State
|
||||
const state = (): State => mocks.store.getState()
|
||||
const inactive = (): boolean =>
|
||||
isInactiveWorkspace('wt', {}, {}, selectAwakeBrowserTabsByWorktree(state()), new Set())
|
||||
|
||||
beforeEach(() => {
|
||||
mocks.evicted.length = 0
|
||||
mocks.store.state = {
|
||||
activeWorktreeId: null,
|
||||
browserTabsByWorktree: { wt: [tab('a'), tab('b'), tab('c')] },
|
||||
asleepBrowserWorktreeIds: {},
|
||||
browserPagesByWorkspace: {},
|
||||
activeBrowserTabIdByWorktree: { wt: 'b' }
|
||||
}
|
||||
@@ -64,31 +75,28 @@ beforeEach(() => {
|
||||
|
||||
describe('sleep keeps browser tabs in place (NEW-01)', () => {
|
||||
it('keeps every tab, in order, with the same active tab; drops only their pages', () => {
|
||||
const before = state().browserTabsByWorktree
|
||||
sleepWorktreeBrowserTabs('wt', 42)
|
||||
expect(mocks.evicted).toEqual(['wt'])
|
||||
// The layout itself is untouched: same object, same order, same active tab.
|
||||
expect(state().browserTabsByWorktree).toBe(before)
|
||||
expect(state().browserTabsByWorktree.wt.map((t) => t.id)).toEqual(['a', 'b', 'c'])
|
||||
expect(state().browserTabsByWorktree.wt.every((t) => t.sleptAt === 42)).toBe(true)
|
||||
expect(state().activeBrowserTabIdByWorktree.wt).toBe('b')
|
||||
})
|
||||
|
||||
it('asleep tabs are not activity, so the workspace still reads as asleep', () => {
|
||||
const inactive = (): boolean =>
|
||||
isInactiveWorkspace('wt', {}, {}, state().browserTabsByWorktree, new Set())
|
||||
expect(inactive()).toBe(false)
|
||||
sleepWorktreeBrowserTabs('wt', 42)
|
||||
expect(inactive()).toBe(true)
|
||||
})
|
||||
|
||||
it('opening the workspace again wakes its tabs, still in the same order', () => {
|
||||
it('opening the workspace again wakes its tabs', () => {
|
||||
const stop = installBrowserTabWakeOnOpen()
|
||||
sleepWorktreeBrowserTabs('wt', 42)
|
||||
mocks.store.setState(() => ({ activeWorktreeId: 'wt' }))
|
||||
expect(state().browserTabsByWorktree.wt.map((t) => [t.id, t.sleptAt])).toEqual([
|
||||
['a', undefined],
|
||||
['b', undefined],
|
||||
['c', undefined]
|
||||
])
|
||||
expect(state().activeBrowserTabIdByWorktree.wt).toBe('b')
|
||||
expect(state().asleepBrowserWorktreeIds).toEqual({})
|
||||
expect(inactive()).toBe(false)
|
||||
expect(state().browserTabsByWorktree.wt.map((t) => t.id)).toEqual(['a', 'b', 'c'])
|
||||
stop()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,45 +1,48 @@
|
||||
// Sleep never changes a workspace's tab layout (NEW-01). Its browser tabs stay where they are, in
|
||||
// the same order with the same active tab; only their pages are dropped to free memory, and each
|
||||
// tab is marked asleep so it no longer counts as activity (an asleep workspace still reads as
|
||||
// asleep and hides with "Hide sleeping"). Opening the workspace again wakes the tabs: each page
|
||||
// reloads in place when it is shown. A remote desktop tab's own chrome reconnects it after a wake.
|
||||
// the same order with the same active tab; only their pages are dropped to free memory, and the
|
||||
// workspace's tabs are marked asleep so they no longer count as activity (an asleep workspace still
|
||||
// reads as asleep and hides with "Hide sleeping"). Opening the workspace again wakes them: each
|
||||
// page reloads in place when it is shown. A remote desktop tab's own chrome reconnects it after a
|
||||
// wake. The mark lives outside the layout (asleepBrowserWorktreeIds), so sleep writes no layout.
|
||||
import { useAppStore } from '@/store'
|
||||
import { destroyWorktreeBrowserGuests } from '@/store/slices/browser/cleanup/browser-webview-cleanup'
|
||||
import type { BrowserWorkspace } from '../../../../../../shared/browser-workspace-types'
|
||||
|
||||
/** Awake tabs are activity; a tab Sleep put to rest is not, until the workspace is opened again. */
|
||||
export function isAwakeBrowserTab(tab: { sleptAt?: number | null }): boolean {
|
||||
return !tab.sleptAt
|
||||
}
|
||||
type BrowserTabsByWorktree = Record<string, BrowserWorkspace[]>
|
||||
|
||||
export function hasAwakeBrowserTab(
|
||||
tabs: readonly { sleptAt?: number | null }[] | null | undefined
|
||||
): boolean {
|
||||
return (tabs ?? []).some(isAwakeBrowserTab)
|
||||
}
|
||||
let cache: {
|
||||
tabs: BrowserTabsByWorktree
|
||||
asleep: Record<string, number>
|
||||
awake: BrowserTabsByWorktree
|
||||
} | null = null
|
||||
|
||||
function stamp(
|
||||
tabs: readonly BrowserWorkspace[],
|
||||
sleptAt: number | undefined
|
||||
): BrowserWorkspace[] | null {
|
||||
let changed = false
|
||||
const next = tabs.map((tab) => {
|
||||
if ((tab.sleptAt ?? undefined) === sleptAt) {
|
||||
return tab
|
||||
/**
|
||||
* The browser tabs that count as activity: every workspace's, minus those Sleep put to rest.
|
||||
* Same object back while neither input changes, so store selectors stay stable.
|
||||
*/
|
||||
export function selectAwakeBrowserTabsByWorktree(state: {
|
||||
browserTabsByWorktree: BrowserTabsByWorktree
|
||||
asleepBrowserWorktreeIds?: Record<string, number>
|
||||
}): BrowserTabsByWorktree {
|
||||
const tabs = state.browserTabsByWorktree
|
||||
const asleep = state.asleepBrowserWorktreeIds
|
||||
if (!asleep || Object.keys(asleep).length === 0) {
|
||||
return tabs
|
||||
}
|
||||
if (cache && cache.tabs === tabs && cache.asleep === asleep) {
|
||||
return cache.awake
|
||||
}
|
||||
const awake: BrowserTabsByWorktree = {}
|
||||
for (const [worktreeId, worktreeTabs] of Object.entries(tabs)) {
|
||||
if (!asleep[worktreeId]) {
|
||||
awake[worktreeId] = worktreeTabs
|
||||
}
|
||||
changed = true
|
||||
const copy: BrowserWorkspace = { ...tab }
|
||||
if (sleptAt === undefined) {
|
||||
delete copy.sleptAt
|
||||
} else {
|
||||
copy.sleptAt = sleptAt
|
||||
}
|
||||
return copy
|
||||
})
|
||||
return changed ? next : null
|
||||
}
|
||||
cache = { tabs, asleep, awake }
|
||||
return awake
|
||||
}
|
||||
|
||||
/** Sleep: drop the pages, keep the tabs, mark them asleep. */
|
||||
/** Sleep: drop the pages, keep the tabs, mark the workspace's tabs asleep. */
|
||||
export function sleepWorktreeBrowserTabs(worktreeId: string, now: number = Date.now()): void {
|
||||
const state = useAppStore.getState()
|
||||
destroyWorktreeBrowserGuests(
|
||||
@@ -47,29 +50,27 @@ export function sleepWorktreeBrowserTabs(worktreeId: string, now: number = Date.
|
||||
state.browserPagesByWorkspace,
|
||||
worktreeId
|
||||
)
|
||||
const next = stamp(state.browserTabsByWorktree[worktreeId] ?? [], now)
|
||||
if (next) {
|
||||
useAppStore.setState((s) => ({
|
||||
browserTabsByWorktree: { ...s.browserTabsByWorktree, [worktreeId]: next }
|
||||
}))
|
||||
if ((state.browserTabsByWorktree[worktreeId] ?? []).length === 0) {
|
||||
return
|
||||
}
|
||||
useAppStore.setState((s) => ({
|
||||
asleepBrowserWorktreeIds: { ...s.asleepBrowserWorktreeIds, [worktreeId]: now }
|
||||
}))
|
||||
}
|
||||
|
||||
/** The workspace is open again: its tabs count as activity once more (pages reload when shown). */
|
||||
export function wakeWorktreeBrowserTabs(worktreeId: string): void {
|
||||
const tabs = useAppStore.getState().browserTabsByWorktree[worktreeId]
|
||||
if (!tabs || !tabs.some((tab) => tab.sleptAt)) {
|
||||
if (!useAppStore.getState().asleepBrowserWorktreeIds?.[worktreeId]) {
|
||||
return
|
||||
}
|
||||
const next = stamp(tabs, undefined)
|
||||
if (next) {
|
||||
useAppStore.setState((s) => ({
|
||||
browserTabsByWorktree: { ...s.browserTabsByWorktree, [worktreeId]: next }
|
||||
}))
|
||||
}
|
||||
useAppStore.setState((s) => {
|
||||
const next = { ...s.asleepBrowserWorktreeIds }
|
||||
delete next[worktreeId]
|
||||
return { asleepBrowserWorktreeIds: next }
|
||||
})
|
||||
}
|
||||
|
||||
/** Wakes a workspace's asleep tabs whenever it becomes the active one (also after an app restart). */
|
||||
/** Wakes a workspace's asleep tabs whenever it becomes the active one. */
|
||||
export function installBrowserTabWakeOnOpen(): () => void {
|
||||
let previous = useAppStore.getState().activeWorktreeId
|
||||
if (previous) {
|
||||
|
||||
+3
-1
@@ -18,6 +18,8 @@ type SleepStateInput = {
|
||||
tabsByWorktree?: Record<string, readonly TabLike[]> | null
|
||||
ptyIdsByTabId?: Record<string, string[]> | null
|
||||
browserTabsByWorktree?: Record<string, readonly TabLike[]> | null
|
||||
/** Workspaces whose browser tabs Sleep put to rest: those tabs are not activity. */
|
||||
asleepBrowserWorktreeIds?: Record<string, number>
|
||||
unifiedTabsByWorktree?: Record<string, Tab[]> | null
|
||||
structuredChatSleptAtByPaneKey?: StructuredChatSleptAtByPaneKey
|
||||
}
|
||||
@@ -70,7 +72,7 @@ export function selectIsSleepingWorktree(state: SleepStateInput, worktreeId: str
|
||||
worktreeId,
|
||||
state.tabsByWorktree,
|
||||
state.ptyIdsByTabId,
|
||||
state.browserTabsByWorktree,
|
||||
state.asleepBrowserWorktreeIds?.[worktreeId] ? null : state.browserTabsByWorktree,
|
||||
selectWorktreeIdsWithLiveAgent(state),
|
||||
getWorktreeIdsWithStructuredChat(
|
||||
state.unifiedTabsByWorktree,
|
||||
|
||||
+2
-1
@@ -1,3 +1,4 @@
|
||||
import { selectAwakeBrowserTabsByWorktree } from '@/components/sidebar/workspace-actions/sleep/browser-tab-sleep'
|
||||
import { useMemo, useState } from 'react'
|
||||
import { useAppStore } from '@/store'
|
||||
import { getAgentStatusEpochNow } from '@/lib/agent-status/evidence/agent-status-epoch-clock'
|
||||
@@ -52,7 +53,7 @@ export function useVisibleWorkspaceKanbanWorktreeIds({
|
||||
const tabsByWorktree = useAppStore((s) => (!showSleepingWorkspaces ? s.tabsByWorktree : null))
|
||||
const ptyIdsByTabId = useAppStore((s) => (!showSleepingWorkspaces ? s.ptyIdsByTabId : null))
|
||||
const browserTabsByWorktree = useAppStore((s) =>
|
||||
!showSleepingWorkspaces ? s.browserTabsByWorktree : null
|
||||
!showSleepingWorkspaces ? selectAwakeBrowserTabsByWorktree(s) : null
|
||||
)
|
||||
const worktreeIdsWithStructuredChat = useAppStore((s) =>
|
||||
getStructuredChatWorktreeIds(
|
||||
|
||||
+6
-1
@@ -62,7 +62,12 @@ export function selectWorktreeActivityPtyIds(
|
||||
|
||||
export function useWorktreeActivityStatus(worktreeId: string): WorktreeStatus {
|
||||
const tabs = useAppStore((s) => s.tabsByWorktree[worktreeId] ?? EMPTY_TABS)
|
||||
const browserTabs = useAppStore((s) => s.browserTabsByWorktree[worktreeId] ?? EMPTY_BROWSER_TABS)
|
||||
// Tabs Sleep put to rest stay in the layout but are not activity (NEW-01).
|
||||
const browserTabs = useAppStore((s) =>
|
||||
s.asleepBrowserWorktreeIds?.[worktreeId]
|
||||
? EMPTY_BROWSER_TABS
|
||||
: (s.browserTabsByWorktree[worktreeId] ?? EMPTY_BROWSER_TABS)
|
||||
)
|
||||
const hasStructuredChat = useAppStore((s) =>
|
||||
hasAwakeStructuredChat(s.unifiedTabsByWorktree[worktreeId], s.structuredChatSleptAtByPaneKey)
|
||||
)
|
||||
|
||||
+3
-1
@@ -35,7 +35,9 @@ export function selectWorktreeActivityStatuses(
|
||||
worktreeId,
|
||||
resolveWorktreeStatus({
|
||||
tabs: statusInputs.tabsByWorktree[worktreeId] ?? EMPTY_TABS,
|
||||
browserTabs: statusInputs.browserTabsByWorktree[worktreeId] ?? EMPTY_BROWSER_TABS,
|
||||
browserTabs: statusInputs.asleepBrowserWorktreeIds?.[worktreeId]
|
||||
? EMPTY_BROWSER_TABS
|
||||
: (statusInputs.browserTabsByWorktree[worktreeId] ?? EMPTY_BROWSER_TABS),
|
||||
hasStructuredChat: hasAwakeStructuredChat(
|
||||
statusInputs.unifiedTabsByWorktree[worktreeId],
|
||||
statusInputs.structuredChatSleptAtByPaneKey
|
||||
|
||||
+4
-1
@@ -1,3 +1,4 @@
|
||||
import { selectAwakeBrowserTabsByWorktree } from '@/components/sidebar/workspace-actions/sleep/browser-tab-sleep'
|
||||
import type { AppState } from '@/store/types'
|
||||
import type { Worktree } from '../../../../../../shared/worktree/types'
|
||||
import { isSleepingSweepExempt } from '../../../../../../shared/workspace-view/workspace-row-filters'
|
||||
@@ -15,7 +16,9 @@ export function createSleepingSweepHiddenCheck(
|
||||
exemptWorktreeIds?: ReadonlySet<string>
|
||||
): (worktree: Worktree) => boolean {
|
||||
const tabsByWorktree = getVisibleWorktreeTerminalActivityTabs(state.tabsByWorktree)
|
||||
const browserTabsByWorktree = getVisibleWorktreeBrowserActivityTabs(state.browserTabsByWorktree)
|
||||
const browserTabsByWorktree = getVisibleWorktreeBrowserActivityTabs(
|
||||
selectAwakeBrowserTabsByWorktree(state)
|
||||
)
|
||||
const liveAgentWorktrees = getWorktreeIdsWithLiveAgent(
|
||||
state.agentStatusByPaneKey,
|
||||
tabsByWorktree,
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { selectAwakeBrowserTabsByWorktree } from '@/components/sidebar/workspace-actions/sleep/browser-tab-sleep'
|
||||
import { selectSidebarLineageParentIdentities } from '@/store/slices/worktrees/metadata/cross-store-lineage-parents'
|
||||
import { useMemo, useState } from 'react'
|
||||
import { shallow } from 'zustand/shallow'
|
||||
@@ -93,7 +94,9 @@ export function useVisibleSidebarWorktrees(args: {
|
||||
)
|
||||
const ptyIdsByTabId = useAppStore((s) => (needsActivityMaps ? s.ptyIdsByTabId : null))
|
||||
const browserTabsByWorktree = useAppStore((s) =>
|
||||
!showSleepingWorkspaces ? getVisibleWorktreeBrowserActivityTabs(s.browserTabsByWorktree) : null
|
||||
!showSleepingWorkspaces
|
||||
? getVisibleWorktreeBrowserActivityTabs(selectAwakeBrowserTabsByWorktree(s))
|
||||
: null
|
||||
)
|
||||
const worktreeIdsWithStructuredChat = useAppStore((s) =>
|
||||
getStructuredChatWorktreeIds(
|
||||
|
||||
+3
-5
@@ -7,7 +7,7 @@ import { createWorktreeTabBucketProjection } from '@/lib/workspace/tabs/worktree
|
||||
import type { StructuredChatSleptAtByPaneKey } from '@/store/slices/agent-status/structured-chat-slept-at'
|
||||
|
||||
export type TerminalActivityTab = Pick<TerminalTab, 'id'>
|
||||
export type BrowserActivityTab = Pick<BrowserWorkspace, 'id' | 'sleptAt'>
|
||||
export type BrowserActivityTab = Pick<BrowserWorkspace, 'id'>
|
||||
|
||||
export function createVisibleWorktreeTerminalActivityProjection(
|
||||
onInspectBucket?: (worktreeId: string) => void
|
||||
@@ -28,10 +28,8 @@ export function getVisibleWorktreeTerminalActivityTabs(
|
||||
}
|
||||
|
||||
const browserProjection = createWorktreeTabBucketProjection<BrowserWorkspace, BrowserActivityTab>({
|
||||
// A tab Sleep put to rest is not activity, so its mark is part of the projection.
|
||||
projectTab: (tab) => (tab.sleptAt ? { id: tab.id, sleptAt: tab.sleptAt } : { id: tab.id }),
|
||||
isSameProjectedTab: (previousTab, nextTab) =>
|
||||
previousTab.id === nextTab.id && previousTab.sleptAt === nextTab.sleptAt
|
||||
projectTab: (tab) => ({ id: tab.id }),
|
||||
isSameProjectedTab: (previousTab, nextTab) => previousTab.id === nextTab.id
|
||||
})
|
||||
|
||||
export function getVisibleWorktreeBrowserActivityTabs(
|
||||
|
||||
+2
-1
@@ -1,3 +1,4 @@
|
||||
import { selectAwakeBrowserTabsByWorktree } from '@/components/sidebar/workspace-actions/sleep/browser-tab-sleep'
|
||||
import { selectSidebarLineageParentIdentities } from '@/store/slices/worktrees/metadata/cross-store-lineage-parents'
|
||||
import type { Repo } from '../../../../../../shared/repo-types'
|
||||
import { getSettingsFocusedExecutionHostId } from '../../../../../../shared/execution-host'
|
||||
@@ -20,7 +21,7 @@ export function buildVisibleWorktreeOptionsFromState(
|
||||
showSleepingWorkspaces: state.showSleepingWorkspaces,
|
||||
tabsByWorktree: state.tabsByWorktree,
|
||||
ptyIdsByTabId: state.ptyIdsByTabId,
|
||||
browserTabsByWorktree: state.browserTabsByWorktree,
|
||||
browserTabsByWorktree: selectAwakeBrowserTabsByWorktree(state),
|
||||
worktreeIdsWithLiveAgent: getWorktreeIdsWithLiveAgent(
|
||||
state.agentStatusByPaneKey,
|
||||
state.tabsByWorktree,
|
||||
|
||||
@@ -26,6 +26,7 @@ export function readWindowWorkspaceActivityFacts(
|
||||
| 'tabsByWorktree'
|
||||
| 'ptyIdsByTabId'
|
||||
| 'browserTabsByWorktree'
|
||||
| 'asleepBrowserWorktreeIds'
|
||||
| 'unifiedTabsByWorktree'
|
||||
| 'agentStatusByPaneKey'
|
||||
> &
|
||||
@@ -55,7 +56,8 @@ export function readWindowWorkspaceActivityFacts(
|
||||
)
|
||||
? 'live'
|
||||
: null,
|
||||
browser: (state.browserTabsByWorktree[id] ?? []).some((tab) => !tab.sleptAt),
|
||||
browser:
|
||||
!state.asleepBrowserWorktreeIds?.[id] && (state.browserTabsByWorktree[id]?.length ?? 0) > 0,
|
||||
structuredChat: structuredChatIds.has(id),
|
||||
agent: agentById.get(id) ?? null
|
||||
}
|
||||
|
||||
@@ -12,8 +12,7 @@ import {
|
||||
} from '../../../shared/sidebar-list/workspace-activity-facts'
|
||||
|
||||
type TerminalLikeTab = Pick<TerminalTab, 'id'>
|
||||
/** `sleptAt`: Sleep kept the tab but dropped its page; it is not activity until reopened. */
|
||||
type BrowserLikeTab = { id: string; sleptAt?: number | null }
|
||||
type BrowserLikeTab = { id: string }
|
||||
|
||||
type TabsByWorktree = Record<string, readonly TerminalLikeTab[]>
|
||||
type PtyIdsByTabId = Record<string, string[]>
|
||||
@@ -82,7 +81,7 @@ export function hasActiveWorkspaceActivity(
|
||||
const tabs = tabsByWorktree?.[worktreeId] ?? []
|
||||
const hasLiveTerminal =
|
||||
ptyIdsByTabId != null && tabs.some((tab) => tabHasLivePty(ptyIdsByTabId, tab.id))
|
||||
const hasBrowser = (browserTabsByWorktree?.[worktreeId] ?? []).some((tab) => !tab.sleptAt)
|
||||
const hasBrowser = (browserTabsByWorktree?.[worktreeId] ?? []).length > 0
|
||||
// Why: a running agent keeps the workspace visible through brief PTY gaps
|
||||
// such as an SSH reconnect or an unmounted remote pane. #7197
|
||||
const hasLiveAgent = worktreeIdsWithLiveAgent.has(worktreeId)
|
||||
|
||||
@@ -63,7 +63,7 @@ const STATUS_LABELS: Record<WorktreeStatus, string> = {
|
||||
|
||||
export function getWorktreeStatus(
|
||||
tabs: readonly Pick<TerminalTab, 'id' | 'title' | 'launchAgent'>[],
|
||||
browserTabs: readonly { id: string; sleptAt?: number | null }[],
|
||||
browserTabs: readonly { id: string }[],
|
||||
ptyIdsByTabId: Record<string, string[]>,
|
||||
runtimePaneTitlesByTabId: Record<string, Record<number, string>> = {},
|
||||
options: WorktreeStatusHeuristicOptions = {}
|
||||
@@ -84,12 +84,7 @@ export function getWorktreeStatus(
|
||||
if (options.liveAgentStatus === 'monitoring') {
|
||||
return 'monitoring'
|
||||
}
|
||||
// A tab Sleep put to rest (sleptAt) keeps its place but is not activity.
|
||||
if (
|
||||
liveTabs.length > 0 ||
|
||||
browserTabs.some((tab) => !tab.sleptAt) ||
|
||||
options.hasStructuredChat
|
||||
) {
|
||||
if (liveTabs.length > 0 || browserTabs.length > 0 || options.hasStructuredChat) {
|
||||
// Why: browser-only and chat-only worktrees (no PTY) are still active from the user's point of view.
|
||||
return 'active'
|
||||
}
|
||||
@@ -204,7 +199,7 @@ export function getWorktreeStatusLabel(status: WorktreeStatus): string {
|
||||
*/
|
||||
export function resolveWorktreeStatus(args: {
|
||||
tabs: readonly Pick<TerminalTab, 'id' | 'title' | 'launchAgent'>[]
|
||||
browserTabs: readonly { id: string; sleptAt?: number | null }[]
|
||||
browserTabs: readonly { id: string }[]
|
||||
hasStructuredChat?: boolean
|
||||
ptyIdsByTabId: Record<string, string[]>
|
||||
runtimePaneTitlesByTabId?: Record<string, Record<number, string>>
|
||||
|
||||
@@ -116,6 +116,8 @@ export type BrowserCookieImportExecutionResult = BrowserCookieImportResult & {
|
||||
|
||||
export type BrowserSlice = {
|
||||
browserTabsByWorktree: Record<string, BrowserWorkspace[]>
|
||||
/** Workspaces whose tabs Sleep put to rest (when): kept in the layout, not activity (NEW-01). */
|
||||
asleepBrowserWorktreeIds: Record<string, number>
|
||||
browserPagesByWorkspace: Record<string, BrowserPage[]>
|
||||
browserCertificateFailuresByPageId: Record<string, BrowserCertificateFailure>
|
||||
/** May precede the page record (client-hosted pages); main's false on guest teardown clears it. */
|
||||
|
||||
@@ -23,6 +23,7 @@ import { createBrowserHistoryActions } from './history/browser-history-actions'
|
||||
|
||||
export const createBrowserSlice: StateCreator<AppState, [], [], BrowserSlice> = (set, get) => ({
|
||||
browserTabsByWorktree: {},
|
||||
asleepBrowserWorktreeIds: {},
|
||||
browserPagesByWorkspace: {},
|
||||
browserCertificateFailuresByPageId: {},
|
||||
browserAudiblePageIds: {},
|
||||
|
||||
@@ -131,11 +131,6 @@ export type BrowserWorkspace = {
|
||||
createdAt: number
|
||||
/** Mirrored from the active page, like the fields above it. */
|
||||
docLocation?: BrowserPageDocLocation | null
|
||||
/**
|
||||
* Set by Sleep: the tab keeps its place but its page was dropped, and it is not activity until
|
||||
* the workspace is opened again (then cleared, and the page reloads when shown).
|
||||
*/
|
||||
sleptAt?: number
|
||||
}
|
||||
|
||||
export type BrowserSessionProfileScope = 'default' | 'isolated' | 'imported'
|
||||
|
||||
@@ -217,9 +217,7 @@ const BROWSER = {
|
||||
canGoBack: own('browserLive', 'canGoBack'),
|
||||
canGoForward: own('browserLive', 'canGoForward'),
|
||||
loadError: own('browserLive', 'loadError'),
|
||||
docLocation: own('browserLive', 'docLocation'),
|
||||
// Sleep's mark: runtime-only, so a restart starts every tab awake.
|
||||
sleptAt: 'unwritten'
|
||||
docLocation: own('browserLive', 'docLocation')
|
||||
} as const satisfies Record<keyof BrowserWorkspace, DiskFieldWritten>
|
||||
|
||||
// Write records only for mounted tree panes; derive keys from tab and leaf IDs.
|
||||
|
||||
Reference in New Issue
Block a user