Ask for cwd choice when resuming session from different cwd #9731

charley-oai · 2026-01-23T01:50:23Z

Summary

Fix resume/fork config rebuild so cwd changes inside the TUI produce a fully rebuilt Config (trust/approval/sandbox) instead of mutating only the cwd.
Preserve --add-dir behavior across resume/fork by normalizing relative roots to absolute paths once (based on the original cwd).
Prefer latest TurnContext.cwd for resume/fork prompts but fall back to SessionMeta.cwd if the latest cwd no longer exists.
Align resume/fork selection handling and ensure UI config matches the resumed thread config.
Fix Windows test TOML path escaping in trust-level test.

Details

Rebuild Config via ConfigBuilder when resuming into a different cwd; carry forward runtime approval/sandbox overrides.
Add normalize_harness_overrides_for_cwd to resolve relative additional_writable_roots against the initial cwd before reuse.
Guard read_session_cwd with filesystem existence check for the latest TurnContext.cwd.
Update naming/flow around cwd comparison and prompt selection.

And proof the model understands the new cwd:

charley-oai · 2026-01-23T01:50:31Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d7dc8bd072

ℹ️ 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/lib.rs

charley-oai · 2026-01-23T02:47:50Z

@codex review this

chatgpt-codex-connector · 2026-01-23T02:52:06Z

Codex Review: Didn't find any major issues. Chef's kiss.

ℹ️ 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".

charley-oai · 2026-01-23T02:53:47Z

codex-rs/tui/src/cwd_prompt.rs

@@ -0,0 +1,281 @@
+use std::path::Path;


This CWD prompt is consistent with other full‑screen startup overlays in the TUI. The codebase has two UI patterns:

1) Full‑screen, bespoke overlays (custom WidgetRef)
Handwritten screens that render their own layout:

codex-rs/tui/src/update_prompt.rs (update available)

codex-rs/tui/src/oss_selection.rs (OSS provider selection)

codex-rs/tui/src/onboarding/* (welcome/auth/trust screens)

codex-rs/tui/src/resume_picker.rs (resume/fork picker)

These use shared low‑level helpers like ColumnRenderable, selection_option_row, and key_hint—the same approach as the CWD prompt.

2) Bottom‑pane popups with shared components
Reusable selection/popup system used inside the chat UI:

codex-rs/tui/src/bottom_pane/selection_popup_common.rs

codex-rs/tui/src/bottom_pane/list_selection_view.rs

many chatwidget popups via SelectionViewParams

Conclusion: For a startup/resume prompt, a bespoke full‑screen overlay is aligned with existing practice. There isn’t a single generic modal used across all startup screens, and
this prompt already reuses the common low‑level helpers.

justjxke · 2026-01-23T04:35:34Z

Love this!

joshka-oai

LGTM

charley-oai · 2026-01-24T01:40:33Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

codex/codex-rs/tui/src/app.rs

Lines 811 to 814 in 82e97f6

    
           let init = self.chatwidget_init_for_forked_or_resumed_thread( 
        
               tui, 
        
               self.config.clone(), 
        
           );

Propagate chosen cwd into resumed ChatWidget config

When the new cwd prompt returns CwdSelection::Session, resume_config.cwd can differ from self.config.cwd, but the resumed widget is still initialized with self.config.clone(). That leaves the UI using the old cwd even though the underlying thread was spawned with the selected cwd, which is observable because history_cell::new_session_info renders config.cwd and chatwidget::skills::set_skills_from_response filters skills by self.config.cwd. This mismatch occurs specifically when resuming from a different directory and choosing the session directory.

ℹ️ 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".

charley-oai · 2026-01-24T03:36:56Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: dfec8cf863

ℹ️ 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

charley-oai · 2026-01-24T04:46:57Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4c1188001c

ℹ️ 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/lib.rs

charley-oai · 2026-01-24T05:22:51Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ad265edd7a

ℹ️ 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

charley-oai · 2026-01-24T06:37:08Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a02710a7fd

ℹ️ 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/lib.rs

charley-oai · 2026-01-24T06:45:27Z

@codex review this

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a02710a7fd

ℹ️ 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/lib.rs

chatgpt-codex-connector bot reviewed Jan 23, 2026

View reviewed changes

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

charley-oai marked this pull request as ready for review January 23, 2026 02:06

charley-oai requested a review from aibrahim-oai January 23, 2026 02:49

charley-oai commented Jan 23, 2026

View reviewed changes

joshka-oai approved these changes Jan 23, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Jan 24, 2026

View reviewed changes

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

chatgpt-codex-connector bot reviewed Jan 24, 2026

View reviewed changes

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

chatgpt-codex-connector bot reviewed Jan 24, 2026

View reviewed changes

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

charley-oai added 12 commits January 23, 2026 22:33

Ask for cwd choice when resuming session from different cwd

d5cdc69

Don't prompt if cwd unchanged from last resume

2f380e9

Code quality improvements

8886c0a

Code quality

5d535a1

Only show paths once

d46b87a

Tweak wording

65f726a

Cover /resume codepath

4234566

Fix /resume

acb11bd

Properly rebuild config in /review case

0d22d7d

Lint

6a1209a

Fix windows test

e17cbb0

Normalize --add-dir roots to absolute paths

a02710a

charley-oai force-pushed the ask-for-cwd-upon-resume-from-different-cwd branch from 5d60581 to a02710a Compare January 24, 2026 06:36

chatgpt-codex-connector bot reviewed Jan 24, 2026

View reviewed changes

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

chatgpt-codex-connector bot reviewed Jan 24, 2026

View reviewed changes

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

charley-oai merged commit 18acec0 into main Jan 25, 2026
51 of 53 checks passed

charley-oai deleted the ask-for-cwd-upon-resume-from-different-cwd branch January 25, 2026 05:57

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

	let init = self.chatwidget_init_for_forked_or_resumed_thread(
	tui,
	self.config.clone(),
	);

Ask for cwd choice when resuming session from different cwd #9731

Ask for cwd choice when resuming session from different cwd #9731

Uh oh!

Conversation

charley-oai commented Jan 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Details

Uh oh!

charley-oai commented Jan 23, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

charley-oai commented Jan 23, 2026

Uh oh!

chatgpt-codex-connector bot commented Jan 23, 2026

Uh oh!

charley-oai Jan 23, 2026

Choose a reason for hiding this comment

Uh oh!

justjxke commented Jan 23, 2026

Uh oh!

joshka-oai left a comment

Choose a reason for hiding this comment

Uh oh!

charley-oai commented Jan 24, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

charley-oai commented Jan 24, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

charley-oai commented Jan 24, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

charley-oai commented Jan 24, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

charley-oai commented Jan 24, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

charley-oai commented Jan 24, 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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

charley-oai commented Jan 23, 2026 •

edited

Loading