fix(plugin): persist selected model only for main session

Reuse the stored model only for subsequent main-session messages when the UI provides no model, while preserving first-message behavior, explicit overrides, and subagent isolation.

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
YeonGyu-Kim
2026-03-24 18:11:27 +09:00
parent 4bba924dad
commit 7fa2417c42
2 changed files with 169 additions and 4 deletions
+63 -3
View File
@@ -2,8 +2,8 @@ import type { OhMyOpenCodeConfig } from "../config"
import type { PluginContext } from "./types"
import { hasConnectedProvidersCache } from "../shared"
import { setSessionModel } from "../shared/session-model-state"
import { setSessionAgent } from "../features/claude-code-session-state"
import { getSessionModel, setSessionModel } from "../shared/session-model-state"
import { getMainSessionID, setSessionAgent, subagentSessions } from "../features/claude-code-session-state"
import { applyUltraworkModelOverrideOnMessage } from "./ultrawork-model-override"
import { parseRalphLoopArguments } from "../hooks/ralph-loop/command-arguments"
@@ -23,6 +23,8 @@ export type ChatMessageInput = {
}
type StartWorkHookOutput = { parts: Array<{ type: string; text?: string }> }
type SessionModelOverride = { providerID: string; modelID: string }
function isStartWorkHookOutput(value: unknown): value is StartWorkHookOutput {
if (typeof value !== "object" || value === null) return false
const record = value as Record<string, unknown>
@@ -35,6 +37,53 @@ function isStartWorkHookOutput(value: unknown): value is StartWorkHookOutput {
})
}
function hasExplicitAgentModelOverride(
agent: string | undefined,
pluginConfig: OhMyOpenCodeConfig
): boolean {
const configuredAgents = pluginConfig.agents
if (!agent || !configuredAgents || !(agent in configuredAgents)) {
return false
}
const configuredAgent = configuredAgents[agent as keyof typeof configuredAgents]
const configuredModel = configuredAgent?.model
return typeof configuredModel === "string" && configuredModel.trim().length > 0
}
function getStoredMainSessionModel(
input: ChatMessageInput,
pluginConfig: OhMyOpenCodeConfig,
isFirstMessage: boolean,
output: ChatMessageHandlerOutput
): SessionModelOverride | undefined {
if (isFirstMessage) {
return undefined
}
if (subagentSessions.has(input.sessionID)) {
return undefined
}
if (getMainSessionID() !== input.sessionID) {
return undefined
}
if (input.model) {
return undefined
}
if (output.message["model"] !== undefined) {
return undefined
}
if (hasExplicitAgentModelOverride(input.agent, pluginConfig)) {
return undefined
}
return getSessionModel(input.sessionID)
}
export function createChatMessageHandler(args: {
ctx: PluginContext
pluginConfig: OhMyOpenCodeConfig
@@ -74,10 +123,21 @@ export function createChatMessageHandler(args: {
setSessionAgent(input.sessionID, input.agent)
}
if (firstMessageVariantGate.shouldOverride(input.sessionID)) {
const isFirstMessage = firstMessageVariantGate.shouldOverride(input.sessionID)
if (isFirstMessage) {
firstMessageVariantGate.markApplied(input.sessionID)
}
const storedMainSessionModel = getStoredMainSessionModel(
input,
pluginConfig,
isFirstMessage,
output,
)
if (storedMainSessionModel) {
output.message["model"] = storedMainSessionModel
}
if (!isRuntimeFallbackEnabled) {
await hooks.modelFallback?.["chat.message"]?.(input, output)
}