Skip to content

fix: group imported worktree sessions under repository - #575

Open
dawNotPoi wants to merge 1 commit into
xintaofei:mainfrom
dawNotPoi:fix/imported-codex-worktree-grouping
Open

fix: group imported worktree sessions under repository#575
dawNotPoi wants to merge 1 commit into
xintaofei:mainfrom
dawNotPoi:fix/imported-codex-worktree-grouping

Conversation

@dawNotPoi

Copy link
Copy Markdown
Contributor

Summary

  • detect linked Git worktrees while importing local sessions
  • group imported worktree folders under an existing main repository folder
  • reconcile legacy top-level worktree rows in place
  • preserve ordinary repository and non-Git import behavior

Fixes #552.

Tests

  • cargo test --no-default-features --features test-utils --lib batch_import_
  • cargo test --no-default-features --features test-utils --lib add_imported_folder_core_keeps_non_worktree_paths_top_level
  • cargo test --no-default-features --features test-utils --lib
  • cargo check --no-default-features --features test-utils
  • cargo clippy --no-default-features --all-targets --features test-utils -- -D warnings

The default desktop test target could not be built locally because this WSL environment does not have the gdk-3.0 development package; the shared/server Rust target and strict clippy checks pass.

@dawNotPoi
dawNotPoi marked this pull request as ready for review August 25, 2026 14:28
@xintaofei
xintaofei force-pushed the fix/imported-codex-worktree-grouping branch from 18b09ee to c082309 Compare August 25, 2026 22:41
@xintaofei

Copy link
Copy Markdown
Owner

维护者代为重建了本 PR 的分支(force-push),你的改动一行没动。下面说明原因和你本地需要做的事。

为什么要重建

本 PR 原本是从 12abd0f0 切出来的,而那个基点属于 #534(PK 竞技场)合并后、被 #574 revert 收尾 的那段历史。8/25 main 做了一次历史重写,把这整段拿掉了,于是本 PR 的 merge base 退回到 40228054,diff 从「1 个提交」膨胀成 88 个提交 / 31 个文件 / +1437

多出来的 87 个提交带来四个问题:

  1. 历史会被嫁接回来。PK 的文件内容在 diff 里看不到(merge 与 revert 互相抵消),但提交本身会整体进入 maingit logfeat(pk) / docs(pk) 连同 PK 截图 blob 全部复活,等于把 8/25 的清理白做一遍。
  2. 会顺带带回 36eafa77reasoning.tsx),这个提交是当时有意不保留的。
  3. 反向覆盖新代码main 上的 d69c4002(+1049/−48)和 bb4579d0 本分支完全没有,合并会把它们改回去。
  4. 因此 PR 一直是 CONFLICTING —— 1bb69096 / 9810b1acmain 上是 cherry-pick 后的新 SHA,在本分支上是原 SHA,同一份内容双边引入。

「Squash and merge」解决不了:它只压缩历史、不改内容,上面第 2、3 条照样会落地。

做了什么

把你的提交 18b09eeb cherry-pick 到当前 main 之上,其余 87 个提交丢弃。已核对:

  • patch 与原提交逐字相同,作者署名保留
  • diff 回到 2 文件 / +236 −15,与你原提交的 diffstat 完全一致
  • origin/main..HEAD 只剩 1 个提交,PK 提交数为 0

原 tip 18b09eeb 已在维护者本地打 tag 留档。

你本地要做的

分支已被重写,直接 pull 会产生一个假合并。请用:

git fetch origin
git checkout fix/imported-codex-worktree-grouping
git reset --hard origin/fix/imported-codex-worktree-grouping

(如果你的 fork 远端名不是 origin,换成对应的名字。)之后再提交就正常了。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug: Imported Codex worktree sessions are registered as top-level folders instead of under repo root

2 participants