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): 任务标签色球紧跟标题显示,与桌面侧栏一致 (#5362)

Dash3e6754e45d7c
diff --git a/apps/mobile/app/sessions/[sessionId].tsx b/apps/mobile/app/sessions/[sessionId].tsx
index 660ae50aeb..3a45cd4100 100644
--- a/apps/mobile/app/sessions/[sessionId].tsx
+++ b/apps/mobile/app/sessions/[sessionId].tsx
@@ -10210,6 +10210,7 @@ function SessionHeaderBar({
// Reserve the toolbar gaps in the width budget, outside the title.
minWidth: 0, flexShrink: 1, overflow: 'hidden', justifyContent: 'center' }}>
<SessionHeaderNativeTitle title={title} pinned={!messageOnly && !!currentSession?.pinnedAt}
+ tags={isDeviceAccessRevoked ? undefined : currentSession?.tags} onTagsPress={onOpenSettings}
syncing={syncing} syncingImmediately={syncingImmediately} notice={notice} />
</View>
),
diff --git a/apps/mobile/src/__tests__/homeDesktopFirst.test.ts b/apps/mobile/src/__tests__/homeDesktopFirst.test.ts
index 0a12bf3482..a309b956ed 100644
--- a/apps/mobile/src/__tests__/homeDesktopFirst.test.ts
+++ b/apps/mobile/src/__tests__/homeDesktopFirst.test.ts
@@ -568,6 +568,17 @@ describe('mobile home desktop-first surface', () => {
expect(projectRowSource).not.toContain('project.subtitle');
expect(sessionRowSource).toContain('titleTestIDPrefix = \'home.sessionRowTitle\'');
expect(sessionRowSource).toContain('`home.sessionRowTitle.${item.session.id}`');
+ // 标签色球紧跟标题(与桌面侧栏一致):标题与色球同在一组,标题只取文字宽度,
+ // 不能再用 flex: 1 把色球挤到行尾贴着时间。
+ const titleCluster = sessionRowSource.slice(
+ sessionRowSource.indexOf('<View style={styles.sessionTitleCluster}>'),
+ sessionRowSource.indexOf('{sourceLabel ? ('),
+ );
+ expect(titleCluster).toMatch(/\{item\.title\}\s*<\/Text>\s*<TaskTagDots tags=\{item\.session\.tags\}/);
+ const listStyles = readSource('src/session/HomeListVisuals.tsx');
+ const titleStyle = listStyles.slice(listStyles.indexOf(' sessionTitle: {'), listStyles.indexOf('},', listStyles.indexOf(' sessionTitle: {')));
+ expect(titleStyle).toContain('flexShrink: 1');
+ expect(titleStyle).not.toContain('flex: 1');
expect(sessionRowSource).toContain('ellipsizeMode="tail"');
expect(sessionRowSource).toContain('numberOfLines={1}');
expect(sessionRowSource).toContain('buildRemoteSessionCardPreview(');
diff --git a/apps/mobile/src/__tests__/sessionHeaderDesktopFirst.test.ts b/apps/mobile/src/__tests__/sessionHeaderDesktopFirst.test.ts
index 42269b87a0..e5d3e655cd 100644
--- a/apps/mobile/src/__tests__/sessionHeaderDesktopFirst.test.ts
+++ b/apps/mobile/src/__tests__/sessionHeaderDesktopFirst.test.ts
@@ -23,6 +23,21 @@ describe('mobile session header desktop-first surface', () => {
expect(native).toContain('flexShrink: 1');
});
+ it('shows task tags right after the title in every header branch', () => {
+ const source = readTextLf(resolve(process.cwd(), 'app/sessions/[sessionId].tsx'), 'utf8');
+ const titles = source.split('<SessionHeaderNativeTitle').slice(1)
+ .map((branch) => branch.slice(0, branch.indexOf('/>')));
+ // 竖屏原生标题栏与横屏/折叠屏系统标题栏都要带标签,不能只有一条分支显示。
+ expect(titles).toHaveLength(2);
+ for (const title of titles) {
+ expect(title).toContain('tags={isDeviceAccessRevoked ? undefined : currentSession?.tags}');
+ expect(title).toContain('onTagsPress={onOpenSettings}');
+ }
+ const native = readTextLf(resolve(process.cwd(), 'src/session/SessionHeaderNativeControls.ios.tsx'), 'utf8');
+ const titleRow = native.slice(native.indexOf('{label}'), native.indexOf('<QuietSyncIndicator'));
+ expect(titleRow).toContain('<TaskTagDots');
+ });
+
it('releases the new-session handoff heavy topic when the session screen unmounts', () => {
const source = readTextLf(resolve(process.cwd(), 'app/sessions/[sessionId].tsx'), 'utf8');
diff --git a/apps/mobile/src/session/HomeListVisuals.tsx b/apps/mobile/src/session/HomeListVisuals.tsx
index abd04c2e5d..2a66ba0cd3 100644
--- a/apps/mobile/src/session/HomeListVisuals.tsx
+++ b/apps/mobile/src/session/HomeListVisuals.tsx
@@ -184,9 +184,18 @@ export const homeListStyles = (colors: ThemeColors) => StyleSheet.create({
right: -3,
width: 12,
},
+ // 标题与标签色球一组占满行内剩余宽度:标题只取自身文字宽度、过长截断,
+ // 色球紧跟标题(与桌面侧栏一致),来源与时间仍靠右。
+ sessionTitleCluster: {
+ alignItems: 'center',
+ flex: 1,
+ flexDirection: 'row',
+ gap: spacing.sm,
+ minWidth: 0,
+ },
sessionTitle: {
color: colors.textPrimary,
- flex: 1,
+ flexShrink: 1,
fontSize: typeScale.subtitle,
fontWeight: fontWeight.medium,
lineHeight: lineHeight.listTitle,
diff --git a/apps/mobile/src/session/HomeSurface.tsx b/apps/mobile/src/session/HomeSurface.tsx
index a6291b81a6..23b16d03d5 100644
--- a/apps/mobile/src/session/HomeSurface.tsx
+++ b/apps/mobile/src/session/HomeSurface.tsx
@@ -4311,17 +4311,19 @@ function HomeSessionRowInner({
(hideDivider || blockMode || (!!group && groupExpanded)) && styles.sessionListContentNoDivider,
]}>
<View style={styles.sessionTitleRow}>
- <Text
- style={styles.sessionTitle}
- ellipsizeMode="tail"
- numberOfLines={1}
- testID={titleTestIDPrefix === 'deviceDetail.sessionRowTitle'
- ? `deviceDetail.sessionRowTitle.${item.session.id}`
- : `home.sessionRowTitle.${item.session.id}`}
- >
- {item.title}
- </Text>
- <TaskTagDots tags={item.session.tags} surfaceColor={colors.surface} />
+ <View style={styles.sessionTitleCluster}>
+ <Text
+ style={styles.sessionTitle}
+ ellipsizeMode="tail"
+ numberOfLines={1}
+ testID={titleTestIDPrefix === 'deviceDetail.sessionRowTitle'
+ ? `deviceDetail.sessionRowTitle.${item.session.id}`
+ : `home.sessionRowTitle.${item.session.id}`}
+ >
+ {item.title}
+ </Text>
+ <TaskTagDots tags={item.session.tags} surfaceColor={colors.surface} />
+ </View>
{sourceLabel ? (
<Text
ellipsizeMode="tail"
diff --git a/docs/design-rules/design-decision-log.md b/docs/design-rules/design-decision-log.md
index 12e411e364..245babe294 100644
--- a/docs/design-rules/design-decision-log.md
+++ b/docs/design-rules/design-decision-log.md
@@ -12,6 +12,8 @@
## 2026-10
+- **10-02 手机端任务标签同样紧跟标题**——勘误 09-28 条目「手机端原本已在标题后常显,不变」:手机首页/设备任务列表的色球虽在代码顺序上排在标题后,但标题占满整行剩余宽度,色球实际被挤到行尾、贴着来源与时间;iPhone 横屏/折叠屏系统标题栏分支未传入标签,色球不显示。现行:列表行标题与色球成组,标题只取文字宽度、过长截断,色球紧跟标题,来源与时间仍靠右;横屏/折叠屏标题栏与竖屏一致在标题后显示色球、点击打开任务详情。竖屏原生标题栏与安卓标题栏原本已紧跟标题,不变。落点:`apps/mobile/src/session/HomeSurface.tsx`、`HomeListVisuals.tsx`、`app/sessions/[sessionId].tsx`,守护测试 `homeDesktopFirst.test.ts`、`sessionHeaderDesktopFirst.test.ts`。本条为方向裁决,不代表实机视觉验收。
+
- **10-01 所有模态弹窗点遮罩都不关闭**——用户在「复制到本机」弹窗上发现点窗口外部会直接关掉,要求这类窗口一律不因点外部而关闭,并排查全项目同类问题。原规则(09-24)只覆盖带「取消」的表单类弹窗,说明型提示仍允许点背景关闭。现行:表单、向导、确认、进度 / 复制、更新说明等说明型提示,桌面与手机端都只能用自身按钮(取消 / 主操作 / ×)或 Esc(安卓返回键)关闭。本次补齐任务复制弹窗、更新说明弹窗、插件外链确认框与手机端「访问已撤销」提示;同日用户确认插件卡片的提示词输入浮层(锚在按钮下方、无遮罩外观)也改为点外部不收起,避免误点丢掉已输入的文字。图片 / 视频等查看器、普通弹出菜单、侧滑面板与手机底部浮窗保留点外部关闭。旧数据迁移失败整屏页(无按钮、点任意处继续)维持现状。Cindy Make 前置准备弹窗的「点遮罩先弹确认」例外(09-20)不变。落点:`DESIGN.md §4 Dialog & Modal` 的 Closing affordance;`dialogScrimDismissal.test.ts` 静态守护所有 Radix `Dialog.Content`,`TaskMigrationDialog.test.tsx` 覆盖行为。本条为规则裁决,不代表实机视觉验收。
## 2026-09