Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(mobile): 伙伴段在 Android 根节点列表中可用,新建表单不随入口位置卸载
Chris198a73f5bbe1
diff --git a/apps/mobile/src/session/HomeSurface.tsx b/apps/mobile/src/session/HomeSurface.tsxindex 4b046b40ae..6a576bf839 100644--- a/apps/mobile/src/session/HomeSurface.tsx+++ b/apps/mobile/src/session/HomeSurface.tsx@@ -71,7 +71,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';import { useTranslation } from 'react-i18next';import type { TFunction } from 'i18next';import { useAuth } from '@/auth/AuthContext';-import { HomeTeammatesSection } from './HomeTeammatesSection';+import { HomeTeammatesSection, useHomeTeammatesSectionContext } from './HomeTeammatesSection';import { createDisclosureListCell, DisclosureGroupView, DisclosureItem, ListDisclosureScope, useDisclosurePrepare, useListDisclosureTransition } from './listDisclosureTransition';import { useGuardedPush } from '@/utils/useGuardedPush';import { useHomeMenuFadeTiming } from '@/session/homeMenuFadeTiming';@@ -476,6 +476,8 @@ function HomeScreenContent({ active = true, onModeChange, width, newSessionInSysconst HOME_LIST_SUBSCRIPTION_OWNER = `device-list:${useId()}`;const embedded = width !== undefined;const residentList = useResidentHomeList(embedded);+ // Captured here: Android draws the list above the route, outside its roster and navigation context.+ const teammatesSectionContext = useHomeTeammatesSectionContext();const activeHomeSession = useContext(ActiveHomeSession);const rememberTask = rememberRecentTask;const viewSession = getHomeViewSession();@@ -2961,7 +2963,7 @@ function HomeScreenContent({ active = true, onModeChange, width, newSessionInSys}}sections={sections}ListHeaderComponent={<>- {embedded ? null : <HomeTeammatesSection active={active}+ {embedded ? null : <HomeTeammatesSection context={teammatesSectionContext} active={active}visible={!searchQuery.trim() && indexedSearch.activeFilterCount === 0 && statusFilter !== 'archived' && !showRemoteGuide}// Shared group and project blocks draw their own full-width top line.showFooter={sharedRows.length === 0 && !isBlockHomeRow(sections[0]?.data[0])}diff --git a/apps/mobile/src/session/HomeTeammatesSection.tsx b/apps/mobile/src/session/HomeTeammatesSection.tsxindex 84dd6246a8..3cd68e387f 100644--- a/apps/mobile/src/session/HomeTeammatesSection.tsx+++ b/apps/mobile/src/session/HomeTeammatesSection.tsx@@ -4,10 +4,12 @@* 收起 = 段头 + 56pt 头像条(名字 12/18,可横滑,最后一格新建)。收起状态按账号记住。* 伙伴与群聊按最近活动混排;不跟随顶栏的电脑范围筛选(与桌面一致)。点开伙伴不切换首页模式,* 返回仍回到任务。只在首页(有共享伙伴名册)出现;没有伙伴也没有能新建的电脑时整段不显示。+ * Android 把首页列表挂到根节点渲染(ResidentHomeList),所以名册与路由的导航上下文要在路由里取,+ * 再由本段重新提供。*/-import { useCallback, useEffect, useMemo, useState, useSyncExternalStore, type ReactElement } from 'react';+import { useCallback, useContext, useEffect, useMemo, useState, useSyncExternalStore, type ReactElement } from 'react';import { Keyboard, Pressable, ScrollView, StyleSheet, View } from 'react-native';-import { useIsFocused } from 'expo-router';+import { NavigationContext, NavigationRouteContext, useIsFocused } from 'expo-router/react-navigation';import { useTranslation } from 'react-i18next';import { ChevronDown, ChevronRight, ChevronUp, Plus, UsersRound } from 'lucide-react-native';import { resolveRemoteText } from '@cindy/device-link';@@ -32,7 +34,7 @@ import { CompanionPresenceRing } from './CompanionPresenceRing';import { homeListStyles } from './HomeListVisuals';import { useHomeRoster } from './HomeUnreadContext';import { DisclosureItem } from './listDisclosureTransition';-import { TeammateCreateButton } from './TeammateCreateButton';+import { useTeammateCreateController } from './TeammateCreateButton';import { useTeammateEntries, useTeammateRowRenderer, type TeammateListEntry } from './TeammateList';import { cloudCompanionRoute } from './teammateNavigation';import { useTeammateNavigation } from './useTeammateNavigation';@@ -46,7 +48,16 @@ const STRIP_CELL_WIDTH = STRIP_AVATAR_SIZE + spacing.sm;const SHOW_ALL_ROW_HEIGHT = 48;const ADD_ROW_HEIGHT = 64;-export function HomeTeammatesSection({ active, visible, showFooter, runDisclosure, prepareDisclosure }: {+/** Read at the route: the list may be drawn above the route (Android's resident home list). */+export function useHomeTeammatesSectionContext() {+ const navigation = useContext(NavigationContext);+ const route = useContext(NavigationRouteContext);+ const shared = useHomeRoster();+ return useMemo(() => ({ navigation, route, shared }), [navigation, route, shared]);+}++export function HomeTeammatesSection({ context, active, visible, showFooter, runDisclosure, prepareDisclosure }: {+ context: ReturnType<typeof useHomeTeammatesSectionContext>;/** The tasks pane is the visible home pane. */active: boolean;/** Hidden while searching or browsing archived tasks; the hooks stay mounted. */@@ -56,10 +67,12 @@ export function HomeTeammatesSection({ active, visible, showFooter, runDisclosurrunDisclosure(apply: () => void): void;prepareDisclosure(): void;}) {- const shared = useHomeRoster();+ const { navigation, route, shared } = context;if (!shared) return null;- return <SectionContent shared={shared} active={active} visible={visible} showFooter={showFooter}- runDisclosure={runDisclosure} prepareDisclosure={prepareDisclosure} />;+ return <NavigationContext.Provider value={navigation}><NavigationRouteContext.Provider value={route}>+ <SectionContent shared={shared} active={active} visible={visible} showFooter={showFooter}+ runDisclosure={runDisclosure} prepareDisclosure={prepareDisclosure} />+ </NavigationRouteContext.Provider></NavigationContext.Provider>;}function SectionContent({ shared, active, visible, showFooter, runDisclosure, prepareDisclosure }: {@@ -111,18 +124,21 @@ function SectionContent({ shared, active, visible, showFooter, runDisclosure, prconst createTargets = useStableValue(roster.createTargets, sameHosts);const groupCreateTargets = useStableValue(roster.groupTargets.filter(groups.isOnline), sameHosts);const canCreate = createTargets.length > 0 || groupCreateTargets.length > 0;+ // One controller for every trigger placement: the first teammate arriving while its form closes+ // swaps the empty row for the rows, and must not take the form or its receipt with it.+ const creator = useTeammateCreateController({ targets: createTargets, groupTargets: groupCreateTargets,+ preferredDeviceId: navigation.lastTeammate?.deviceId,+ onCreated: (host, ref) => { void navigation.openCreatedTeammate(host, ref, { keepMode: true }); },+ onGroupCreated: (host, groupId) => push(botGroupRoute(host, groupId)) });// A first read with nothing cached stays out of the way instead of flashing an empty section.- if (!visible || (!entries.length && (!canCreate || roster.loading))) return null;+ const shown = visible && !(!entries.length && (!canCreate || roster.loading));const title = t('devices.companions.title');const create = (trigger: (press: () => void, label: string) => ReactElement) => canCreate- ? <TeammateCreateButton targets={createTargets} groupTargets={groupCreateTargets} preferredDeviceId={navigation.lastTeammate?.deviceId}- onCreated={(host, ref) => { void navigation.openCreatedTeammate(host, ref, { keepMode: true }); }}- onGroupCreated={(host, groupId) => push(botGroupRoute(host, groupId))} trigger={trigger} />- : null;+ ? creator.renderTrigger(trigger(creator.press, creator.label)) : null;const preview = entries.slice(0, HOME_TEAMMATE_PREVIEW_LIMIT);const extra = entries.slice(HOME_TEAMMATE_PREVIEW_LIMIT);const hasMore = extra.length > 0;- return <DisclosureItem clip testID="home.teammates">+ const body = shown ? <DisclosureItem clip testID="home.teammates"><View style={styles.header}><Pressable accessibilityRole="button" accessibilityState={{ expanded: !collapsed }}accessibilityLabel={t(collapsed ? 'devices.list.a11y.expand' : 'devices.list.a11y.collapse', { title })}@@ -175,7 +191,8 @@ function SectionContent({ shared, active, visible, showFooter, runDisclosure, pr</Pressable> : null}</DisclosureItem>}{showFooter ? <View style={styles.footer} /> : null}- </DisclosureItem>;+ </DisclosureItem> : null;+ return <>{body}{creator.sheets}</>;}function StripCell({ entry, online, connected, quiet, onPress }: {diff --git a/apps/mobile/src/session/TeammateCreateButton.tsx b/apps/mobile/src/session/TeammateCreateButton.tsxindex 26db789727..4f65b1da19 100644--- a/apps/mobile/src/session/TeammateCreateButton.tsx+++ b/apps/mobile/src/session/TeammateCreateButton.tsx@@ -21,14 +21,8 @@ import { TEAMMATE_COLLECTION_ID } from './useTeammateRoster';type CreateKind = 'bot' | 'group';type Choice = { kind: CreateKind; host: RemoteResourceHostTarget };-/**- * 伙伴页顶栏的「+」。支持群聊时是一个菜单:新建伙伴 / 新建群聊(多台电脑时再选电脑);- * 旧版电脑不支持群聊时保持原来的直接新建伙伴。表单关闭后才回报创建结果,避免两个 Modal 叠加。- */-export function TeammateCreateButton({ targets, groupTargets = [], preferredDeviceId, onCreated, onGroupCreated, appearance = 'glass', trigger }: {+type CreateOptions = {targets: readonly RemoteResourceHostTarget[];- /** Replaces the glass button (the task home's teammate section); menus and sheets stay the same. */- trigger?(press: () => void, label: string): ReactElement;/** `cta`: the empty list's primary button; it only creates a teammate. */appearance?: 'glass' | 'cta' | 'toolbar';/** Online computers that support group chats; empty keeps the single-purpose button. */@@ -36,16 +30,40 @@ export function TeammateCreateButton({ targets, groupTargets = [], preferredDevipreferredDeviceId?: string;onCreated(host: RemoteResourceHostTarget, ref: RemoteResourceRef): void;onGroupCreated?(host: RemoteResourceHostTarget, groupId: string): void;-}) {+};++/**+ * 伙伴页顶栏的「+」。支持群聊时是一个菜单:新建伙伴 / 新建群聊(多台电脑时再选电脑);+ * 旧版电脑不支持群聊时保持原来的直接新建伙伴。表单关闭后才回报创建结果,避免两个 Modal 叠加。+ */+export function TeammateCreateButton(props: CreateOptions) {const { accountGeneration } = useAuth();// Account changes discard both native menu selections and dismissal receipts.- return <CreateButton key={accountGeneration} {...{ targets, groupTargets, preferredDeviceId, onCreated, onGroupCreated, appearance, trigger }} account={accountGeneration} />;+ return <CreateButton key={accountGeneration} {...props} />;}-function CreateButton({ targets, groupTargets = [], preferredDeviceId, onCreated, onGroupCreated, appearance, trigger: customTrigger, account }: Parameters<typeof TeammateCreateButton>[0] & { account: number }) {- const { t } = useTranslation();+function CreateButton(props: CreateOptions) {const { colors } = useTheme();+ const create = useTeammateCreateController(props);+ return <>+ {create.renderTrigger(props.appearance === 'cta'+ ? <MainWindowActionButton action={{ label: create.label, tone: 'primary', onPress: create.press, testID: 'teammates.emptyCreate' }} />+ : <HomeHeaderGlassButton accessibilityLabel={create.label} testID="teammates.create" onPress={create.press}>+ <Plus color={colors.textPrimary} size={iconSize.action} strokeWidth={iconStroke.regular} />+ </HomeHeaderGlassButton>)}+ {create.sheets}+ </>;+}++/**+ * The create menu and forms, separate from where the trigger is drawn: the task home's teammate+ * section moves its trigger between states, and a moving trigger must not unmount an open form or+ * drop its creation receipt. Callers remount it on account changes (the route is keyed by account).+ */+export function useTeammateCreateController({ targets, groupTargets = [], preferredDeviceId, onCreated, onGroupCreated, appearance = 'glass' }: CreateOptions) {+ const { t } = useTranslation();const { accountGeneration } = useAuth();+ const [account] = useState(accountGeneration);const currentAccount = useRef(accountGeneration); currentAccount.current = accountGeneration;const mounted = useRef(true);useEffect(() => { mounted.current = true; return () => { mounted.current = false; }; }, []);@@ -90,11 +108,6 @@ function CreateButton({ targets, groupTargets = [], preferredDeviceId, onCreatedelse if (!needsMenu) start('bot', targets[0]!.deviceId);else if (cta || !usesNativePullDownMenu()) setChoosing(true);};- const button = customTrigger && !cta ? customTrigger(press, label) : cta- ? <MainWindowActionButton action={{ label: botLabel, tone: 'primary', onPress: press, testID: 'teammates.emptyCreate' }} />- : <HomeHeaderGlassButton accessibilityLabel={label} testID="teammates.create" onPress={press}>- <Plus color={colors.textPrimary} size={iconSize.action} strokeWidth={iconStroke.regular} />- </HomeHeaderGlassButton>;const fallbackChoices: Choice[] = [...ordered.map((host) => ({ kind: 'bot' as const, host })),...(withGroups ? orderedGroups.map((host) => ({ kind: 'group' as const, host })) : []),@@ -106,14 +119,14 @@ function CreateButton({ targets, groupTargets = [], preferredDeviceId, onCreated};const groupOpen = open?.kind === 'group' ? open : null;const menu = needsMenu && menuActions.length > 0;- let trigger = button;- if (appearance === 'toolbar') trigger = <Stack.Toolbar placement="right">+ /** Wraps a visible button in the native menu when one is needed; the toolbar draws its own. */+ const renderTrigger = (button: ReactElement) => appearance === 'toolbar' ? <Stack.Toolbar placement="right">{menu ? <Stack.Toolbar.Menu icon="plus" accessibilityLabel={label}>{nativeToolbarMenuItems(menuActions, onMenu)}</Stack.Toolbar.Menu>: <Stack.Toolbar.Button icon="plus" accessibilityLabel={label} onPress={press} />}- </Stack.Toolbar>;- else if (!cta && menu) trigger = <NativePullDownMenu actions={menuActions} onAction={onMenu} testID="teammates.createMenu">{button}</NativePullDownMenu>;- return <>- {trigger}+ </Stack.Toolbar>+ : !cta && menu ? <NativePullDownMenu actions={menuActions} onAction={onMenu} testID="teammates.createMenu">{button}</NativePullDownMenu>+ : button;+ const sheets = <><CompanionSheet visible={choosing} title={label} testID="teammates.createChooser" onClose={() => { pendingChoice.current = null; setChoosing(false); }}onClosed={() => { const choice = pendingChoice.current; pendingChoice.current = null; if (choice) start(choice.kind, choice.host.deviceId); }}>{/* Same choice as the header's native menu: one plain row per choice, not full-width buttons. */}@@ -137,4 +150,5 @@ function CreateButton({ targets, groupTargets = [], preferredDeviceId, onCreatedif (groupId && groupOpen && mounted.current && currentAccount.current === account) onGroupCreated?.(groupOpen.host, groupId);}} /> : null}</>;+ return { press, label, renderTrigger, sheets };}