feat: remember workspace model and mode on send by ibetitsmike · Pull Request #3968 · coder/xum

ibetitsmike · 2026-08-25T16:40:54Z

Summary

Remember each workspace's model and mode when the user sends a message, using the existing send-time persistence. Picker changes stay local. Synthetic turns and stream resumes do not replace the saved selection.

Fresh or reloaded clients restore the last submitted choices. Already-open composers deliberately do not live-sync later metadata, so delayed send echoes cannot overwrite unsent choices. ACP keeps one active draft; switching to another mode restores that mode's saved settings, without retaining a history of unsent per-mode drafts.

Removed picker-time writes, pending guards, rollback/serialization machinery, and the unrelated descriptor expansion from the previous implementation. The full PR is 304 additions and 515 deletions across 16 files, down from 3,279 additions across 36 files.

Validation

make static-check passed using pinned Bun 1.3.5.
590 affected workspace-service, browser, thinking, and ACP tests passed.
Red-green coverage for initial restoration, preserving open-composer choices, synthetic/resume exclusions, malformed model choices, and ACP prompt settings.

Model settings already synced through backend metadata, but the active agent (mode) was client-local: sends persisted workspaceEntry.agentId, yet main workspaces never re-seeded it and picker switches never wrote it back, so a fresh client always fell back to exec and seeded the wrong agent's model. - AgentContext now persists workspace mode switches via updateAgentAISettings(persistSelectedAgentId), with aiSettings allowed to be null so a mode switch cannot clobber stored settings. - WorkspaceContext seeds agentId from metadata for main workspaces too, guarded by a pending-echo check (same pattern as model settings) so stale broadcasts cannot revert an in-flight local switch. This supersedes the #3178 gate, which existed because local switches were never written back. - ProposePlanToolCall marks the pending agent before its follow-up send persists the switch. --- _Generated with `xum` • Model: `anthropic:claude-fable-5` • Thinking: `xhigh`_

ibetitsmike · 2026-08-25T16:41:21Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: dfbedb12c4

ℹ️ 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 review feedback on #3968: - AgentContext rolls the optimistic local mode switch back when the backend write fails (unless the user re-switched meanwhile), so a client cannot silently diverge from the backend-authoritative agent. - ProposePlan handlers clear the pending agent guard when the follow-up send fails (failed Result or throw); a stuck guard would block all backend agent seeds for the workspace. --- _Generated with `xum` • Model: `anthropic:claude-fable-5` • Thinking: `xhigh`_

ibetitsmike · 2026-08-25T16:55:41Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4103151aff

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

- Release the pending agent guard deterministically once persistence or the ProposePlan follow-up send settles: a successful no-op write emits no metadata echo, which previously stranded the guard and blocked all later cross-client agent updates. Real echoes are ordered after stale broadcasts, so releasing on the response cannot strand a stale value. - Never hydrate another agent's settings: workspace seeding now only applies model/thinking from the ACTIVE agent's own bucket instead of falling back to exec/plan, which overwrote locally resolved settings for bucket-less agents after an agent-only switch. - Apply the budgeted-goal pricing gate to agent-only switches using the target agent's stored model (bucket, then legacy settings), matching what heartbeat/goal-continuation dispatch would resolve. --- _Generated with `xum` • Model: `anthropic:claude-fable-5` • Thinking: `xhigh`_

ibetitsmike · 2026-08-25T17:32:10Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: bf11f76b9d

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

Round-3 Codex finding: the pricing gate only looked at the stored workspace bucket/legacy settings, but goal-continuation kickoff also resolves configured and definition defaults. Extract the kickoff resolution into resolveContinuationKickoffSendOptionsForAgent (shared by getGoalContinuationKickoffSendOptions) and gate the agent-only switch on the exact model that resolution selects, including the plan/compact -> exec dispatch remap. --- _Generated with `xum` • Model: `anthropic:claude-fable-5` • Thinking: `xhigh`_

ibetitsmike · 2026-08-25T17:44:32Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: cd2228a734

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

- ProposePlan explicitly persists the agent selection after a successful send (send-side persistence only logs failures), releasing the pending guard afterwards either way so clients converge on the backend agent. - The budgeted-goal pricing gate probes both dispatch surfaces: the continuation kickoff (plan/compact remapped to exec) and the heartbeat surface, which resolves the persisted agent without the remap. --- _Generated with `xum` • Model: `anthropic:claude-fable-5` • Thinking: `xhigh`_

ibetitsmike · 2026-08-25T17:59:43Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: badc083c61

ℹ️ 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 round 5 follow-ups: - ProposePlan now honors the explicit selection persistence Result: a failed or thrown updateAgentAISettings (and a failed send) rolls the optimistic plan→exec/auto switch back — agent id plus the pre-switch model/thinking/reasoning settings — unless the user already moved on. - AgentContext rollback restores the pre-switch model settings alongside the agent id, so WorkspaceModeAISync's fallback cannot leave the restored agent on the target agent's just-applied settings. - The budgeted-goal pricing gate probes the heartbeat surface through the real heartbeat resolution (extracted resolveHeartbeatAiSettings, shared with buildHeartbeatSendOptions), which includes the activity snapshot's last-used model fallback the previous probe missed. _Generated with `mux` • Model: claude-x-large-4.6 • Thinking: max_

ibetitsmike · 2026-08-25T18:27:59Z

@codex review

ibetitsmike · 2026-08-25T18:29:50Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2d9d468281

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

…es, surface switch errors

ibetitsmike · 2026-08-25T18:51:02Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c53bc5bc8a

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

ibetitsmike · 2026-08-27T08:55:53Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 25acf9250e

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

ibetitsmike · 2026-08-27T10:08:43Z

@codex review

chatgpt-codex-connector

💡 Codex Review

xum/src/browser/utils/workspaceAiSettingsSync.ts

Lines 112 to 116 in 2fd2af9

    
           export function clearPendingWorkspaceAiSettings(workspaceId: string, agentId: string): void { 
        
             if (!workspaceId || !agentId) { 
        
               return; 
        
             } 
        
             pendingAiSettingsByWorkspace.delete(getPendingKey(workspaceId, agentId));

Retain the newest settings guard across older failures

When two same-agent changes are queued, markPendingWorkspaceAiSettings replaces the first snapshot with the second, but an unsuccessful first RPC still calls this agent-key-only clear and deletes the second change's guard while its serialized write is in preflight. A stale metadata broadcast can then overwrite the newer local settings; if the user sends in that window, the captured stale options queue behind and ultimately overwrite the newer backend bucket. Fresh evidence beyond the earlier stale-metadata guard thread is this overlapping failure ordering; track pending generations/counts and clear only the matching request.

AGENTS.md reference: AGENTS.md:L150-L150

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

ibetitsmike · 2026-08-27T10:27:50Z

@codex review

chatgpt-codex-connector

💡 Codex Review

xum/src/browser/utils/workspaceAiSettingsSync.ts

Lines 112 to 116 in 9cd6bf6

    
           export function clearPendingWorkspaceAiSettings(workspaceId: string, agentId: string): void { 
        
             if (!workspaceId || !agentId) { 
        
               return; 
        
             } 
        
             pendingAiSettingsByWorkspace.delete(getPendingKey(workspaceId, agentId));

Clear only the matching pending settings write

When two writes for the same workspace and agent overlap, this unconditional delete lets an older failed or settled operation erase the newer operation's pending snapshot. For example, after two rapid model choices, a transport failure or typed rejection of the first write invokes this helper while the second serialized write is still running; stale backend metadata is then accepted and can overwrite the latest local choice before the second write completes. Associate clears with the expected snapshot or a generation/count so an older operation cannot release a newer guard.

AGENTS.md reference: AGENTS.md:L150-L150

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

ibetitsmike · 2026-09-04T11:15:59Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 96209923fe

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

ibetitsmike · 2026-09-04T11:26:17Z

@codex review

Please review the reduced send-only implementation at 866d4c7, now reconciled with current main.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 866d4c7d41

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

ibetitsmike · 2026-09-04T11:38:48Z

@codex review

Please review the narrowed send-only contract documented in the description. Initial-load restoration only, no live synchronization or per-agent unsent draft history. Latest head is c841243.

chatgpt-codex-connector · 2026-09-04T11:43:22Z

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

Reviewed commit: c841243f07

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

ibetitsmike · 2026-09-04T12:02:01Z

The reduced implementation has a clean Codex code/security verdict on c841243, zero unresolved review threads, passing local static checks, and 590 passing affected tests. The full CI unit job crashed inside Bun 1.3.5 twice (exit 132, native segmentation fault, no failing test assertions); the retry reached a different test before the same native crash. The first crash-site suite passes locally with coverage. I am leaving this runtime/CI blocker separate rather than expanding the persistence PR with unrelated runtime workarounds.

This comment has been minimized.

Sign in to view

chatgpt-codex-connector Bot reviewed Aug 25, 2026

View reviewed changes

Comment thread src/browser/contexts/AgentContext.tsx Outdated

Comment thread src/browser/features/Tools/ProposePlanToolCall.tsx Outdated

This comment has been minimized.

Sign in to view

chatgpt-codex-connector Bot reviewed Aug 25, 2026

View reviewed changes

Comment thread src/browser/utils/workspaceAiSettingsSync.ts Outdated

Comment thread src/browser/contexts/WorkspaceContext.tsx Outdated

Comment thread src/node/services/workspaceService.ts Outdated

This comment has been minimized.

Sign in to view

chatgpt-codex-connector Bot reviewed Aug 25, 2026

View reviewed changes

Comment thread src/node/services/workspaceService.ts Outdated

This comment has been minimized.

Sign in to view

chatgpt-codex-connector Bot reviewed Aug 25, 2026

View reviewed changes

Comment thread src/browser/features/Tools/ProposePlanToolCall.tsx Outdated

Comment thread src/node/services/workspaceService.ts

This comment has been minimized.

Sign in to view

chatgpt-codex-connector Bot reviewed Aug 25, 2026

View reviewed changes

Comment thread src/browser/features/Tools/ProposePlanToolCall.tsx Outdated

Comment thread src/node/services/workspaceService.ts Outdated

Comment thread src/browser/contexts/AgentContext.tsx Outdated

This comment has been minimized.

Sign in to view

chatgpt-codex-connector Bot reviewed Aug 25, 2026

View reviewed changes

Comment thread src/browser/features/Tools/ProposePlanToolCall.tsx Outdated

Comment thread src/browser/contexts/WorkspaceContext.tsx Outdated

Comment thread src/browser/contexts/AgentContext.tsx Outdated

🤖 fix: restore backend agent on failed sends, persist ACP mode switch…

c53bc5b

…es, surface switch errors

This comment has been minimized.

Sign in to view

chatgpt-codex-connector Bot reviewed Aug 25, 2026

View reviewed changes

Comment thread src/browser/features/Tools/ProposePlanToolCall.tsx Outdated

Comment thread src/node/services/workspaceService.ts Outdated

Comment thread src/node/acp/configOptions.ts Outdated

ibetitsmike added 2 commits August 27, 2026 08:14

🤖 fix: snapshot latest settings when forking

e8c902e

🤖 fix: serialize ACP workspace AI writes

25acf92

This comment has been minimized.

Sign in to view

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread src/browser/contexts/AgentContext.tsx Outdated

Comment thread src/browser/contexts/AgentContext.tsx Outdated

Comment thread src/node/orpc/router.ts Outdated

ibetitsmike added 3 commits August 27, 2026 09:19

🤖 fix: keep built-in agent switching available

7f95564

🤖 fix: guard switched agent settings from stale metadata

c3598ac

🤖 fix: preserve hidden agent ancestry defaults

2fd2af9

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread src/browser/utils/workspaceModeAi.ts Outdated

This comment has been minimized.

Sign in to view

🤖 fix: honor workspace buckets during background sync

9cd6bf6

This comment has been minimized.

Sign in to view

chatgpt-codex-connector Bot reviewed Aug 27, 2026

View reviewed changes

Comment thread src/browser/utils/workspaceModeAi.ts Outdated

Comment thread src/browser/features/Tools/ProposePlanToolCall.tsx Outdated

Comment thread src/node/acp/resolveAgentAiSettings.ts Outdated

refactor: persist workspace selections only on send

9620992

This comment has been minimized.

Sign in to view

ibetitsmike changed the title ~~🤖 feat: remember last used model and mode per workspace across clients~~ feat: remember workspace model and mode on send Sep 4, 2026

This comment has been minimized.

Sign in to view

chatgpt-codex-connector Bot reviewed Sep 4, 2026

View reviewed changes

Comment thread src/browser/contexts/WorkspaceContext.tsx Outdated

Comment thread src/node/acp/configOptions.ts Outdated

Comment thread src/browser/utils/workspaceModeAi.ts Outdated

Merge main and reconcile send-only persistence tests

866d4c7

chatgpt-codex-connector Bot reviewed Sep 4, 2026

View reviewed changes

Comment thread src/node/acp/configOptions.ts

This comment has been minimized.

Sign in to view

fix: restore workspace choices only on initial load

c841243

This comment has been minimized.

Sign in to view

	export function clearPendingWorkspaceAiSettings(workspaceId: string, agentId: string): void {
	if (!workspaceId \|\| !agentId) {
	return;
	}
	pendingAiSettingsByWorkspace.delete(getPendingKey(workspaceId, agentId));

Uh oh!

Conversation

ibetitsmike commented Aug 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Validation

Uh oh!

ibetitsmike commented Aug 25, 2026

Uh oh!

This comment has been minimized.

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

ibetitsmike commented Aug 25, 2026

Uh oh!

This comment has been minimized.

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ibetitsmike commented Aug 25, 2026

Uh oh!

This comment has been minimized.

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

ibetitsmike commented Aug 25, 2026

Uh oh!

This comment has been minimized.

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

ibetitsmike commented Aug 25, 2026

Uh oh!

This comment has been minimized.

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ibetitsmike commented Aug 25, 2026

Uh oh!

This comment has been minimized.

ibetitsmike commented Aug 25, 2026

Uh oh!

This comment has been minimized.

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ibetitsmike commented Aug 25, 2026

Uh oh!

This comment has been minimized.

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ibetitsmike commented Aug 27, 2026

Uh oh!

This comment has been minimized.

chatgpt-codex-connector Bot left a comment

ibetitsmike commented Aug 25, 2026 •

edited

Loading