Merge origin/main into bb/tui-parity-mutating-commands

Resolve session command merge conflict and keep the branch current with main so PR #16656 is mergeable.
This commit is contained in:
Brooklyn Nicholson 2026-04-27 12:51:11 -05:00
commit 8bd5d0667a
8 changed files with 27 additions and 23 deletions

View file

@ -26,7 +26,7 @@ describe('createSlashHandler', () => {
expect(ctx.gateway.gw.request).not.toHaveBeenCalled()
})
it('persists typed /model switches by default', async () => {
it('keeps typed /model switches session-scoped by default', async () => {
patchUiState({ sid: 'sid-abc' })
const ctx = buildCtx({
@ -40,7 +40,7 @@ describe('createSlashHandler', () => {
expect(ctx.gateway.rpc).toHaveBeenCalledWith('config.set', {
key: 'model',
session_id: 'sid-abc',
value: 'x-model --global'
value: 'x-model'
})
})