将 PR #610 rebase 到 upstream 最新 main(解决与 #611 的冲突) - #1
Closed
Cmochance wants to merge 7 commits into
Closed
Conversation
* chore: 仓库根目录整理 — 删遗留文件 + 公开文档收敛 documents/ - 删除历史任务遗留: messages-responses-protocol-task-tree.md / websearch-tool-context-task.md / finetune-*.png(全仓零引用) - 删除 .dockerignore(仓内无 Dockerfile, 无消费者)与 .mailmap(不再合并 AI 工具 git author) - CHANGELOG / ACKNOWLEDGEMENTS / ONBOARDING / ARCHITECTURE_PROTOCOL_GUIDE 移入 documents/, 同步 README 中英链接 / site App.tsx footer 链接 / .gitignore 注释 / ONBOARDING 结构描述 - .gitignore 新增忽略 .codex/(Codex CLI 项目级本机配置) * chore: AGENTS.md 转维护者本地文件(退出 git 跟踪 + gitignore) - git rm --cached AGENTS.md, 本地文件保留(Codex CLI 仍从仓库根读取) - .gitignore 锚定根目录 /AGENTS.md, 与 .codex/ 同段 - ONBOARDING 公开文档清单 / 目录树 / 引述 4 处同步 * chore: 收敛候选 A/B/C — 删 agent/ 归档 + img 零引用素材 + .gitignore 死规则 - agent/issues.md(Linear 前时代 AI 排查档案)整目录删除, 已归档维护者本地 - img/ 删 4 个全仓零引用文件: icon.png / icon-source-generated.png / icon-transparent-master.png / anyrouter_logo.png(~7.7MB, app 实际 icon 在 src-tauri/icons/) - .gitignore 删 macos/assets app-icon 死规则段(prepare-icon.py 已不存在, 生成机制随 Tauri bundler 切换消亡) * chore: P1/P2/P3 目录收敛 — macos→src-tauri + release-notes/img→documents/ - macos/entitlements.plist → src-tauri/entitlements.plist(唯一消费者 tauri.conf.json 改相对路径), macos/ 目录移除 - release-notes/ → documents/release-notes/, 同步 check_release_notes_present.py NOTES_DIR + release.yml 门禁注释 - img/ → documents/img/, 同步 README 中英全部截图链接 + .gitignore codex-theme 规则 - ONBOARDING 目录树 / 公开文档清单 / release notes 模板路径同步
This reverts commit 893270e.
问题背景 Codex Desktop 升级到 26.715.10079 后，Transfer 注入的 Usage 用量面板出现兼容问题： 最初表现为“上下文”数据显示为 —。 修复上下文标签后，进一步发现整个 Usage 分区仍可能消失，右侧摘要弹窗只显示“输出”和“来源”。 配置开关、额度数据、CDP 连接和注入 daemon 均正常，因此问题并非数据获取失败。 影响范围 Codex Desktop：26.715.x Codex App Transfer：2.4.5 受影响功能：Codex 内 Usage 用量显示 上下文使用量读取 与 Usage 共用摘要挂载容器的 Stash 面板
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
2 participants
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.
你好!我是 upstream (Cmochance/codex-app-transfer) 的维护者。
你的 PR Cmochance#610 提交后,upstream 刚好 merge 了一个仓库结构整理 PR(Cmochance#611:文档与图片收敛进
documents/等),导致 Cmochance#610 与 main 产生冲突(GitHub 显示 CONFLICTING 时 CI 也不会运行)。这个 PR 把你的 6 个 commit 原样 rebase 到 upstream 最新 main:
fix(codex): restore Usage panel on Codex 26.715)在 README.md / README.en.md 各有一处冲突,解决方式为:保留你新增的「Codex 26.715 兼容」说明段 + 采用 chore: 仓库根目录整理 — 删遗留文件 + 公开文档收敛 documents/ Cmochance/codex-app-transfer#611 之后的新图片路径documents/img/codex-usage-breakdown.jpg。cargo fmt --check通过、cargo check(workspace + Tauri 主 crate)通过。merge 这个 PR 到你的 main 之后,Cmochance#610 会自动更新并解除冲突状态,我们那边就能 approve CI 并开始正式 review。感谢你的贡献!
也欢迎你自己用其他方式 rebase(比如本地
git rebase upstream/main后 force push)——效果相同,这个 PR 只是提供一条现成路径。