Repository navigation
chore: 接入 upstream-merge-notify 跟踪上游落后 - #916
Closed
youxuanxue wants to merge 11 commits into
Closed
youxuanxue wants to merge 11 commits into
youxuanxue wants to merge 11 commits into
Conversation
* fix(conversations): prune sidebar ghosts when Codex rollouts are gone Sidebar reads SQLite, not ~/.codex/sessions, so deleted rollout files left openable ghost rows. Soft-delete missing imported sessions on list/scan, cascade orphaned children, and classify Codex resolve-rollout failures. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(conversations): skip prune when Codex disk presence is unknown A failed WalkDir/join previously looked like an empty rollout set and would soft-delete every aged Codex row. Distinguish successful-empty from unavailable, finalize prunes with chat-folder cleanup, and cover both with regressions. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: yyy <yyy@no-replay.com> Co-authored-by: Cursor <cursoragent@cursor.com>
Allow src-tauri/target to be ignored as either a directory or a symlink, matching the DevCache cargo bound compatibility layout.
…stream-2026-09-28 # Conflicts: # src-tauri/src/acp/connection.rs # src-tauri/src/parsers/codex.rs
Bring youxuanxue/codeg up to date with spacering-net/codeg@fe9fa637 while preserving fork history via a no-ff merge. Co-authored-by: Cursor <cursoragent@cursor.com>
Pi only reads settings/auth/models at process start, so saving a new provider or model must fingerprint those files and refresh running sessions instead of leaving them on the old registry. Co-authored-by: Cursor <cursoragent@cursor.com>
Shrink fork conflict surface on the mega upstream file by keeping only a one-line hook there, drop trailing-newline noise vs upstream, and cover the hash in acp::pi_native_fingerprint. Co-authored-by: Cursor <cursoragent@cursor.com>
CI Rust 1.99 -D warnings rejected the nested Result/HashMap/HashSet parameter on resolve_codex_list_scan; a named alias keeps the same semantics without an allow attribute. Co-authored-by: Cursor <cursoragent@cursor.com>
merge: 对齐 upstream/main 并刷新 Pi 配置陈旧态
Bring spacering-net/codeg@187651de into youxuanxue/codeg while preserving fork history (no-ff).
merge: 对齐 upstream/main（0.34.0）
安装 detection-only workflow，及时开 issue 跟进 xintaofei/codeg 新特征。 Co-authored-by: Cursor <cursoragent@cursor.com>
Author
|
Opened against the wrong base (GitHub parent). Tracking PR is youxuanxue#5 |
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
1 participant
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-merge-notifyworkflow，监听xintaofei/codeg落后并开/刷新[upstream-merge]tracking issue。dev-rules/templates/upstream-merge-notify安装，带 managed-by 标记。风险
验证
python3 scripts/upstream/notify-merge-needed.py --selftest通过（30/30）提交
Made with Cursor