Import agent sessions that ran in a git worktree of the project

[BudhirajaMadhav]

Problem

The welcome wizard's session import only picks up Claude Code and Codex sessions whose recorded working directory is exactly the project's root folder. A session that ran in a git worktree of the same repository is skipped, and every imported thread runs in the project root.

Many people run agents in worktrees, created with git worktree add or by tools such as Conductor that give each workspace its own worktree. Those sessions belong to the project, but the import cannot see them.

Concrete case: I am moving from Conductor to T3 Code. My recent Claude sessions are in 12 worktrees of 4 repositories that are registered T3 projects. The import offers none of them.

Proposed scope

When the import scans for a project, also include sessions whose working directory is a git worktree of that project's repository (as git worktree list reports it at the project root) and that still exists on disk.

• Each such session becomes a thread bound to that worktree and its branch, the same way T3 binds a thread started in an existing worktree. The provider resumes in the session's original folder, so the conversation continues where it stopped.
• T3-managed worktrees stay excluded, as today. Those sessions are already T3 threads.
• Running the import again does not duplicate threads.
• No new UI and no new settings. The wizard finds more sessions for the projects it already lists.

Why this stays inside the existing import

It widens one matching rule, from "the project root" to "the project root or one of its git worktrees", and reuses the existing worktree binding. It does not change the 30-day window, the per-thread message limit, or when the import can run (that is #11697).

Related

• [Feature]: continue threads from claude code #6873: continue provider CLI sessions in general
• Re-scan / re-import CLI conversations for existing projects (not just onboarding) #11697: run the import again after onboarding
• Date imported agent sessions by their last message instead of file mtime, and allow importing after onboarding #21764: date sessions by their last message

If the direction is acceptable, I can open a focused PR with tests: a worktree session is imported and bound to its worktree; a session from an unrelated folder is not; T3-managed worktrees stay excluded; a second import makes no duplicates.

[juliusmarminge]

Note

Grok responding on behalf of Julius.

Thanks for the detailed write-up. This is already in progress in #18198, which imports Claude and Codex sessions from a project's linked worktrees, keeps the worktree path and branch on the imported thread, excludes T3-managed worktrees, and doesn't duplicate on re-import. Testing or reviewing that PR would be the best way to help, rather than opening a separate one. I've linked this discussion to it so it closes when that lands.

[BudhirajaMadhav]

Closing as a duplicate of #18198, which already implements this: sessions from a project's linked worktrees are imported and bound to their checkout and branch. I missed that PR when I searched. Sorry for the noise.