fix: update file search directory when session CWD changes #9279

yuvrajangadsingh · 2026-01-15T13:02:10Z

Summary

Fixes #9041

Adds update_search_dir() method to FileSearchManager to allow updating the search directory after initialization
Calls this method when the session CWD changes: new session, resume, or fork

Problem

The FileSearchManager was created once with the initial search_dir and never updated. When a user:

Starts Codex in a non-git directory (e.g., /tmp/random)
Resumes or forks a session from a different workspace
The @filename lookup still searched the original directory

This caused no matches to be returned even when files existed in the current workspace.

Solution

Update FileSearchManager.search_dir whenever the session working directory changes:

AppEvent::NewSession: Use current config CWD
SessionSelection::Resume: Use resumed session CWD
SessionSelection::Fork: Use forked session CWD

Test plan

Start Codex in /tmp/test-dir (non-git)
Resume a session from a project with actual files
Verify @filename returns matches from the resumed session directory

etraut-openai · 2026-01-15T17:01:31Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f1c1328972

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

codex-rs/tui/src/file_search.rs

etraut-openai · 2026-01-15T19:49:04Z

@yuvrajangadsingh, thanks for the contribution. Please take a look at the code review comment from Codex.

yuvrajangadsingh · 2026-01-16T06:18:59Z

Thanks for the review! I've addressed the feedback:

update_search_dir now cancels any in-flight search via the cancellation token
Clears active_search, latest_query, and is_search_scheduled to prevent stale results

This ensures old searches from the previous workspace can't pollute the new session.

yuvrajangadsingh · 2026-01-16T07:13:49Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d39591ee7f

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

codex-rs/tui/src/file_search.rs

yuvrajangadsingh · 2026-01-16T09:01:12Z

Addressed the second review comment as well:

Fix: Moved search_dir into SearchState (inside the mutex) so the debounce thread reads the current value when it fires, not a stale captured value.

Before: search_dir was captured at thread spawn time → race condition
After: search_dir read from mutex after debounce → always current

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d9583a7a34

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

codex-rs/tui/src/file_search.rs

yuvrajangadsingh · 2026-01-16T10:26:39Z

Addressed the third round of feedback:

Fix: Skip search if latest_query is empty when debounce fires.

This handles the case where update_search_dir() cleared the state while the debounce thread was sleeping - prevents expensive match-all traversal.

@codex review

chatgpt-codex-connector · 2026-01-16T10:31:33Z

Codex Review: Didn't find any major issues. More of your lovely PRs please.

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

codex-rs/tui/src/app.rs

yuvrajangadsingh · 2026-01-16T22:15:22Z

Mirrored the changes to tui2 as requested. Both tui and tui2 now have:

update_search_dir method in file_search.rs
search_dir stored inside SearchState (mutex-protected) to prevent race conditions
Empty query check to avoid expensive match-all traversal
update_search_dir calls in NewSession, Resume, and ForkCurrentSession handlers in app.rs

All tests pass for both packages.

yuvrajangadsingh · 2026-01-16T22:16:06Z

@etraut-openai Changes mirrored to tui2 as requested. Ready for another look!

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b5c56fb2f4

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

codex-rs/tui/src/file_search.rs

codex-rs/tui2/src/file_search.rs

yuvrajangadsingh · 2026-01-16T22:28:52Z

Addressed the P3 feedback: added a generation counter to invalidate stale debounce threads after session changes.

How it works:

generation field added to SearchState
Incremented in update_search_dir() on session change
Debounce threads capture generation at spawn time
Before proceeding with search, check if generation matches - if not, abort silently

This prevents duplicate searches when user types a new query before the old debounce fires.

@etraut-openai @codex review

chatgpt-codex-connector · 2026-01-16T22:34:41Z

Codex Review: Didn't find any major issues. Nice work!

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

yuvrajangadsingh · 2026-01-20T11:33:50Z

Rebased on latest main to resolve conflicts.

@codex review

chatgpt-codex-connector · 2026-01-20T11:38:37Z

Codex Review: Didn't find any major issues. More of your lovely PRs please.

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

yuvrajangadsingh · 2026-01-20T11:46:53Z

@etraut-openai All changes addressed - generation counter added to prevent duplicate debounce searches, mirrored to tui2. Conflicts resolved, CI passing, Codex review clean. Ready for final review.

yuvrajangadsingh · 2026-01-21T09:53:33Z

Rebased again on latest main to resolve new conflicts.

@codex review

chatgpt-codex-connector · 2026-01-21T09:59:46Z

Codex Review: Didn't find any major issues. 🎉

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

yuvrajangadsingh · 2026-01-22T15:11:00Z

Rebased on latest main - tui2 was removed upstream, changes now only apply to tui.

@codex review

chatgpt-codex-connector · 2026-01-22T15:14:54Z

Codex Review: Didn't find any major issues. Bravo.

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

yuvrajangadsingh · 2026-01-30T17:39:01Z

@codex review

chatgpt-codex-connector · 2026-01-30T17:42:37Z

Codex Review: Didn't find any major issues. Keep it up!

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Add `update_search_dir` method to FileSearchManager that updates the search directory and drops the current session so it will be recreated with the new directory on the next query. Replace the FileSearchManager recreation in the Resume case with a call to this new method for more efficient CWD updates.

etraut-openai

Looking pretty good. One small change request.

codex-rs/tui/src/file_search.rs

yuvrajangadsingh · 2026-01-30T22:08:33Z

@etraut-openai Fixed the docstring - now only mentions resume. Ready for another look.

yuvrajangadsingh force-pushed the fix/file-search-cwd-update branch 2 times, most recently from a1419c7 to f1c1328 Compare January 15, 2026 14:16

yuvrajangadsingh mentioned this pull request Jan 15, 2026

@filename lookup broken: “no matches” in trusted roots #9041

Closed

chatgpt-codex-connector bot reviewed Jan 15, 2026

View reviewed changes

codex-rs/tui/src/file_search.rs Show resolved Hide resolved

etraut-openai added the needs-response Additional information is requested label Jan 15, 2026

yuvrajangadsingh force-pushed the fix/file-search-cwd-update branch from f1c1328 to d39591e Compare January 16, 2026 06:18

etraut-openai removed the needs-response Additional information is requested label Jan 16, 2026

chatgpt-codex-connector bot reviewed Jan 16, 2026

View reviewed changes

codex-rs/tui/src/file_search.rs Outdated Show resolved Hide resolved

yuvrajangadsingh force-pushed the fix/file-search-cwd-update branch from d39591e to d9583a7 Compare January 16, 2026 09:01

chatgpt-codex-connector bot reviewed Jan 16, 2026

View reviewed changes

codex-rs/tui/src/file_search.rs Outdated Show resolved Hide resolved

yuvrajangadsingh force-pushed the fix/file-search-cwd-update branch from d9583a7 to 7d9c72c Compare January 16, 2026 10:26

yuvrajangadsingh force-pushed the fix/file-search-cwd-update branch from fa5e774 to 9718a48 Compare January 16, 2026 11:28

etraut-openai requested changes Jan 16, 2026

View reviewed changes

codex-rs/tui/src/app.rs Outdated Show resolved Hide resolved

etraut-openai added the needs-response Additional information is requested label Jan 16, 2026

yuvrajangadsingh force-pushed the fix/file-search-cwd-update branch from d1300b0 to 5a5df25 Compare January 16, 2026 22:06

yuvrajangadsingh requested a review from etraut-openai January 16, 2026 22:17

chatgpt-codex-connector bot reviewed Jan 16, 2026

View reviewed changes

codex-rs/tui/src/file_search.rs Outdated Show resolved Hide resolved

codex-rs/tui2/src/file_search.rs Outdated Show resolved Hide resolved

yuvrajangadsingh force-pushed the fix/file-search-cwd-update branch 2 times, most recently from c5b2960 to 5c29b91 Compare January 20, 2026 11:03

etraut-openai removed the needs-response Additional information is requested label Jan 20, 2026

yuvrajangadsingh force-pushed the fix/file-search-cwd-update branch from 5c29b91 to 387d9eb Compare January 21, 2026 09:53

yuvrajangadsingh force-pushed the fix/file-search-cwd-update branch from b582b70 to 511983c Compare January 22, 2026 15:10

etraut-openai requested a review from bolinfest January 22, 2026 21:50

yuvrajangadsingh force-pushed the fix/file-search-cwd-update branch from 19327e7 to c08722b Compare January 30, 2026 17:38

yuvrajangadsingh force-pushed the fix/file-search-cwd-update branch from 352790e to d8f6284 Compare January 30, 2026 21:07

Merge branch 'main' into fix/file-search-cwd-update

333b3f5

etraut-openai approved these changes Jan 30, 2026

View reviewed changes

etraut-openai requested changes Jan 30, 2026

View reviewed changes

codex-rs/tui/src/file_search.rs Outdated Show resolved Hide resolved

etraut-openai added the needs-response Additional information is requested label Jan 30, 2026

fix: update docstring to clarify update_search_dir is only for resume

41e5f2c

yuvrajangadsingh requested a review from etraut-openai January 30, 2026 22:09

yuvrajangadsingh added 2 commits January 31, 2026 03:43

Merge branch 'main' into fix/file-search-cwd-update

73e6bf2

Merge branch 'main' into fix/file-search-cwd-update

e0ac91e

etraut-openai approved these changes Jan 30, 2026

View reviewed changes

etraut-openai removed the needs-response Additional information is requested label Jan 30, 2026

etraut-openai merged commit 13e85b1 into openai:main Jan 30, 2026
43 of 53 checks passed

github-actions bot locked and limited conversation to collaborators Jan 30, 2026

yuvrajangadsingh deleted the fix/file-search-cwd-update branch January 31, 2026 03:19

fix: update file search directory when session CWD changes #9279

fix: update file search directory when session CWD changes #9279

Uh oh!

Conversation

yuvrajangadsingh commented Jan 15, 2026

Summary

Problem

Solution

Test plan

Uh oh!

etraut-openai commented Jan 15, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

etraut-openai commented Jan 15, 2026

Uh oh!

yuvrajangadsingh commented Jan 16, 2026

Uh oh!

yuvrajangadsingh commented Jan 16, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

yuvrajangadsingh commented Jan 16, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

yuvrajangadsingh commented Jan 16, 2026

Uh oh!

chatgpt-codex-connector bot commented Jan 16, 2026

Uh oh!

Uh oh!

yuvrajangadsingh commented Jan 16, 2026

Uh oh!

yuvrajangadsingh commented Jan 16, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

yuvrajangadsingh commented Jan 16, 2026

Uh oh!

chatgpt-codex-connector bot commented Jan 16, 2026

Uh oh!

yuvrajangadsingh commented Jan 20, 2026

Uh oh!

chatgpt-codex-connector bot commented Jan 20, 2026

Uh oh!

yuvrajangadsingh commented Jan 20, 2026

Uh oh!

yuvrajangadsingh commented Jan 21, 2026

Uh oh!

chatgpt-codex-connector bot commented Jan 21, 2026

Uh oh!

yuvrajangadsingh commented Jan 22, 2026

Uh oh!

chatgpt-codex-connector bot commented Jan 22, 2026

Uh oh!

yuvrajangadsingh commented Jan 30, 2026

Uh oh!

chatgpt-codex-connector bot commented Jan 30, 2026

Uh oh!

etraut-openai left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

yuvrajangadsingh commented Jan 30, 2026

Uh oh!

Uh oh!

Reviewers