Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(mobile): 修复目标模式菜单并显示聊天页状态 (#5557)

Dasha42d466dac1d
diff --git a/apps/mobile/app/sessions/[sessionId].tsx b/apps/mobile/app/sessions/[sessionId].tsx
index 9d5c4cec6c..afbb3e8b33 100644
--- a/apps/mobile/app/sessions/[sessionId].tsx
+++ b/apps/mobile/app/sessions/[sessionId].tsx
@@ -7977,10 +7977,11 @@ export default function SessionScreen() {
}
}, [contextSheetMediaLibraryEnabled]);
- // 目标模式:面板打开时拉一次快照(push 只送变更);动作后再拉一次收敛,避免依赖单一 push。
+ // 进入聊天、回前台或连接恢复时读取目标快照,菜单关闭时也能显示状态。
+ // push 继续负责增量;打开菜单与动作结束时再读取权威状态。
const goalStatus = useSessionGoalStatus(sessionId);
- useEffect(() => {
- if (!contextSheetOpen || !deviceId) return;
+ useFocusEffect(useCallback(() => {
+ if (!appStateActive || !remoteHistoryAvailable || !deviceId || !sessionId || isSharedTaskPeer(deviceId)) return;
let cancelled = false;
void (async () => {
try {
@@ -7993,7 +7994,7 @@ export default function SessionScreen() {
return () => {
cancelled = true;
};
- }, [contextSheetOpen, deviceId, maker, sessionId]);
+ }, [appStateActive, connectionEpoch, contextSheetOpen, deviceId, maker, remoteHistoryAvailable, sessionId]));
// 暂停 / 继续 / 结束目标:先乐观切本地状态镜像(面板当帧反馈,不等往返),
// RPC 后台;成功回读权威收敛(既有语义)。失败时报错并还原:优先回读权威状态,
// 回读也失败(离线 / 超时,与 action 同因高概率连败)则还原到乐观前的快照——
@@ -9495,32 +9496,20 @@ export default function SessionScreen() {
<ContextSheetRow
icon={<Target color={colors.textPrimary} size={iconSize.lg} strokeWidth={iconStroke.regular} />}
label={t('session.common.goalMode')}
+ detail={goalStatus ? goalStatusLabel(goalStatus.status, goalStatus.lastReason) : undefined}
onPress={() => setContextSheetView('goal')}
testID="session.contextSheetGoalRow"
- trailing={goalStatus ? (
- <>
- <Text style={{ color: colors.textTertiary, fontSize: typeScale.footnote, lineHeight: lineHeight.caption }}>
- {goalStatusLabel(goalStatus.status, goalStatus.lastReason)}
- </Text>
- <ChevronRight color={colors.textTertiary} size={iconSize.md} strokeWidth={iconStroke.regular} />
- </>
- ) : 'chevron'}
+ trailing="chevron"
/>
{collab.eligible ? (
<ContextSheetRow
accessibilityHint={collab.entryHint ?? undefined}
icon={<UsersRound color={colors.textPrimary} size={iconSize.lg} strokeWidth={iconStroke.regular} />}
label={t('session.collab.modeLabel')}
+ detail={collab.isLead ? t('session.collab.enabled') : undefined}
onPress={collab.openFromMain}
testID="session.contextSheetCollabRow"
- trailing={collab.isLead ? (
- <>
- <Text style={{ color: colors.textTertiary, fontSize: typeScale.footnote, lineHeight: lineHeight.caption }}>
- {t('session.collab.enabled')}
- </Text>
- <ChevronRight color={colors.textTertiary} size={iconSize.md} strokeWidth={iconStroke.regular} />
- </>
- ) : 'chevron'}
+ trailing="chevron"
/>
) : null}
</ContextSheetGroup> : null}
@@ -9994,6 +9983,29 @@ export default function SessionScreen() {
selectSlashCommand={selectSlashCommand}
selectAtResource={selectAtResource}
/>
+ {!shareSelectionActive && !isSharedTaskPeer(deviceId) && !sessionManagedByHost && goalStatus ? (
+ <Pressable
+ accessibilityLabel={`${t('session.common.goalMode')} · ${goalStatusLabel(goalStatus.status, goalStatus.lastReason)}`}
+ accessibilityRole="button"
+ onPress={() => {
+ setModelSheetOpen(false);
+ setContextSheetView('goal');
+ setContextSheetOpen(true);
+ }}
+ style={({ pressed }) => [
+ styles.queueEditBar,
+ { minHeight: 44, marginHorizontal: composerTouchLayout.composerPaddingHorizontal },
+ pressed && styles.collabBarPressed,
+ ]}
+ testID="session.goalStatusBar"
+ >
+ <Target color={goalStatus.status === 'active' ? colors.statusAccent : colors.textSecondary} size={iconSize.sm} strokeWidth={iconStroke.regular} />
+ <Text numberOfLines={2} style={styles.queueEditBarText}>
+ {t('session.common.goalMode')} · {goalStatusLabel(goalStatus.status, goalStatus.lastReason)}
+ </Text>
+ <ChevronRight color={colors.textTertiary} size={iconSize.sm} strokeWidth={iconStroke.regular} />
+ </Pressable>
+ ) : null}
{/*
手机端终结不了的请求(plugin_setup 等)只贴在输入框上方:能看清电脑端
在等什么、能取消,但不吃掉 composer —— 否则用户既处理不了这张卡又发不