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): 慢发送提示并入思考中活动行

Dash059e5113483f
diff --git a/apps/mobile/app/sessions/[sessionId].tsx b/apps/mobile/app/sessions/[sessionId].tsx
index 13a3b38a43..fa29f34a6b 100644
--- a/apps/mobile/app/sessions/[sessionId].tsx
+++ b/apps/mobile/app/sessions/[sessionId].tsx
@@ -59,7 +59,6 @@ import {
Search,
Settings,
Square,
- Sparkles,
Target,
UsersRound,
Zap,
@@ -274,7 +273,8 @@ import { RecentPhotosStrip } from '@/session/ContextSheetMediaViews';
import { ContextSheetGoalView, goalStatusLabel } from '@/session/ContextSheetGoalView';
import { parseGoalLimitsRouteParam } from '@/session/goalLimitsRouteParam';
import { ComposerAttachmentCollapsedBadge, ComposerAttachmentTray } from '@/session/ComposerAttachmentTray';
-import { SlowSendNotice } from '@/session/SlowSendNotice';
+import { useSlowSendVisible, type SlowSendPhase } from '@/session/SlowSendNotice';
+import { ComposerActivityPill, composerActivityPillOverlayColor, makeComposerActivityPillStyles } from '@/session/ComposerActivityPill';
import { PlanModeChip } from '@/session/PlanModeChip';
import { ImageLightbox } from '@/session/ImageLightbox';
import { pickWriteFields, retryPatchWhileLatest, writeGuardFields } from '@/session/swipeRowRegistry';
@@ -4426,7 +4426,12 @@ export default function SessionScreen() {
outboxConnectionState,
handoffSettledClientIds,
);
- const composerActivitySignal = isSessionStreaming || messageHandoffActive;
+ // 新建任务的创建管线也走这一行:慢的时候同一行显示阶段,完成后原地接上「思考中」。
+ const creationRunning = creationTask?.status === 'running';
+ const creationStartedAtRef = useRef<number | null>(null);
+ creationStartedAtRef.current = creationRunning ? creationTask.startedAt : null;
+ const creationSlowPhase = useSlowSendVisible(creationStartedAtRef.current) ? creationTask?.phase ?? null : null;
+ const composerActivitySignal = isSessionStreaming || messageHandoffActive || creationRunning;
// 活动条信号去抖:composerActivitySignal 由多个来源(sending / 消息交接 / canStopQueue /
// remoteSessionRunning / currentTurnStreaming)拼成,它们交接时会漏出一两帧空隙
// ——实测日志里 streaming 1→0→1,活动条跟着闪一下、计时还被重置回 0s。
@@ -4447,7 +4452,8 @@ export default function SessionScreen() {
const showComposerActivity = composerActivitySignal || streamingSticky === sessionId;
useEffect(() => {
// 计时起点跟着去抖后的信号走:否则空隙一过 startedAt 被重置,活动条从 0s 重新数。
- setComposerActivityStartedAt(showComposerActivity ? Date.now() : null);
+ // 创建管线从新建页点发送时就开始计时,进任务页不归零。
+ setComposerActivityStartedAt(showComposerActivity ? creationStartedAtRef.current ?? Date.now() : null);
}, [showComposerActivity, sessionId]);
const composerActivityStartedAtMs = remoteSessionRunStatus.startedAt ?? composerActivityStartedAt;
const composerActivityTokenUsage = remoteSessionRunStatus.tokenUsage;
@@ -10227,9 +10233,10 @@ export default function SessionScreen() {
{/* 消息区还在「正在同步」占位(新建会话第一帧 / 冷开首屏)时不谈运行状态:
「正在同步 + 思考中 + 0s · 0 tokens」三件事同时铺开,反倒像出错,而且
紧接着消息落屏时这条又要重排一次。等有内容了再显示活动条。
+ 例外:新建任务慢发送时这一行要说明卡在哪一步,不能被同步占位藏掉。
判据必须带 messageCount:syncingWhileEmpty 只要 loading 就为真,而收口后
还会再来几轮 load(实测日志),只看它会让已有消息的会话反复熄灭活动条。 */}
- {!companionChat && (showComposerActivity || remoteSessionRunStatus.responseSpeed?.phase === 'complete') && !(syncingWhileEmpty && !hasRenderedMessages) ? (
+ {!companionChat && (showComposerActivity || remoteSessionRunStatus.responseSpeed?.phase === 'complete') && (creationSlowPhase !== null || !(syncingWhileEmpty && !hasRenderedMessages)) ? (
<View
style={[
styles.composerActivityFrame,
@@ -10252,6 +10259,7 @@ export default function SessionScreen() {
generationReliable={remoteSessionRunStatus.generationReliable}
generationActive={remoteSessionRunStatus.generationActive}
visible={showComposerActivity}
+ slowSendPhase={creationSlowPhase}
/>
</View>
) : null}
@@ -11245,7 +11253,6 @@ function SessionComposerInput({
composerSendUnavailableReason, attachmentCount, pendingUploadCount,
onPasteImages, onDragActiveChange, onInputTopLayout, renderControls,
}: SessionComposerInputProps) {
- const creationTask = useNewSessionCreationTask(sessionId);
const { document: composerDocument, draft } = useSyncExternalStore(source.subscribe, source.getSnapshot);
const { t, i18n: i18nInstance } = useTranslation();
const { colors } = useTheme();
@@ -11608,10 +11615,6 @@ function SessionComposerInput({
) : null}
</View>
) : null}
- <SlowSendNotice
- startedAt={creationTask?.status === 'running' ? creationTask.startedAt : null}
- phase={creationTask?.phase ?? 'preparing'}
- />
{attachmentError ? (
<Text style={styles.attachmentErrorText} testID="session.attachmentStatus">
{attachmentError}
@@ -12149,6 +12152,7 @@ function ComposerActivityStatus({
generationReliable,
generationActive,
visible,
+ slowSendPhase = null,
}: {
availableRegion?: LayoutRect;
sessionKey: string;
@@ -12164,8 +12168,11 @@ function ComposerActivityStatus({
generationReliable: boolean;
generationActive: boolean;
visible: boolean;
+ /** Set once a new task's creation has waited past the slow-send delay. */
+ slowSendPhase?: SlowSendPhase | null;
}) {
const styles = useThemedStyles(makeStyles);
+ const pillStyles = useThemedStyles(makeComposerActivityPillStyles);
const { colors } = useTheme();
const { t } = useTranslation();
const [elapsed, setElapsed] = useState(0);
@@ -12225,12 +12232,9 @@ function ComposerActivityStatus({
: t('session.screen.tokenRate', { rate: rateValue })
: null;
const showUsageMeta = !showElapsedOnly && (Boolean(rateText) || tokenUsage > 0);
- // iOS pills share the header/composer edge glass; Android's blur is too weak
- // to carry text alone, so it keeps the translucent surface underneath.
- const pillOverlayColor = Platform.OS === 'ios' ? 'transparent' : colors.surfaceTranslucent;
const usageMeta = (
- <View style={[styles.composerActivityPill, styles.composerActivityMeta]}>
- <BlurBackdrop intensity={FLOATING_CHROME_BLUR_INTENSITY} overlayColor={pillOverlayColor} style={styles.composerActivityPillBackdrop} />
+ <View style={[pillStyles.composerActivityPill, styles.composerActivityMeta]}>
+ <BlurBackdrop intensity={FLOATING_CHROME_BLUR_INTENSITY} overlayColor={composerActivityPillOverlayColor(colors)} style={pillStyles.composerActivityPillBackdrop} />
<Text style={styles.composerActivityMetaText}>{elapsedText}</Text>
{showUsageMeta ? (
<>
@@ -12267,6 +12271,8 @@ function ComposerActivityStatus({
? 'session.screen.rateLimitRetrying'
: 'session.screen.networkReconnecting',
)
+ // 发送等待超过阈值时,同一行先说明卡在哪一步;创建完成后回到下面的「思考中」等状态。
+ : slowSendPhase ? t(`session.new.slowSend.${slowSendPhase}`)
: t(speedActivity === 'failed' ? 'session.screen.responseFailed'
: speedActivity === 'cancelled' ? 'session.screen.responseCancelled'
: speedActivity === 'retrying' ? 'session.screen.responseRetrying'
@@ -12278,19 +12284,16 @@ function ComposerActivityStatus({
return (
<View
pointerEvents="box-none"
- style={styles.composerActivityStatus}
+ style={pillStyles.composerActivityStatus}
testID="session.composerActivityStatus"
>
- {visible && <View pointerEvents="none" style={[styles.composerActivityPill, styles.composerActivityPrimary]}>
- <BlurBackdrop intensity={FLOATING_CHROME_BLUR_INTENSITY} overlayColor={pillOverlayColor} style={styles.composerActivityPillBackdrop} />
- <Sparkles color={colors.statusAccent} size={iconSize.sm} strokeWidth={iconStroke.regular} />
- <Text numberOfLines={1} style={styles.composerActivityStatusText}>{activityText}</Text>
+ {visible && <ComposerActivityPill label={activityText}>
{reconnectAttempt ? (
- <Text style={[styles.composerActivityStatusText, styles.composerActivityProgressText]}>
+ <Text style={[pillStyles.composerActivityStatusText, pillStyles.composerActivityProgressText]}>
{reconnectAttempt.attempt}/{reconnectAttempt.maxAttempts}
</Text>
) : null}
- </View>}
+ </ComposerActivityPill>}
<RunningTokenRatePopover
responseSpeed={responseSpeed}
key={sessionKey}
@@ -12731,40 +12734,6 @@ const makeStyles = (colors: ThemeColors) => StyleSheet.create({
alignSelf: 'stretch',
marginTop: spacing.lg,
},
- composerActivityStatus: {
- alignItems: 'center',
- flexDirection: 'row',
- minHeight: 44,
- justifyContent: 'space-between',
- paddingHorizontal: spacing.xs,
- },
- composerActivityPrimary: {
- alignItems: 'center',
- flexShrink: 1,
- flexDirection: 'row',
- gap: 6,
- marginRight: spacing.sm,
- minWidth: 0,
- },
- composerActivityPill: {
- borderRadius: radius.pill,
- paddingHorizontal: spacing.sm,
- paddingVertical: spacing.xs,
- },
- composerActivityPillBackdrop: {
- borderRadius: radius.pill,
- overflow: 'hidden',
- },
- composerActivityStatusText: {
- color: colors.statusAccent,
- flexShrink: 1,
- fontSize: typeScale.footnote,
- fontWeight: fontWeight.medium,
- lineHeight: lineHeight.caption,
- },
- composerActivityProgressText: {
- flexShrink: 0,
- },
composerActivityMeta: {
alignItems: 'center',
flexShrink: 0,
diff --git a/apps/mobile/src/__tests__/SlowSendNotice.test.tsx b/apps/mobile/src/__tests__/SlowSendNotice.test.tsx
index dbaad0c691..3eb4023c24 100644
--- a/apps/mobile/src/__tests__/SlowSendNotice.test.tsx
+++ b/apps/mobile/src/__tests__/SlowSendNotice.test.tsx
@@ -5,15 +5,20 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { SlowSendNotice } from '@/session/SlowSendNotice';
import { i18n } from '@/i18n';
-vi.mock('@/components/AppText', async () => {
+vi.mock('react-native', async () => {
const { createElement } = await import('react');
- return { Text: ({ children, accessibilityLiveRegion }: { children?: ReactNode; accessibilityLiveRegion?: string }) =>
- createElement('span', { 'aria-live': accessibilityLiveRegion }, children) };
+ return { View: ({ children, accessibilityLiveRegion }: { children?: ReactNode; accessibilityLiveRegion?: string }) =>
+ createElement('div', { 'aria-live': accessibilityLiveRegion }, children) };
});
-vi.mock('@/theme', async () => {
- const tokens = await import('@/theme/tokens');
- return { ...tokens, useTheme: () => ({ colors: tokens.lightColors }) };
+// The pill itself is the task page's "思考中" pill; here only its label matters.
+vi.mock('@/session/ComposerActivityPill', async () => {
+ const { createElement } = await import('react');
+ return {
+ ComposerActivityPill: ({ label }: { label: string }) => createElement('span', { 'data-pill': 'activity' }, label),
+ makeComposerActivityPillStyles: () => ({}),
+ };
});
+vi.mock('@/theme', () => ({ useThemedStyles: () => ({}) }));
let root: Root;
let host: HTMLDivElement;
@@ -49,7 +54,8 @@ describe('SlowSendNotice', () => {
act(() => root.render(<SlowSendNotice startedAt={0} phase="connecting" />));
await act(async () => { await vi.advanceTimersByTimeAsync(1_000); });
expect(host.textContent).toBe('正在连接电脑…');
- expect(host.querySelector('span')?.getAttribute('aria-live')).toBe('polite');
+ expect(host.querySelector('div')?.getAttribute('aria-live')).toBe('polite');
+ expect(host.querySelector('[data-pill="activity"]')?.textContent).toBe('正在连接电脑…');
act(() => root.render(<SlowSendNotice startedAt={0} phase="sending" />));
expect(host.textContent).toBe('正在发送消息…');
act(() => root.render(<SlowSendNotice startedAt={8_000} phase="uploading" />));
diff --git a/apps/mobile/src/__tests__/edgeBlurMask.test.ts b/apps/mobile/src/__tests__/edgeBlurMask.test.ts
index 6121388a1d..8cb71b598e 100644
--- a/apps/mobile/src/__tests__/edgeBlurMask.test.ts
+++ b/apps/mobile/src/__tests__/edgeBlurMask.test.ts
@@ -66,7 +66,11 @@ describe('composer edge backdrop placement', () => {
});
it('frosts the activity pills with the shared chrome glass', () => {
- expect(source).toContain("const pillOverlayColor = Platform.OS === 'ios' ? 'transparent' : colors.surfaceTranslucent;");
- expect(source.match(/<BlurBackdrop intensity=\{FLOATING_CHROME_BLUR_INTENSITY\} overlayColor=\{pillOverlayColor\}/g)).toHaveLength(2);
+ const pill = readTextLf('src/session/ComposerActivityPill.tsx');
+ expect(pill).toContain("return Platform.OS === 'ios' ? 'transparent' : colors.surfaceTranslucent;");
+ const glass = /<BlurBackdrop intensity=\{FLOATING_CHROME_BLUR_INTENSITY\} overlayColor=\{composerActivityPillOverlayColor\(colors\)\}/g;
+ // Status pill (shared with the slow-send notice) and the elapsed/rate pill.
+ expect(pill.match(glass)).toHaveLength(1);
+ expect(source.match(glass)).toHaveLength(1);
});
});
diff --git a/apps/mobile/src/__tests__/runningTokenRatePopover.test.tsx b/apps/mobile/src/__tests__/runningTokenRatePopover.test.tsx
index deec646a1d..8cb940e4ce 100644
--- a/apps/mobile/src/__tests__/runningTokenRatePopover.test.tsx
+++ b/apps/mobile/src/__tests__/runningTokenRatePopover.test.tsx
@@ -191,8 +191,10 @@ const bindings = {
Text: ({ children }: any) => createElement("span", {}, children),
BlurBackdrop: () => null,
FLOATING_CHROME_BLUR_INTENSITY: 55,
- Platform: { OS: "ios" },
- Sparkles: () => null,
+ makeComposerActivityPillStyles: () => ({}),
+ composerActivityPillOverlayColor: () => "transparent",
+ ComposerActivityPill: ({ label, children }: any) =>
+ createElement("span", { "data-testid": "session.composerActivityPill" }, label, children),
ArrowDown: () => null,
iconSize: {},
iconStroke: {},
@@ -685,3 +687,16 @@ it.each(['failed', 'cancelled', 'retrying'] as const)('shows %s consistently in
expect(card()!.textContent).not.toContain('session.screen.finalAverage');
expect(card()!.textContent).toContain('40');
});
+
+it('keeps a slow new-task send in the activity row, then continues as thinking', async () => {
+ const show = async (slowSendPhase: string | null) => act(async () => root.render(createElement(ActivityStatus, {
+ ...base, visible: true, tokenUsage: 0, sideTaskRunning: false, reconnectAttempt: null, slowSendPhase,
+ })));
+ const pill = () => host.querySelector('[data-testid="session.composerActivityPill"]')?.textContent;
+ await show('connecting');
+ expect(pill()).toBe('session.new.slowSend.connecting');
+ await show('sending');
+ expect(pill()).toBe('session.new.slowSend.sending');
+ await show(null);
+ expect(pill()).toBe('session.screen.thinking');
+});
diff --git a/apps/mobile/src/__tests__/sessionComposerDesktopFirst.test.ts b/apps/mobile/src/__tests__/sessionComposerDesktopFirst.test.ts
index 58f1886153..51005ceaa1 100644
--- a/apps/mobile/src/__tests__/sessionComposerDesktopFirst.test.ts
+++ b/apps/mobile/src/__tests__/sessionComposerDesktopFirst.test.ts
@@ -247,13 +247,21 @@ describe('mobile session composer desktop-first surface', () => {
expect(source).toContain('function formatComposerActivityElapsed');
expect(source).toContain('function formatComposerActivityTokenCount');
expect(source).toContain('function formatComposerActivityRateValue');
- expect(source).toContain('composerActivityPrimary');
+ // The primary pill is shared with the new-task slow-send notice so both read as one status line.
+ const activityPillSource = readTextLf(resolve(process.cwd(), 'src/session/ComposerActivityPill.tsx'), 'utf8');
+ expect(source).toContain('<ComposerActivityPill label={activityText}>');
+ // A slow new-task send speaks through the same row, then continues in place as "思考中".
+ expect(source).toContain('const composerActivitySignal = isSessionStreaming || messageHandoffActive || creationRunning;');
+ expect(source).toContain('slowSendPhase={creationSlowPhase}');
+ expect(source).not.toContain('<SlowSendNotice');
+ expect(activityPillSource).toContain('composerActivityPrimary');
+ expect(activityPillSource).toContain('color: colors.statusAccent');
expect(source).toContain('composerActivityMeta');
expect(source).toContain('composerActivityMetaText');
expect(source).toContain('composerActivityFrame');
expect(source).toContain('marginTop: spacing.lg');
// The formerly passive rate is now a touch target, with a full 44pt status row.
- expect(source).toMatch(/composerActivityStatus: \{[^}]*minHeight: 44/s);
+ expect(activityPillSource).toMatch(/composerActivityStatus: \{[^}]*minHeight: 44/s);
expect(source).toContain('composerActivityStatusText');
expect(source).toContain('composerActivityProgressText');
expect(composerStatusCallIndex).toBeGreaterThan(-1);
diff --git a/apps/mobile/src/session/ComposerActivityPill.tsx b/apps/mobile/src/session/ComposerActivityPill.tsx
new file mode 100644
index 0000000000..d0ee9bdb6c
--- /dev/null
+++ b/apps/mobile/src/session/ComposerActivityPill.tsx
@@ -0,0 +1,64 @@
+import type { ReactNode } from 'react';
+import { Platform, StyleSheet, View } from 'react-native';
+import { Sparkles } from 'lucide-react-native';
+import { Text } from '@/components/AppText';
+import { BlurBackdrop, FLOATING_CHROME_BLUR_INTENSITY } from '@/session/BlurBackdrop';
+import { useTheme, useThemedStyles, type ThemeColors } from '@/theme';
+import { fontWeight, iconSize, iconStroke, lineHeight, radius, spacing, typeScale } from '@/theme/tokens';
+
+/** The composer's "思考中" pill; send progress reuses it so both read as one status line. */
+export function ComposerActivityPill({ label, children }: { label: string; children?: ReactNode }) {
+ const styles = useThemedStyles(makeComposerActivityPillStyles);
+ const { colors } = useTheme();
+ return (
+ <View pointerEvents="none" style={[styles.composerActivityPill, styles.composerActivityPrimary]}>
+ <BlurBackdrop intensity={FLOATING_CHROME_BLUR_INTENSITY} overlayColor={composerActivityPillOverlayColor(colors)} style={styles.composerActivityPillBackdrop} />
+ <Sparkles color={colors.statusAccent} size={iconSize.sm} strokeWidth={iconStroke.regular} />
+ <Text numberOfLines={1} style={styles.composerActivityStatusText}>{label}</Text>
+ {children}
+ </View>
+ );
+}
+
+// iOS pills share the header/composer edge glass; Android's blur is too weak
+// to carry text alone, so it keeps the translucent surface underneath.
+export function composerActivityPillOverlayColor(colors: ThemeColors): string {
+ return Platform.OS === 'ios' ? 'transparent' : colors.surfaceTranslucent;
+}
+
+export const makeComposerActivityPillStyles = (colors: ThemeColors) => StyleSheet.create({
+ composerActivityStatus: {
+ alignItems: 'center',
+ flexDirection: 'row',
+ minHeight: 44,
+ justifyContent: 'space-between',
+ paddingHorizontal: spacing.xs,
+ },
+ composerActivityPrimary: {
+ alignItems: 'center',
+ flexShrink: 1,
+ flexDirection: 'row',
+ gap: 6,
+ marginRight: spacing.sm,
+ minWidth: 0,
+ },
+ composerActivityPill: {
+ borderRadius: radius.pill,
+ paddingHorizontal: spacing.sm,
+ paddingVertical: spacing.xs,
+ },
+ composerActivityPillBackdrop: {
+ borderRadius: radius.pill,
+ overflow: 'hidden',
+ },
+ composerActivityStatusText: {
+ color: colors.statusAccent,
+ flexShrink: 1,
+ fontSize: typeScale.footnote,
+ fontWeight: fontWeight.medium,
+ lineHeight: lineHeight.caption,
+ },
+ composerActivityProgressText: {
+ flexShrink: 0,
+ },
+});
diff --git a/apps/mobile/src/session/SlowSendNotice.tsx b/apps/mobile/src/session/SlowSendNotice.tsx
index e1eefa3d03..c7c2247d35 100644
--- a/apps/mobile/src/session/SlowSendNotice.tsx
+++ b/apps/mobile/src/session/SlowSendNotice.tsx
@@ -1,15 +1,14 @@
import { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
-import { Text } from '@/components/AppText';
-import { lineHeight, typeScale, useTheme } from '@/theme';
+import { View } from 'react-native';
+import { ComposerActivityPill, makeComposerActivityPillStyles } from '@/session/ComposerActivityPill';
+import { useThemedStyles } from '@/theme';
export type SlowSendPhase = 'preparing' | 'uploading' | 'connecting' | 'checkingModel' | 'creating' | 'sending';
export const SLOW_SEND_NOTICE_DELAY_MS = 8_000;
-/** Fast sends add no text or layout space; one elapsed clock survives phase changes. */
-export function SlowSendNotice({ startedAt, phase }: { startedAt: number | null; phase: SlowSendPhase }) {
- const { t } = useTranslation();
- const { colors } = useTheme();
+/** True once a send has waited past the delay; one elapsed clock survives phase changes and page handoff. */
+export function useSlowSendVisible(startedAt: number | null): boolean {
const [visibleFor, setVisibleFor] = useState<number | null>(null);
useEffect(() => {
setVisibleFor(null);
@@ -17,14 +16,20 @@ export function SlowSendNotice({ startedAt, phase }: { startedAt: number | null;
const timer = setTimeout(() => setVisibleFor(startedAt), Math.max(0, startedAt + SLOW_SEND_NOTICE_DELAY_MS - Date.now()));
return () => clearTimeout(timer);
}, [startedAt]);
- if (startedAt === null || visibleFor !== startedAt) return null;
+ return startedAt !== null && visibleFor === startedAt;
+}
+
+/**
+ * New-task page only: before handoff there is no activity row yet, so a slow send shows the same
+ * pill the task page uses for "思考中", and the task page continues it in place. Fast sends add nothing.
+ */
+export function SlowSendNotice({ startedAt, phase }: { startedAt: number | null; phase: SlowSendPhase }) {
+ const { t } = useTranslation();
+ const styles = useThemedStyles(makeComposerActivityPillStyles);
+ if (!useSlowSendVisible(startedAt)) return null;
return (
- <Text
- accessibilityLiveRegion="polite"
- style={{ color: colors.textSecondary, fontSize: typeScale.caption, lineHeight: lineHeight.caption }}
- testID="session.slowSendNotice"
- >
- {t(`session.new.slowSend.${phase}`)}
- </Text>
+ <View accessibilityLiveRegion="polite" pointerEvents="none" style={styles.composerActivityStatus} testID="session.slowSendNotice">
+ <ComposerActivityPill label={t(`session.new.slowSend.${phase}`)} />
+ </View>
);
}