Repository navigation
Conversation
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
9 of 20 tasks
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
FicoHub
marked this pull request as ready for review
October 3, 2026 03:33
|
Contributor
|
@FicoHub 👋 这个 PR 现在在等维护者确认,确认之前自动流程不会合并它。
(本条为流程自动发出的维护者确认请求,不用重复回复。) |
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
FicoHub
added a commit
to FicoHub/cindy
that referenced
this pull request
Oct 6, 2026
复用 makecindy#5252 源提交 ed43411 的 WallpaperVideo.test.tsx 单文件补丁。同时等待新 DOM 与旧 src 清理,保留最终释放断言;生产代码不变。 Signed-off-by: ficowang <fico@xd.com>
8 tasks done
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Contributor
Author
|
CI 归因(head d0eaf57):唯一失败在 Linux unit tests (2/2),失败用例是 这是供应商组中转测试在清理临时目录时与后台写入的竞态,与本 PR 无关。此前已在 #4264、#4263 和 main 自身的 client-ci 上出现过,测试侧修复在 #5776(未合入)。不做空提交重跑。 |
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
Signed-off-by: ficowang <fico@xd.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
这次改了什么
摘要
手机选择已连接的电脑后,复用 Cindy 已有 Claude / Codex / Grok 授权,将脱敏订阅额度快照交给桌面小组件。Widget 不另配供应商授权,不保存 token、邮箱、providerId 或账号指纹。
正式待审。当前 head
9436de8d4725e0008ed7fa10c50e51bc88ec52a6已合入 maina9a1ebc1a262e05e90912fed7a68d47279a55ba6。唯一台账生成区冲突按脚本重建、人工区不变。970项定向测试、Mobile类型检查、台账/资源/diff/DCO通过。小组件源码未改;新head完整CI待结果,#5401及最新原生验收门仍待,未合并发布。变更类型
feat新功能fix缺陷修复docs/test验收与契约验证范围
UI 变化
docs/design-rules/DESIGN.md§2 Color Palette & Roles、§3 Typography Rules、§4 Cards & Containers / Usage data graphics;apps/mobile/docs/mobile-design-guide.md§3。生成资源复用 feature-localquotaWidgetTokens与既有翻译源,不增加平行主题系统;Light/Dark 均实现并有原生截图。account/rateLimits/read的rateLimitResetCredits.availableCount映射为剩余次数。未知/非法/过期显示—,确证0显示0;不从credits余额、明细数组或reset倒计时推断,不调用消耗reset接口。以上为真实 AOSP Launcher AppWidget 完整桌面截图,数据为隔离fixture,非浏览器渲染、非物理真机或真实账号。正式Cindy包另从系统选择器添加并验证空态同尺寸。旧近景不再代表本轮布局。
既有 iOS 合成数据证据(确认布局未改):Air Light / Air Dark。18 Pro 真实账号图片仅在任务本地交付,未公开上传。
怎么验证的
2026-10-12 06时主干同步(9436de8d4)
a9a1ebc1a262e05e90912fed7a68d47279a55ba6(比交接时8fae70274更新);仅台账GENERATED区冲突,用生成器重建,人工区逐字不变。2026-10-12 主干同步(00c41f0e5)
28978ce117b6297e6aba68722b47ed17ab20dd50,唯一台账GENERATED区冲突以生成器重建,人工区逐字不变。2026-10-11 主干同步(8cbebc473)
74e2559899050f6adc72d4718ccbbe947ff25e59;唯一冲突docs/design-rules/design-inventory.md的 GENERATED 区用pnpm design:inventory重建,人工区逐字比对一致。tsc --noEmit、53个surface台账检查、widget生成资源检查、diff检查及DCO通过。d0eaf5746的CI run38141767482仅Linux第二片groupRelay ENOTEMPTY失败,归因见既有PR评论(test(remote-agent): groupRelay 用例清理临时目录时重试,避免与后台写入竞态 #5776);本轮通过真实主干同步产生新head,未重复评论或空提交重跑。主干台账同步:2026-10-11 21:00轮(head
d0eaf5746a7adf0c35d0b58414aa3d463d1565f6)1551413ef637db991389b461cf06a3b891624309。唯一冲突为design-inventory GENERATED区,用脚本重建53个surface并check通过,人工区逐字未变,未改合并配置。主干手机入口同步:2026-10-11 19:00轮(head
7a01279f724d9792cf13d5cafdcf959678a1e700)b021dc4b62a58f686664eb8b86dee08c87ee403c。唯一冲突为design-inventory GENERATED区,由pnpm design:inventory重建53个surface并check通过,人工区逐字不变;未修改.gitattributes或合并配置。主干契约同步:2026-10-11 18:00轮(head
2d7e95b2b2c8cc984a07727c1da3df023944dc36)9b200f938deaadf81d3c4a7e6d4f3bb60b610ab0。唯一冲突为design-inventory生成区,脚本重建53个surface并check通过,人工区逐字未变。MobileCodexRateLimitResetCredit.resetOffer与MobileCodexRateLimitResetOffer.retryOnly,不改变小组件剩余次数映射。保留本PR既有只读usage通道增量,没有新增授权或实际消费reset。.build/和旧品牌素材目录未处理。新head完整CI单次核对交原巡检,不空提交重跑。groupRelay/githubSetup线索本轮未验证,不提前作为CI归因。#5781落地后同步:2026-10-11 14:00轮(head
c6c0385e06d5b47549870aaaf7f2ca6f3b1f1246)9e361df6da5478753282eef53bc854af8b39a1ce,包含9fb768f19的#5781及更新的手机消息展示修正。台账check通过、无需重生成。旧目录改道断言失败现已修复,不再等待test(remote-agent): 修复 main 单测——换位置守卫跟上组那一项留在当前电脑的分支 #5781。remoteAgentRelocationWiring.test.ts14项全部通过(上一head本地13通过/1失败)。Mobile小组件四套与上游六套消息展示测试共346项通过;Desktop/Mobile typecheck、台账/生成资源/diff/DCO检查通过。本次没有放宽断言或重复实现修复。.build/及旧品牌素材目录未处理;确认小组件视图/控制器未改。#5401五类批准、最新原生构建/真机验收仍待,未构建或操作原生设备、未合并发布。主干同步:2026-10-11 13:00轮(head
b57f46bd18637506f977d61ba4f470f7d41a8874)f3c263a36651dd900cc4c4dbd4130d4f77f7af13,唯一冲突为design-inventory GENERATED区,脚本生成53个surface并check通过,人工区逐字不变。Codex源码/测试自动合并后额度与套餐行为回归通过,小组件确认稿未改。remoteAgentRelocationWiring.test.ts:13通过、1失败,旧断言期待relocate!({ ...row, agentDevice: remoteBrowseDevice }),实际main已采用分支调用。测试及ModelSelector.tsx与main完全一致,PR无该两文件增量。修复#5781仍OPEN(head5382a8fa),仅改该测试的断言;本PR不重复实现、不放宽测试、不空提交重跑。.build/与历史品牌素材目录未处理;本轮日志另存临时任务目录。主干同步:2026-10-11 07:00轮(head
0c90ed706a3207b84580f131217df881e4ea7196)6393978d0f7f059f4414820441de0b7aeda86b3c,唯一内容冲突为design-inventory GENERATED区。pnpm design:inventory重建53个surface,check通过,人工区逐字不变。Codex源码/测试及术语文件自动合并,小组件确认稿与原生视图未改。主干同步:2026-10-10 15:00轮(head
f74984bd867b8d6b2b4c9c502062410bcb6183dc)f78ba734d534012046387e3b47667012cf35d068。唯一冲突为design-inventory GENERATED区,用pnpm design:inventory生成并check通过(53 surfaces),人工区逐字不变。小组件生产视图、控制器、已确认排版未改,历史未跟踪材料核对保留。主干同步:2026-10-10 05:00轮(head
7940ae4b67f3e14410837f20a117618d5de921cb)60a04e48de1ea1c7a37cdabcd267d2ca64aa03bb(fix(mobile): 移除回复下方重复的生成中提示 #5700),未重写分支。仅design-inventory GENERATED区冲突,由pnpm design:inventory生成53个surface,人工区逐字核对未变。保留上游移除重复生成提示的行为,小组件确认稿及生产视图不变。主干同步:2026-10-10(head
a728574df494dc992e47ca68df26db75bc25238d)bb1b1dc13bfcf23d4ef6945ad83f068e0224168b,唯一内容冲突为docs/design-rules/design-inventory.md的GENERATED区;用pnpm design:inventory生成53个surface,人工区逐字核对未变。agent-island测试、GLOSSARY及glossary.json自动合并后通过针对验证;小组件控制器/原生视图未改。pnpm install --frozen-lockfile --prefer-offline --ignore-scripts成功(仅本工作树;不运行安装脚本或升级runtime)。此准备不代表原生App重建。diff --check通过;整个合并相对旧HEAD的检查发现上游sessionMenu尾部空行和依赖patch空白,核实这些文件与main完全一致,保留上游内容,不改无关patch。主干隔离修正已同步:2026-10-09(head
351a9ca0259daacd7db2e1e59f0c3ea5698dec88)ebf0c1604eb3ff91b747e5c17edcd625eadec74b,无冲突。主干861831267904e3e054e0e072e46128164224690c(fix(media): 修复 Mermaid 图表复制与聊天图片菜单 #5643)已mock PI runner测试里的spawnSync/process.kill,覆盖Windows taskkill成功、失败回退及其他平台。旧run37909405755对应隔离缺陷已同步修正,不再以#4635尚未合入作为等待项,未复制另一PR或空提交触发重跑。pnpm --filter desktop exec vitest run src/main/cindy-brain/__tests__/piSubagentRunnerHost.test.ts src/renderer/__tests__/newMakerOrcaCreateOrder.test.ts:30通过。CI结果补充:2026-10-09,head
4511a0e22run 37909405755已结束:Linux两片、Windows第2片、Git integration、DCO通过;Windows第1片唯一测试失败为
piSubagentRunnerHost.test.ts:121,SIGTERM断言期望process.kill(2468),调用数为0。Windows汇总随之失败;其他verify检查虽通过,不能据此声称全部CI通过。核对源码可确认测试未mock
spawnSync:win32先执行真实taskkill,成功时直接返回true,不经过process.kill。PR三点diff未改此实现与测试。这是已由 #4632 / #4635 处理的测试隔离缺陷;日志没有记录PID对应进程,不声称查明它的身份。#4635 head2732540b93955b4f733886b710ee328bff10e53f仅改该测试并隔离taskkill/process.kill,读回11项检查均成功,尚OPEN并受#4636批准门约束。当时由原执行会话继续,本PR没有重复修复或重跑;现主干已通过861831267落地等效修正,本PR已同步,见上方最新记录。前一head的maker-core malformed-mailbox返回0/EBUSY在本run未复现,仍未归因,不能算被此次修复。#5401五类批准、最新原生构建与设备验收边界不变。
主干同步与 Windows 失败核验:2026-10-09(head
4511a0e22bdc31c3d96fc352200f602a91cd8b3c)a152497ac24d155dd46142b73dda4fa10ad08ad0,仅两处冲突:newMakerOrcaCreateOrder.test.ts采用上游c4fe94bee更严格的agentCatalogProviders来源断言;design-inventory.md用pnpm design:inventory重新生成,53个surface、人工区保留。上游 iOS action sheet 修正原样保留,小组件确认稿未改。iosChromeActionMenu/showActionMenu13项通过;Desktop/Mobile typecheck、check:design-inventory、DCO与diff检查通过。PI mailbox目标用例macOS 1项通过(其余41项按名称过滤),不代表Windows通过或证明flake。此次未重跑历史全量及原生构建。68ac3a2f5的 CI 37904242538 唯一失败在 Windows unit tests (1/2):PI malformed-mailbox用例投递返回0(期望1),随后临时目录清理EBUSY。PR与main该PI目录无差异;返回0有多种路径,日志未给出具体分支,故不归因flake、也不改PI或放宽测试。日志中的termination unconfirmed来自另两个Maker负向测试,不属于该失败用例。新合并提交正常触发完整CI,不空提交、不重跑旧job。ed43411b217abc5e1a9e53c0e5fdb128cf9c0661修复:三条审查修复与验证。包含修复前清理失败2例/Android容量失败证据、修复后Mobile79项/Android JVM11项/隔离原生43项及Android构建。356×164边界为契约测试,Launcher截图另为5×2实际分配382×289dp,不混称;均为该历史head证据,不冒充本head原生验收。CI确定性断言修复:2026-10-09 / 68ac3a2
fa2ea01b6尚无后续修复。上游9fb59bb93把执行端目录改为agentCatalogProviders,旧测试仍匹配deviceProviders。不是flake,不靠重跑或超时修饰解决。#5401放行责任(当前仍待)
合并需新head required CI与上述明确Approve;发布另需完整原生重建/渠道签名和安装验收,quota plugin目前没有EAS appExtensions签名元数据。Duo/Grok真实账号/实体Android OEM/第二真实Cindy身份等边界由维护者裁定首版范围,实施方在批准范围内补测。历史原生证据不冒称当前head重建。
主干同步:2026-10-09 / 5f985e5
fa2ea01b6c77053fc8b78f2edd94337916e8a0f9;merge commit5f985e5ab47e7b4525a0ab011c623a917f8c384c。CI超时修复:2026-10-06 / 9b75dce
service.test.ts的 headless publishing 用例在5000ms超时;verify仅跟随LINUX_UNIT_SHARDS_RESULT=failure。其余Linux/Windows及Git integration通过。主干同步与冲突处理:2026-10-06(head
27f807cd9692c7baa846658edb8fbb8d3bcf1751)84ab23f699c05969299f4ad042db727068c0287a。唯一文本冲突docs/design-rules/design-inventory.md位于 GENERATED 区,按合并源码重新生成53个surface;人工区逐字保留,不整份ours/theirs。三条审查修复:2026-10-03(head
ed43411b217abc5e1a9e53c0e5fdb128cf9c0661)635a56a3974df6b6b5dfdcf5d8e14c2ff06f676b,没有覆盖历史宿主补丁或用户材料。最新CI回归修复与主干同步:2026-10-03(head
4d065b299d79d14e280113bfe70c118145eba328)88e224475a6183f7b31218a7499be956a4bf2667。唯一冲突为生成设计台账,按合并后源码生成并校验;人工区与小组件入口保留。推送后读回PR为 OPEN / draft / MERGEABLE,不合并发布。Codex 套餐缺失与CI修正:2026-10-03(head
54312dc2d1c33d42343a00704f5ca46e9be9ae7c)account/read {refreshToken:false}回退:只补缺失/unknown套餐,保留明确桶套餐;2秒可选超时/失败不影响额度。只投影套餐,不读取认证文件、不向手机传额外身份、不消耗reset。手机层逐个识别后回退,修复字面unknown挡住有效账号套餐的问题。quotaWidgetNativePlugin.test.ts),不是WallpaperVideo。现已从翻译正本同步Swift/Android生成资源并回归通过;未改壁纸实现或降低门禁。新head CI由本次push触发,未循环poll。Android断网/省电补充:2026-10-03 00:27 +0800
441466587a9f9ab1bcc14944d7e5bfc874e877f6,无新增生产代码或布局变化。专用API36 ARM64模拟器com.xd.cindy,真实账号/生产缓存/Launcher,非fixture。adb devices -l只有此AVD,无实体Android。正式Switch account列表仅有1个当前身份,无可切换第二身份;没有退出或添加账号。旧账号缓存/迟到响应/断链时间/后台隔离4项定向通过(另9项未选,不冒充全量)。两个不同真实账号测试仍未执行,前次来源电脑切换不算账号切换。Android添加说明与CI收尾:2026-10-03
441466587a9f9ab1bcc14944d7e5bfc874e877f6。本次仅修正五语言quotaWidget.addHintAndroid(settings.json):宽卡两列并排,窄卡按空间纵向排列或减少显示数量,可调整尺寸查看更多。没有改布局、原生模块、认证、源数据或iOS确认稿。i18nCatalogParity.test.ts20项、Mobile typecheck、check:i18n、check:i18n-glossary、本次diff whitespace检查均通过。保留既有i18n警告,未新增术语违规。DCO读回通过。1af3a1a4aLinux第2片唯一失败在WallpaperVideo.test.tsx:61:从DOM移除视频后立即断言src清空,实际仍为/cindy-window.mp4。对应组件在被动effect cleanup中移除src,存在异步时序疑点,但未复现证明。实现和测试与实时main949e08060Git blob完全相同,且PR三点diff无这两文件改动;此前同head本地该套16/16通过。故记录为PR外共同代码的CI失败线索,不认定已证明主干CI失败或已修好,不修改/弱化无关墙纸测试。Android真实账号续验:2026-10-03 00:00 +0800
代码head仍为
1af3a1a4a6173dc576221d950447ae797dce411e,本轮仅运行现有生产App和记录证据,未改布局/供应商认证、未重跑未变化的构建和单测。com.xd.cindy选择已有电脑,正式 Claude/Codex control 投影→手机设置页→生产 noBackup 脱敏快照→AOSP Launcher AppWidget 验证完成。真实来源标为 live-source,不是fixture注入。WallpaperVideo.test.tsx失败,Windows两片等通过。该文件不在PR改动中,本地定向16项通过但不能视作远端通过;未重复poll或改无关墙纸。本轮尺寸修复:1af3a1a4a6173dc576221d950447ae797dce411e
:app:assembleDebug :cindy-quota-widget:testDebugUnitTest成功(734 tasks;9 JVM tests),正式APK已安装且实际默认添加;隔离包38条设备内检查通过;Mobile native plugin 10项及Mobile typecheck通过;生成资源和diff检查通过。未重跑上轮63项或更早全量,下面均标为历史结果。docs/assets/quota-widget-art-study/references/widgets.md引用缺失文件,未纳入PR、未删除旧稿或弱化检查。上轮 Android 功能验证:25d443de351819700357a3b9522b29da8fcefcc9(历史结果)
cindy-quota-api36/emulator-5580,Pixel9 profile,API36 / Android16 ARM64,1080×2424px、420dpi,未 root。com.xd.cindydebug APK 已安装启动真实登录页;系统 Widget picker 添加空态,点击返回真实 App 登录页。使用本 worktree 的 localhost:8088 Metro(专用 AVD reverse 8081→8088)。未登录,不称为真实数据链路验收。org.cindy.quota.validation:38 条设备内契约检查通过,含三品牌 VectorDrawable 真加载、次数未知/0/整数、源时间、存储清空。日夜、100%最长、部分额度、0/unknown/stale/offline/unauthorized、缺计划/窗口、长套餐、横向缩放、字体1.3/2.0截图目检。实际代码与测试包复制文件逐字节一致。tools/quota-widget-android-fixture/,仅 demo,不在生产 App 注入测试入口。完整构建、哈希与边界记录。既有 iOS / 共享层证据(精确版本,不冒充本轮重跑)
779bf7134:完整 Global iOS App+WidgetKit 强制重建退出0,当时指纹5f8904917a99d0b4daf9a4c301dc18f35982e309;两台任务模拟器覆盖安装。18 Pro保留登录,通过深链/立即同步再次验证真实Claude/Codex源→手机→AppGroup→WidgetKit,small/medium日夜目检。Air没有账号,完整App登录/Widget空态/深链验证。a9eb56b95后190项定向与Mobile/Desktop类型检查属于779bf7134;179项复测与Swift契约属于文档head03fa6b1d5。历史7745项属于eba687,不称为当前全量。未执行的验证
风险
风险分类
影响与回滚
回滚通过后续冷更移除入口/模块,不回退供应商认证或其他用户数据。已有用户需安装含原生扩展的新包;不单独推送不兼容OTA。本轮无生产签名、buildNumber变更、TestFlight上传或商店发布。
合并与发布门槛:本 PR 按用户要求提交正式评审。用户视觉确认和 Ready for review 均不替代仓库指定维护者的设计/冷更批准。CODEOWNERS 为 @makecindy/maintainers,具体放行人由维护者指派;目前尚无该批准,仍需必需 CI 通过和维护者审核后才能合并。发布负责人还需补齐选定通道的Widget扩展签名archive/export:当前quota plugin缺EAS appExtensions签名元数据,本地ExportOptions只列主App profile。
eas.json存在testflight-global不等于已经能分发。实现者负责剩余账号/设备回归,维护者决定未验收范围是否阻断首版。提交前检查