Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(mobile): isolate task content while retaining sidebar chrome
Dashcf9055ae3952
diff --git a/apps/mobile/app/sessions/[sessionId].tsx b/apps/mobile/app/sessions/[sessionId].tsxindex 926d792f3a..feb327fbc2 100644--- a/apps/mobile/app/sessions/[sessionId].tsx+++ b/apps/mobile/app/sessions/[sessionId].tsx@@ -170,7 +170,7 @@ import { findRemoteHistoryView, useRemoteHistoryView } from '@/session/remoteHisimport { HistoryViewHandoff, historyAfter, isHistoryViewUnavailable } from '@cindy/maker-shared/message-window';import { SideChatsSheet } from '@/session/SideChatsSheet';import { useSideChatCount } from '@/session/useSideChatCount';-import { SideChatTaskBoundary } from '@/session/SideChatTaskBoundary';+import { SessionTaskLayout, type SessionTaskChrome } from '@/session/SessionTaskLayout';import { buildMobileSessionRenderWindow } from '@/session/mobileHistoryRender';import { createMobileMakerTransport } from '@/device-link/mobileMakerTransport';import { startFocusedTopicSubscription } from '@/device-link/focusedTopicSubscription';@@ -684,7 +684,6 @@ import {useSessionRunning,useSessionTaskUpdates,} from '@/session/remoteSessionStore';-import { CindyMakeSessionGate } from '@/session/CindyMakeSessionGate';import { useFailedCreationReturnToEdit } from '@/session/useFailedCreationReturnToEdit';import type {MobileGoalLimitsInput,@@ -1020,22 +1019,10 @@ function composerDraftScopeKey(sessionId: string, routeDraft: string | null): st}export default function SessionScreen() {- const params = useLocalSearchParams<{ sessionId: string; deviceId?: string }>();- const sessionId = readRouteParam(params.sessionId) ?? '';- const deviceId = readRouteParam(params.deviceId)- ?? remoteSessionStore.getSessionDeviceId(sessionId) ?? '';- const session = useRemoteSessionDetail(deviceId, sessionId);- return (- <SideChatTaskBoundary deviceId={deviceId}- sessionId={sessionId} enabled={session?.source === 'side-chat'}>- <CindyMakeSessionGate sessionId={sessionId} deviceId={deviceId || undefined} ownsSessionSubscription>- <SessionScreenContent />- </CindyMakeSessionGate>- </SideChatTaskBoundary>- );+ return <SessionTaskLayout>{chrome => <SessionScreenContent {...chrome} />}</SessionTaskLayout>;}-function SessionScreenContent() {+function SessionScreenContent({ beforeSessionSwitchRef, newSessionActionRef }: SessionTaskChrome) {const styles = useThemedStyles(makeStyles);const composerPullThrough = useComposerPullThroughBridge();const renderMessageScroll = useCallback(@@ -1536,6 +1523,16 @@ function SessionScreenContent() {discardAllPendingUploadsForScopeChange();discardSessionComposerAttachmentStateRef.current();}, [discardAllPendingUploadsForScopeChange, sessionId]);+ useLayoutEffect(() => {+ const discard = () => {+ discardAllPendingUploadsForScopeChange();+ discardSessionComposerAttachmentStateRef.current();+ };+ beforeSessionSwitchRef.current = discard;+ return () => {+ if (beforeSessionSwitchRef.current === discard) beforeSessionSwitchRef.current = null;+ };+ }, [beforeSessionSwitchRef, discardAllPendingUploadsForScopeChange]);const queueEditLockOwnerRef = useRef<QueueEditLockOwner | null>(null);const queueEditSaveOwnerRef = useRef<QueueEditLockOwner | null>(null);// 「已出队、消息尚未回流」的落定中条目:桌面端 drain 会先从 pendingQueue 摘除、@@ -3157,7 +3154,7 @@ function SessionScreenContent() {// 前进导航防连点:快速双击「新建」会把 /sessions/new 压栈两层(返回要退两次),// 与首页各入口同一把 guardedPush 锁。const guardedPush = useGuardedPush();- const homeNewSessionActionRef = useRef<(() => void) | null>(null);+ const homeNewSessionActionRef = newSessionActionRef;const handleDrawerNewSession = useCallback(() => {if (homeNewSessionActionRef.current) { homeNewSessionActionRef.current(); return; }queueDrawerNavigation(() => {@@ -11100,9 +11097,10 @@ function SessionScreenContent() {top={topChromeHeight + spacing.sm}/></MessageHistoryOverlay>- <MessageHistoryOverlay enabled={!paneLayout.persistent || sessionListDrawerOverlayMounted}>- {/* The persistent panel stays below the shared resident list. Only modal- drawers cover resident histories, including their closing animation. */}+ <MessageHistoryOverlay>+ {/* The persistent panel belongs to SessionTaskLayout, outside this keyed+ task. Modal drawers keep their exit/navigation lifecycle here. */}+ {!paneLayout.persistent || sessionListDrawerOverlayMounted ? (<SessionListDrawernewSessionActionRef={homeNewSessionActionRef}newSessionInSystemBar={paneLayout.persistent && Platform.OS === 'ios' && adaptiveWindow.barEdge !== 'none'}@@ -11111,10 +11109,10 @@ function SessionScreenContent() {onClosed={handleSessionListDrawerClosed}runNavigation={queueDrawerNavigation}onSelectSession={handleDrawerSelectSession}- persistent={paneLayout.persistent && !sessionListDrawerOverlayMounted}- open={(paneLayout.persistent && !sessionListDrawerOverlayMounted) || sessionListDrawerOpen}- width={paneLayout.persistent && !sessionListDrawerOverlayMounted ? paneLayout.sidebarWidth : sessionListDrawerWidthRef.current}+ open={sessionListDrawerOpen}+ width={sessionListDrawerWidthRef.current}/>+ ) : null}</MessageHistoryOverlay></View>);diff --git a/apps/mobile/docs/navigation-and-composer.md b/apps/mobile/docs/navigation-and-composer.mdindex e7770747bc..0ee6997c3f 100644--- a/apps/mobile/docs/navigation-and-composer.md+++ b/apps/mobile/docs/navigation-and-composer.md@@ -20,7 +20,7 @@- 伙伴对话:左上角为返回(回到伙伴列表);Duo 系统栏已有返回时保留侧栏按钮,不出现两个返回。- Duo 等宽屏任务页可拖动中间把手调整两栏:列表宽度限制在 240–420pt,并为正文保留至少 400pt;真实折痕划分的两栏不允许移动。宽度在当前窗口内跨任务和旋转保留,不写入持久设置。- iOS 首页列表留在自己的原生路由内,进入任务后仍可供返回动画显示;常驻侧栏独立保留列表内容,拖动分栏时不叠加尺寸动画。抽屉页面卸载时只撤销自己发布的内容,旧页面的清理不影响新页面,下一任务测量前不显示失效内容。系统顶栏已计入安全区时,磨砂高度直接采用原生测量值。-- 侧栏切换任务沿用当前页面,不用任务 ID 重建整页,保留侧栏标题和测量槽。侧聊删除保护在边界内部按电脑及任务身份重置;旧订阅的迟到删除不能隐藏或退出新任务。+- 侧栏切换任务沿用当前原生 Screen;`SessionTaskLayout` 将常驻侧栏放在任务内容边界之外,保留侧栏标题和测量槽。任务内容及侧聊删除保护按电脑及任务身份重建,搜索、停止、模型操作等局部状态和迟到完成不能影响新任务。- 设置等整页滚动的二级页:顶栏透明、系统柔和边缘,内容滚到顶栏和底部指示条下面,无硬分界(设置、语音词典、账号注销、伙伴私聊、共享任务管理、资源列表);设备详情只去掉底部色带。## 已知未完成diff --git a/apps/mobile/src/__tests__/homeDesktopFirst.test.ts b/apps/mobile/src/__tests__/homeDesktopFirst.test.tsindex fda0d1f905..a858201777 100644--- a/apps/mobile/src/__tests__/homeDesktopFirst.test.ts+++ b/apps/mobile/src/__tests__/homeDesktopFirst.test.ts@@ -794,7 +794,14 @@ describe('mobile home desktop-first surface', () => {expect(source).toContain('result.becameControllable');expect(source).toContain('remoteSessionStore.registerReseedHandler(item.device.deviceId');expect(source).toContain('syncInFlightRef');- expect(source).not.toContain('presenceVersion');+ // Presence can refresh the pure project-icon projection. It must not+ // restart network hydration/silent sync for every heartbeat.+ expect(hydrateSource).not.toContain('presenceVersion');+ const silentSyncSource = source.slice(+ source.indexOf('const startSilentHomeSync = useCallback'),+ source.indexOf('// 把当前权威设备列表注入 remoteSessionStore'),+ );+ expect(silentSyncSource).not.toContain('presenceVersion');expect(source).not.toContain('refreshControl={<RefreshControl refreshing={loading}');});diff --git a/apps/mobile/src/__tests__/mobileNativeBoundaryContracts.test.ts b/apps/mobile/src/__tests__/mobileNativeBoundaryContracts.test.tsindex 6a9a6d1907..f20621b361 100644--- a/apps/mobile/src/__tests__/mobileNativeBoundaryContracts.test.ts+++ b/apps/mobile/src/__tests__/mobileNativeBoundaryContracts.test.ts@@ -308,7 +308,10 @@ describe('persistent native history ownership', () => {expect(home).toContain('{residentList.enabled ? (');expect(home).not.toContain('residentList.enabled && !embedded');const route = readFileSync(resolve(process.cwd(), 'app/sessions/[sessionId].tsx'), 'utf8');- expect(route).toContain('<MessageHistoryOverlay enabled={!paneLayout.persistent || sessionListDrawerOverlayMounted}>');+ const layout = readFileSync(resolve(process.cwd(), 'src/session/SessionTaskLayout.tsx'), 'utf8');+ expect(route).toContain('<SessionTaskLayout>');+ expect(layout).toContain('<MessageHistoryOverlay enabled={false}>');+ expect(layout).toContain('persistent={paneLayout.persistent}');});it('does not keep the old route preloading mechanism alongside the resident host', () => {const home = readFileSync(resolve(process.cwd(), 'src/session/HomeSurface.tsx'), 'utf8');diff --git a/apps/mobile/src/__tests__/sessionHeaderDesktopFirst.test.ts b/apps/mobile/src/__tests__/sessionHeaderDesktopFirst.test.tsindex d2296f8581..01efa14188 100644--- a/apps/mobile/src/__tests__/sessionHeaderDesktopFirst.test.ts+++ b/apps/mobile/src/__tests__/sessionHeaderDesktopFirst.test.ts@@ -40,9 +40,11 @@ describe('mobile session header desktop-first surface', () => {it('releases the new-session handoff heavy topic when the session screen unmounts', () => {const source = readTextLf(resolve(process.cwd(), 'app/sessions/[sessionId].tsx'), 'utf8');+ const layout = readTextLf(resolve(process.cwd(), 'src/session/SessionTaskLayout.tsx'), 'utf8');const gate = readTextLf(resolve(process.cwd(), 'src/session/CindyMakeSessionGate.tsx'), 'utf8');- expect(source).toMatch(/<CindyMakeSessionGate\b[^>]*\bownsSessionSubscription[\s>]/);+ expect(source).toContain('<SessionTaskLayout>');+ expect(layout).toMatch(/<CindyMakeSessionGate\b[^>]*\bownsSessionSubscription[\s>]/);expect(gate).toContain('useEffect(() => () => {');expect(gate).toContain('if (!ownsSessionSubscription || !deviceId || !sessionId) return;');expect(gate).toMatch(@@ -126,6 +128,7 @@ describe('mobile session header desktop-first surface', () => {it('keeps narrow navigation back-only and the persistent Home column', () => {const source = readTextLf(resolve(process.cwd(), 'app/sessions/[sessionId].tsx'), 'utf8');+ const layout = readTextLf(resolve(process.cwd(), 'src/session/SessionTaskLayout.tsx'), 'utf8');// 窄窗口仅保留返回;主页列仅在宽窗口常驻。expect(source).toContain('onOpenSessionList={!paneLayout.persistent && wideSessionNav.enabled ? openSessionListDrawer : undefined}');@@ -183,9 +186,11 @@ describe('mobile session header desktop-first surface', () => {expect(source).toContain("importantForAccessibility={sessionListDrawerOverlayMounted ? 'no-hide-descendants' : 'auto'}");// 退场期间旋转/折叠/收窄不能直接卸载 Drawer:保留到 onClosed,三类 pending 导航// 才都能执行;宽屏 layout 失效后 drawerWidth=0,退场继续用最后有效宽度。- expect(source).toContain('persistent={paneLayout.persistent && !sessionListDrawerOverlayMounted}');+ expect(layout).toContain('persistent={paneLayout.persistent}');+ expect(source).toContain('{!paneLayout.persistent || sessionListDrawerOverlayMounted ? (');expect(source).toContain('if (wideSessionNav.enabled) sessionListDrawerWidthRef.current = wideSessionNav.drawerWidth;');- expect(source).toContain('width={paneLayout.persistent && !sessionListDrawerOverlayMounted ? paneLayout.sidebarWidth : sessionListDrawerWidthRef.current}');+ expect(layout).toContain('width={paneLayout.sidebarWidth}');+ expect(source).toContain('width={sessionListDrawerWidthRef.current}');// 选任务失败路径:校验先于关闭动画——先关再弹 Alert 会让焦点归还抢走弹窗焦点。expect(source).toContain("Alert.alert(t('devices.list.error.sessionDeviceNotFound'));\n return;\n }\n // 不派发 NativeStack REPLACE");});diff --git a/apps/mobile/src/__tests__/sideChatTaskBoundary.test.tsx b/apps/mobile/src/__tests__/sideChatTaskBoundary.test.tsxindex 090bd7eab8..16fec2fbef 100644--- a/apps/mobile/src/__tests__/sideChatTaskBoundary.test.tsx+++ b/apps/mobile/src/__tests__/sideChatTaskBoundary.test.tsx@@ -1,12 +1,13 @@// @vitest-environment jsdomimport * as React from 'react';-import { readFileSync } from 'node:fs';-import { resolve } from 'node:path';import { act } from 'react';import { createRoot } from 'react-dom/client';-import ts from 'typescript';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import { SideChatTaskBoundary } from '../session/SideChatTaskBoundary';+import { SessionTaskLayout } from '../session/SessionTaskLayout';+import type { ComponentProps } from 'react';+import type { SessionListDrawer } from '../session/SessionListDrawer';+import type { RemoteSessionListItem } from '../session/sessionList';const state = vi.hoisted(() => ({focused: true,@@ -16,48 +17,51 @@ const state = vi.hoisted(() => ({dismissKeyboard: vi.fn(),listeners: new Set<(deviceId: string, sessionId: string) => void>(),route: { deviceId: 'host', sessionId: 'child' },+ sidebar: null as ComponentProps<typeof SessionListDrawer> | null,+ source: 'local',+ replaceParams: vi.fn(),}));-vi.mock('react-native', () => ({- Keyboard: { dismiss: state.dismissKeyboard },+vi.mock('react-native', async () => {+ const { createElement } = await import('react');+ return {+ Keyboard: { dismiss: state.dismissKeyboard },+ View: ({ children }: { children: React.ReactNode }) => createElement('div', null, children),+ StyleSheet: { create: (styles: unknown) => styles },+ Platform: { OS: 'ios' }, Alert: { alert: vi.fn() },+ };+});+vi.mock('expo-router', () => ({+ useLocalSearchParams: () => state.route,+ useNavigation: () => ({ replaceParams: state.replaceParams }),+ useRouter: () => ({+ back: state.back, canGoBack: () => state.canGoBack, replace: state.replace,+ }),}));-vi.mock('expo-router', () => ({ useRouter: () => ({- back: state.back, canGoBack: () => state.canGoBack, replace: state.replace,-}) }));vi.mock('expo-router/react-navigation', () => ({ useIsFocused: () => state.focused }));vi.mock('../session/remoteSessionStore', () => ({remoteSessionStore: {+ getSessionDeviceId: () => 'host',onSessionRemoved: (listener: (deviceId: string, sessionId: string) => void) => {state.listeners.add(listener);return () => { state.listeners.delete(listener); };},},+ useRemoteSessionDetail: () => ({ source: state.source }),}));--// Execute the actual route wrapper (without loading the native editor tree).-// Boundary-only tests cannot catch a task key added by its caller.-const source = ts.createSourceFile('session.tsx', readFileSync(- resolve(process.cwd(), 'app/sessions/[sessionId].tsx'), 'utf8',-), ts.ScriptTarget.Latest, true, ts.ScriptKind.TSX);-const page = source.statements.find((node): node is ts.FunctionDeclaration =>- ts.isFunctionDeclaration(node) && node.name?.text === 'SessionScreen');-if (!page?.body) throw new Error('SessionScreen not found');-const compiledRoute = ts.transpileModule(`function SessionScreen() ${page.body.getText(source)}`, {- compilerOptions: { jsx: ts.JsxEmit.React, target: ts.ScriptTarget.ES2022 },-}).outputText;-const SessionRoute = new Function('bindings', `- const { React, useLocalSearchParams, readRouteParam, remoteSessionStore,- useRemoteSessionDetail, SideChatTaskBoundary, CindyMakeSessionGate, SessionScreenContent } = bindings;- ${compiledRoute}- return SessionScreen;-`)({- React, SideChatTaskBoundary,- useLocalSearchParams: () => state.route,- readRouteParam: (value: string) => value,- remoteSessionStore: { getSessionDeviceId: () => 'host' },- useRemoteSessionDetail: () => ({ source: 'local' }),+vi.mock('../session/CindyMakeSessionGate', () => ({CindyMakeSessionGate: ({ children }: { children: React.ReactNode }) => children,- SessionScreenContent: () => <textarea aria-label="Message" />,-}) as React.ComponentType;+}));+vi.mock('../session/RecentMessageHistories', () => ({+ MessageHistoryOverlay: ({ children }: { children: React.ReactNode }) => children,+}));+vi.mock('../session/ResidentHomeList', () => ({ useSessionPaneLayout: () => ({ persistent: true, sidebarWidth: 320 }) }));+vi.mock('@/platform/AdaptiveWindowContext', () => ({ useAdaptiveWindow: () => ({ barEdge: 'left' }) }));+vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key }) }));+vi.mock('../session/conversationSearch', () => ({ conversationSearchCompanionParams: () => ({}) }));+vi.mock('../session/SessionListDrawer', () => ({ SessionListDrawer: (props: ComponentProps<typeof SessionListDrawer>) => {+ state.sidebar = props;+ return <textarea aria-label="Sidebar search" />;+} }));// Unit, black-box regression 2026-10-20: a deleted follow-up kept its editor.// Picker/count tests do not mount this route boundary. Minimal input: an own@@ -67,7 +71,7 @@ describe('side chat task lifecycle', () => {let host: HTMLDivElement;let root: ReturnType<typeof createRoot>;const render = (enabled = true, sessionId = 'child', deviceId = 'host') => act(() => root.render(- <SideChatTaskBoundary deviceId={deviceId} sessionId={sessionId} enabled={enabled}>+ <SideChatTaskBoundary key={JSON.stringify([deviceId, sessionId])} deviceId={deviceId} sessionId={sessionId} enabled={enabled}><textarea aria-label="Message" /></SideChatTaskBoundary>,));@@ -81,6 +85,9 @@ describe('side chat task lifecycle', () => {state.canGoBack = true;state.replace.mockClear();state.dismissKeyboard.mockClear();+ state.source = 'local';+ state.route = { deviceId: 'host', sessionId: 'child' };+ state.replaceParams.mockReset();host = document.createElement('div');root = createRoot(host);});@@ -132,23 +139,74 @@ describe('side chat task lifecycle', () => {expect(state.replace).toHaveBeenCalledExactlyOnceWith('/');});- // Unit regression 2026-10-24: task-keyed deletion protection remounted the- // whole page and sidebar on every switch. Existing tests only used one task.- // The boundary must retain live children yet isolate removal across scopes.- it('keeps the mounted page when switching ordinary tasks and computers', () => {+ // Unit regression 2026-10-24 (#6976 review): preserving the entire task leaked+ // local state and late completions. Exercise the production layout boundary+ // with stateful children; the sidebar must survive while detail is replaced.+ it('keeps sidebar measurement/search nodes while replacing tasks and computers', () => {const renderRoute = (sessionId: string, deviceId = 'host') => {state.route = { deviceId, sessionId };- act(() => root.render(<SessionRoute />));+ act(() => root.render(<SessionTaskLayout>{() => <textarea aria-label="Message" />}</SessionTaskLayout>));};renderRoute('child');- const editor = host.querySelector('textarea')!;- renderRoute('next');- expect(host.querySelector('textarea')).toBe(editor);- renderRoute('next', 'other-host');- expect(host.querySelector('textarea')).toBe(editor);+ const sidebar = host.querySelector('[aria-label="Sidebar search"]')!;+ let editor = host.querySelector<HTMLTextAreaElement>('[aria-label="Message"]')!;+ for (const [sessionId, deviceId] of [['next', 'host'], ['next', 'other-host'], ['child', 'host']] as const) {+ editor.value = 'old task search';+ renderRoute(sessionId, deviceId);+ expect(host.querySelector('[aria-label="Sidebar search"]')).toBe(sidebar);+ expect(host.querySelector('[aria-label="Message"]')).not.toBe(editor);+ editor = host.querySelector<HTMLTextAreaElement>('[aria-label="Message"]')!;+ expect(editor.value).toBe('');+ }expect(state.back).not.toHaveBeenCalled();});+ it('isolates busy/error completions when an old task settles after a new operation starts', async () => {+ const pending: { reject(error: Error): void }[] = [];+ function TaskContent() {+ const [busy, setBusy] = React.useState(false);+ const [error, setError] = React.useState('');+ return <button disabled={busy} onClick={() => {+ setBusy(true);+ void new Promise<void>((_resolve, reject) => pending.push({ reject }))+ .catch(reason => setError(reason.message)).finally(() => setBusy(false));+ }}>{error || (busy ? 'pending' : 'ready')}</button>;+ }+ const renderLayout = () => act(() => root.render(+ <SessionTaskLayout>{() => <TaskContent />}</SessionTaskLayout>,+ ));+ renderLayout();+ act(() => host.querySelector('button')!.click());+ state.route = { deviceId: 'other-host', sessionId: 'child' };+ renderLayout();+ expect(host.querySelector('button')!.disabled).toBe(false);+ act(() => host.querySelector('button')!.click());+ await act(async () => pending[0]!.reject(new Error('old task failed')));+ expect(host.querySelector('button')!.disabled).toBe(true);+ expect(host.textContent).toBe('pending');+ await act(async () => pending[1]!.reject(new Error('current task failed')));+ expect(host.querySelector('button')!.disabled).toBe(false);+ expect(host.textContent).toBe('current task failed');+ });++ it('discards the outgoing attachment scope before sidebar navigation and preserves search focus', () => {+ const order: string[] = [];+ state.replaceParams.mockImplementation(() => order.push('navigate'));+ act(() => root.render(<SessionTaskLayout>{chrome => {+ chrome.beforeSessionSwitchRef.current = () => order.push('discard');+ return <textarea />;+ }}</SessionTaskLayout>));+ const target = {+ session: { id: 'next', canonicalDeviceId: 'canonical-host', deviceLinkDeviceId: 'old-host', deviceLinkDeviceName: 'Mac' },+ searchFocusClientId: 'message-42',+ } as unknown as RemoteSessionListItem;+ act(() => state.sidebar!.onSelectSession(target));+ expect(order).toEqual(['discard', 'navigate']);+ expect(state.replaceParams).toHaveBeenCalledExactlyOnceWith({+ deviceId: 'canonical-host', deviceName: 'Mac', sessionId: 'next', focusClientId: 'message-42',+ });+ });+it.each([['next', 'host'],['child', 'other-host'],diff --git a/apps/mobile/src/session/SessionTaskLayout.tsx b/apps/mobile/src/session/SessionTaskLayout.tsxnew file mode 100644index 0000000000..5cd5bb4992--- /dev/null+++ b/apps/mobile/src/session/SessionTaskLayout.tsx@@ -0,0 +1,89 @@+import { useCallback, useRef, type ReactNode, type RefObject } from 'react';+import { Alert, Platform, StyleSheet, View } from 'react-native';+import { useLocalSearchParams, useNavigation } from 'expo-router';+import { useTranslation } from 'react-i18next';+import { useAdaptiveWindow } from '@/platform/AdaptiveWindowContext';+import { CindyMakeSessionGate } from './CindyMakeSessionGate';+import { conversationSearchCompanionParams } from './conversationSearch';+import { MessageHistoryOverlay } from './RecentMessageHistories';+import { useSessionPaneLayout } from './ResidentHomeList';+import { remoteSessionStore, useRemoteSessionDetail } from './remoteSessionStore';+import { SessionListDrawer } from './SessionListDrawer';+import { switchDrawerSessionInPlace, type SessionRouteParamsNavigation } from './sessionDrawerNavigation';+import type { RemoteSessionListItem } from './sessionList';+import { SideChatTaskBoundary } from './SideChatTaskBoundary';+import type { RemoteSession } from './types';++export interface SessionTaskChrome {+ beforeSessionSwitchRef: RefObject<(() => void) | null>;+ newSessionActionRef: RefObject<(() => void) | null>;+}++/** Keep sidebar chrome outside the task lifetime. The keyed detail owns all+ * task-local state and pending completions, including when switching computers. */+export function SessionTaskLayout({ children }: {+ children(chrome: SessionTaskChrome): ReactNode;+}) {+ const params = useLocalSearchParams<{ sessionId: string; deviceId?: string }>();+ const sessionId = readRouteParam(params.sessionId) ?? '';+ const deviceId = readRouteParam(params.deviceId)+ ?? remoteSessionStore.getSessionDeviceId(sessionId) ?? '';+ const session = useRemoteSessionDetail(deviceId, sessionId);+ const navigation = useNavigation<SessionRouteParamsNavigation>();+ const paneLayout = useSessionPaneLayout();+ const adaptiveWindow = useAdaptiveWindow();+ const { t } = useTranslation();+ const beforeSessionSwitchRef = useRef<(() => void) | null>(null);+ const newSessionActionRef = useRef<(() => void) | null>(null);+ const selectSession = useCallback((item: RemoteSessionListItem) => {+ const target = item.session as RemoteSession;+ const focusClientId = 'searchFocusClientId' in item+ ? (item as { searchFocusClientId?: string }).searchFocusClientId : undefined;+ if (target.id === sessionId && !focusClientId) return;+ const targetDeviceId = target.canonicalDeviceId ?? target.deviceLinkDeviceId+ ?? remoteSessionStore.getSessionDeviceId(target.id);+ if (!targetDeviceId) {+ Alert.alert(t('devices.list.error.sessionDeviceNotFound'));+ return;+ }+ beforeSessionSwitchRef.current?.();+ switchDrawerSessionInPlace(navigation, {+ deviceId: targetDeviceId,+ deviceName: target.deviceLinkDeviceName ?? targetDeviceId,+ sessionId: target.id,+ ...(focusClientId ? { focusClientId } : {}),+ ...conversationSearchCompanionParams(item),+ });+ }, [navigation, sessionId, t]);+ return <View style={styles.root}>+ <SideChatTaskBoundary key={JSON.stringify([deviceId, sessionId])} deviceId={deviceId}+ sessionId={sessionId} enabled={session?.source === 'side-chat'}>+ <CindyMakeSessionGate sessionId={sessionId} deviceId={deviceId || undefined} ownsSessionSubscription>+ {children({ beforeSessionSwitchRef, newSessionActionRef })}+ </CindyMakeSessionGate>+ </SideChatTaskBoundary>+ <MessageHistoryOverlay enabled={false}>+ <SessionListDrawer+ currentSessionId={sessionId}+ newSessionActionRef={newSessionActionRef}+ newSessionInSystemBar={Platform.OS === 'ios' && adaptiveWindow.barEdge !== 'none'}+ onClose={ignoreClose}+ onSelectSession={selectSession}+ runNavigation={runNavigation}+ persistent={paneLayout.persistent}+ open={paneLayout.persistent}+ width={paneLayout.sidebarWidth}+ />+ </MessageHistoryOverlay>+ </View>;+}++const ignoreClose = () => undefined;+const runNavigation = (action: () => void) => action();+const styles = StyleSheet.create({ root: { flex: 1 } });++function readRouteParam(value: unknown): string | null {+ if (typeof value === 'string') return value;+ if (Array.isArray(value) && typeof value[0] === 'string') return value[0];+ return null;+}diff --git a/apps/mobile/src/session/SideChatTaskBoundary.tsx b/apps/mobile/src/session/SideChatTaskBoundary.tsxindex 76f1afd773..a7cc56fe0b 100644--- a/apps/mobile/src/session/SideChatTaskBoundary.tsx+++ b/apps/mobile/src/session/SideChatTaskBoundary.tsx@@ -15,29 +15,20 @@ export function SideChatTaskBoundary({ children, deviceId, sessionId, enabled }:}) {const router = useRouter();const focused = useIsFocused();- const scope = JSON.stringify([deviceId, sessionId]);- const [removal, setRemoval] = useState({ scope, removed: false });- // Reset only deletion state when params change. Keying this boundary by task- // would also remount the page, its sidebar header and its measuring slot.- if (removal.scope !== scope) setRemoval({ scope, removed: false });- const removed = removal.scope === scope && removal.removed;- const returned = useRef<typeof removal | null>(null);+ const [removed, setRemoved] = useState(false);+ const returned = useRef(false);useEffect(() => {if (!enabled) return;- let active = true;- const unsubscribe = remoteSessionStore.onSessionRemoved((ownerDeviceId, removedSessionId) => {- if (!active || ownerDeviceId !== deviceId || removedSessionId !== sessionId) return;- setRemoval(current => current.scope === scope && !current.removed- ? { scope, removed: true } : current);+ return remoteSessionStore.onSessionRemoved((ownerDeviceId, removedSessionId) => {+ if (ownerDeviceId === deviceId && removedSessionId === sessionId) setRemoved(true);});- return () => { active = false; unsubscribe(); };- }, [deviceId, enabled, scope, sessionId]);+ }, [deviceId, enabled, sessionId]);useEffect(() => {// A hidden route waits for focus so deletion never pops a different screen.- if (!focused || !removed || returned.current === removal) return;- returned.current = removal;+ if (!focused || !removed || returned.current) return;+ returned.current = true;Keyboard.dismiss();goBackGuarded(router);- }, [focused, removal, removed, router]);+ }, [focused, removed, router]);return removed ? null : children;}