fix(tui): refresh prompt on model switch by cyq1017 · Pull Request #2534 · Hmbown/CodeWhale

cyq1017 · 2026-06-01T18:55:21Z

Refs #2379

Problem:

/model updated the engine model but only emitted a status event.
The session system prompt stayed stale until the next turn rebuilt it.

Change:

Carry the current mode with Op::SetModel.
Refresh the engine system prompt after model switches and emit SessionUpdated.
Cover configured instruction-file reload with a focused regression test.

Verification:

cargo test -p codewhale-tui set_model_reloads_instruction_sources_and_updates_session_prompt --locked
cargo test -p codewhale-tui model_change_update_syncs_engine_model_before_compaction --locked
cargo fmt --all -- --check
git diff --check

Greptile Summary

This PR fixes a bug (#2379) where using /model to switch the AI model updated the engine state but left the session system prompt stale until the next conversation turn. The fix carries AppMode in Op::SetModel, calls refresh_system_prompt(mode) in the engine handler, and emits SessionUpdated so the UI sees the refreshed prompt immediately.

Op::SetModel gains a mode: AppMode field; all six call sites in ui.rs are updated to pass app.mode, and the engine handler now calls refresh_system_prompt then emit_session_updated in the correct order (after the model and config are already updated).
Two focused regression tests are added: one verifying the instruction-file is re-read from disk on model switch, the other asserting that SetModel is sent before SetCompaction and now carries the correct mode.

Confidence Score: 4/5

Safe to merge; the model-switch stale-prompt bug is correctly fixed and all call sites are updated.

The core change is tight and correct — model, config, prompt refresh, and session event all happen in the right order. All six SetModel construction sites in ui.rs pass the current mode, and two regression tests cover both the instruction-file reload path and the op-ordering guarantee. The only gap is that Tab-cycling the mode without a model change still leaves the engine prompt stale, but that is a pre-existing limitation unrelated to the code introduced here.

No files require special attention; the one observation is in ui.rs around the Tab-cycle mode path.

Important Files Changed

Filename	Overview
crates/tui/src/core/engine.rs	Adds refresh_system_prompt(mode) and emit_session_updated() to the SetModel handler; ordering is correct — config.model is already updated before refresh_system_prompt reads it via model_id.
crates/tui/src/core/ops.rs	Adds mode: AppMode field to Op::SetModel with updated doc comment; no other changes.
crates/tui/src/tui/ui.rs	All six SetModel construction sites updated to pass app.mode; apply_model_and_compaction_update gains a mode parameter threaded through all callers.
crates/tui/src/core/engine/tests.rs	New regression test verifies instruction files are re-read from disk on model switch and the SessionUpdated event carries the refreshed prompt; loop correctly skips non-SessionUpdated events.
crates/tui/src/tui/ui/tests.rs	Existing test updated to pass app.mode and now also asserts the mode field on the received SetModel op.

Comments Outside Diff (1)

crates/tui/src/tui/ui.rs, line 3409-3418 (link)

Mode-only Tab-cycle leaves engine prompt stale

When the user presses Tab to cycle through Plan → Agent → Yolo, cycle_mode() changes app.mode but not app.model, so the app.model != prior_model guard is false and no Op::SetModel is ever sent. The engine's system prompt therefore stays stale until the next AI turn, even though the new mode uses different prompt content (e.g., Yolo enables auto-approval and alters the tooling section). Op::ChangeMode exists in the op-set but is never sent anywhere. With the refresh_system_prompt(mode) path now wired in SetModel, a sibling fix for pure mode changes would be straightforward — either send Op::SetModel { model: app.model.clone(), mode: app.mode } unconditionally when mode changes, or start sending Op::ChangeMode and call refresh_system_prompt there too.

_{Reviews (1): Last reviewed commit: "fix(tui): refresh prompt on model switch" | Re-trigger Greptile}

gemini-code-assist · 2026-06-01T18:55:43Z

Warning

You have reached your daily quota limit. Please wait up to 24 hours and I will start processing your requests again!

@cyq1017

Refs #2379 Harvested from PR #2534 by @cyq1017

Hmbown · 2026-06-01T23:16:36Z

Harvested #2534 into #2504 for v0.8.50 as 46de1a9b2, preserving @cyq1017's authored model-switch fix.

I also added a maintainer follow-up in bc7f98a6a for Greptile's mode-only stale-prompt concern. Op::ChangeMode now refreshes the system prompt and emits SessionUpdated, and UI mode-change paths forward the change to the engine for Tab, Alt shortcuts, mode picker selections, /mode, and plan-accept transitions.

Local validation on #2504 after the harvest:

cargo test -p codewhale-tui --all-features --locked set_model_reloads_instruction_sources_and_updates_session_prompt -- --nocapture
cargo test -p codewhale-tui --all-features --locked change_mode_refreshes_session_prompt_and_updates_session -- --nocapture
cargo test -p codewhale-tui --all-features --locked mode_change_update_notifies_engine -- --nocapture
cargo test -p codewhale-tui --all-features --locked test_mode_ -- --nocapture
cargo test -p codewhale-tui --all-features --locked model_change_update_syncs_engine_model_before_compaction -- --nocapture
cargo fmt --all -- --check
git diff --check
./scripts/release/check-versions.sh
cargo clippy -p codewhale-tui --all-targets --all-features --locked -- -D warnings

Thanks for the focused fix. Once #2504 lands, this draft PR should be treated as superseded by the release harvest.

github-actions · 2026-06-02T04:41:04Z

Thanks @cyq1017 — your contribution landed in bc7f98a6a00c on main:

fix(tui): refresh prompt on mode changes

Closing this PR now that the code is on main. Credit lives in the commit message and (where applicable) the CHANGELOG.md entry for the next release. Apologies for not closing this at the time of the merge — the auto-close workflow is new in v0.8.31.

If you want to land more work and would prefer your future PRs merge cleanly without a harvest step, the CONTRIBUTING.md doc has a short note on what makes a contribution mergeable as-is.

fix(tui): refresh prompt on model switch

ec679a5

Hmbown added a commit that referenced this pull request Jun 1, 2026

fix(tui): refresh prompt on mode changes

bc7f98a

Refs #2379 Harvested from PR #2534 by @cyq1017

Hmbown mentioned this pull request Jun 1, 2026

[codex] v0.8.50 triage harvest #2504

Merged

Hmbown mentioned this pull request Jun 1, 2026

Reload instructions.md when switching models in-session #2379

Closed

github-actions Bot closed this Jun 2, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(tui): refresh prompt on model switch#2534

fix(tui): refresh prompt on model switch#2534
cyq1017 wants to merge 1 commit into
Hmbown:mainfrom
cyq1017:codex/2379-reload-instructions

cyq1017 commented Jun 1, 2026 •

edited by greptile-apps Bot

Loading

Uh oh!

gemini-code-assist Bot commented Jun 1, 2026

Uh oh!

Hmbown commented Jun 1, 2026

Uh oh!

github-actions Bot commented Jun 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

cyq1017 commented Jun 1, 2026 • edited by greptile-apps Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Greptile Summary

Confidence Score: 4/5

Important Files Changed

Comments Outside Diff (1)

Uh oh!

gemini-code-assist Bot commented Jun 1, 2026

Uh oh!

Hmbown commented Jun 1, 2026

Uh oh!

github-actions Bot commented Jun 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

cyq1017 commented Jun 1, 2026 •

edited by greptile-apps Bot

Loading