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。

Merge origin/main into lizi-remote-provider

Lizi87f1ff11510f
diff --cc apps/mobile/app/sessions/[sessionId].tsx
index 906c044b5e,7948e3e6f0..e18143fa4c
--- a/apps/mobile/app/sessions/[sessionId].tsx
+++ b/apps/mobile/app/sessions/[sessionId].tsx
@@@ -10207,9 -10240,10 +10252,10 @@@ export default function SessionScreen(
{/* 消息区还在「正在同步」占位(新建会话第一帧 / 冷开首屏)时不谈运行状态:
「正在同步 + 思考中 + 0s · 0 tokens」三件事同时铺开,反倒像出错,而且
紧接着消息落屏时这条又要重排一次。等有内容了再显示活动条。
+ 例外:新建任务慢发送时这一行要说明卡在哪一步,不能被同步占位藏掉。
判据必须带 messageCount:syncingWhileEmpty 只要 loading 就为真,而收口后
还会再来几轮 load(实测日志),只看它会让已有消息的会话反复熄灭活动条。 */}
- {!companionChat && (showComposerActivity || pendingRecoveryStatus || remoteSessionRunStatus.responseSpeed?.phase === 'complete') && !(syncingWhileEmpty && !hasRenderedMessages) ? (
- {!companionChat && (showComposerActivity || remoteSessionRunStatus.responseSpeed?.phase === 'complete') && (creationSlowPhase !== null || !(syncingWhileEmpty && !hasRenderedMessages)) ? (
++ {!companionChat && (showComposerActivity || pendingRecoveryStatus || remoteSessionRunStatus.responseSpeed?.phase === 'complete') && (creationSlowPhase !== null || !(syncingWhileEmpty && !hasRenderedMessages)) ? (
<View
style={[
styles.composerActivityFrame,
@@@ -12167,31 -12214,6 +12230,24 @@@ function ComposerActivityStatus(
: generationActive === false ? { ...legacyRateHistory, latestRate: null } : legacyRateHistory;
const completedSpeed = !visible && responseSpeed?.phase === 'complete';
const speedActivity = responseSpeed ? responseSpeedActivity(responseSpeed) : null;
+ if (pendingRecovery && !reconnectAttempt) {
+ // 自愈 / 换电脑进行中:只显示这一行状态,不带耗时与速率(这一轮还没有结局)。
+ return (
+ <View
+ pointerEvents="box-none"
- style={styles.composerActivityStatus}
++ style={pillStyles.composerActivityStatus}
+ testID="session.composerActivityStatus"
+ >
- <View pointerEvents="none" style={[styles.composerActivityPill, styles.composerActivityPrimary]}>
- <BlurBackdrop
- intensity={FLOATING_CHROME_BLUR_INTENSITY}
- overlayColor={Platform.OS === 'ios' ? 'transparent' : colors.surfaceTranslucent}
- style={styles.composerActivityPillBackdrop}
- />
- <Sparkles color={colors.statusAccent} size={iconSize.sm} strokeWidth={iconStroke.regular} />
- <Text numberOfLines={1} style={styles.composerActivityStatusText}>{pendingRecovery.label}</Text>
++ <ComposerActivityPill label={pendingRecovery.label}>
+ {pendingRecovery.attempt !== undefined && pendingRecovery.maxAttempts !== undefined ? (
- <Text style={[styles.composerActivityStatusText, styles.composerActivityProgressText]}>
++ <Text style={[pillStyles.composerActivityStatusText, pillStyles.composerActivityProgressText]}>
+ {pendingRecovery.attempt}/{pendingRecovery.maxAttempts}
+ </Text>
+ ) : null}
- </View>
++ </ComposerActivityPill>
+ </View>
+ );
+ }
if (!visible && !completedSpeed) return null;
const elapsedText = completedSpeed
diff --cc apps/mobile/src/__tests__/runningTokenRatePopover.test.tsx
index deec646a1d,fa5a8e893c..4acecd2a05
--- a/apps/mobile/src/__tests__/runningTokenRatePopover.test.tsx
+++ b/apps/mobile/src/__tests__/runningTokenRatePopover.test.tsx
@@@ -685,3 -687,20 +687,39 @@@ it.each(['failed', 'cancelled', 'retryi
expect(card()!.textContent).not.toContain('session.screen.finalAverage');
expect(card()!.textContent).toContain('40');
});
+
++it.each([
++ { label: 'switching computers' },
++ { label: 'reconnecting', attempt: 2, maxAttempts: 5 },
++])('keeps $label above a retained failure and slow-send status without token metadata', async (pendingRecovery) => {
++ const responseSpeed: ResponseSpeedSnapshot = {
++ phase: 'complete', outcome: 'failed', waitOrigin: 'turn', firstResponseMs: 1000,
++ waitingMs: 0, durationMs: 2000, outputTokens: 80, estimated: true,
++ recentRate: null, averageRate: 40, samples: [], sampledAt: Date.now(),
++ };
++ await act(async () => root.render(createElement(ActivityStatus, {
++ ...base, visible: false, tokenUsage: 500, sideTaskRunning: false, reconnectAttempt: null,
++ responseSpeed, slowSendPhase: 'sending', pendingRecovery,
++ })));
++ const progress = pendingRecovery.attempt ? `${pendingRecovery.attempt}/${pendingRecovery.maxAttempts}` : '';
++ expect(host.textContent).toBe(pendingRecovery.label + progress);
++ expect(host.querySelector('[data-testid="session.composerActivityPill"]')).not.toBeNull();
++ expect(host.querySelector('[data-testid="session.tokenRate.trigger"]')).toBeNull();
++});
++
+ 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 pillNode = () => host.querySelector('[data-testid="session.composerActivityPill"]');
+ const pill = () => pillNode()?.textContent;
+ await show('connecting');
+ expect(pill()).toBe('session.new.slowSend.connecting');
+ // Phases are announced (the old in-composer notice was a polite live region); thinking is not.
+ expect(pillNode()?.getAttribute('aria-live')).toBe('polite');
+ await show('sending');
+ expect(pill()).toBe('session.new.slowSend.sending');
+ await show(null);
+ expect(pill()).toBe('session.screen.thinking');
+ expect(pillNode()?.getAttribute('aria-live')).toBeNull();
+ });