Skip to content

fix: prevent subagent model changes from persisting to parent #6668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elithrar wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

fix: prevent subagent model changes from persisting to parent #6668

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dd388b
fix: prevent subagent model changes from persisting to parent
elithrar Jan 2, 2026
23936fa
Merge branch 'dev' into fix/subagent-model-isolation
elithrar Jan 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ export function Prompt(props: PromptProps) {
})

// Initialize agent/model/variant from last user message when session changes
// Skip syncing for subagent sessions to prevent model/agent bleed to parent
let syncedSessionID: string | undefined
createEffect(() => {
const sessionID = props.sessionID
Expand All @@ -140,11 +141,11 @@ export function Prompt(props: PromptProps) {

syncedSessionID = sessionID

// Only set agent if it's a primary agent (not a subagent)
const isPrimaryAgent = local.agent.list().some((x) => x.name === msg.agent)
if (msg.agent && isPrimaryAgent) {
local.agent.set(msg.agent)
}
// Don't sync model/agent for subagent sessions (sessions with parentID)
const session = sync.data.session.find((s) => s.id === sessionID)
if (session?.parentID) return

if (msg.agent) local.agent.set(msg.agent)
if (msg.model) local.model.set(msg.model)
if (msg.variant) local.model.variant.set(msg.variant)
}
Expand Down