0b9cc80ecf
Sub-agent sessions created via the task tool or call_omo_agent tool were
being created without a model. The resolved model was only passed as a
promptAsync body override, which opencode core ignores, causing fallback
to the client's system default model (often a reasoning model that hangs).
OpenCode's session.create API supports model: { id, providerID, variant }
at creation time. This fix ensures the resolved category/agent model is
passed during session creation across all paths:
- createSyncSession() (delegate task / category-based)
- createOrGetSession() (call_omo_agent / direct agent calls)
- BackgroundManager.startTask() (background tasks)
This guarantees each sub-agent session is created with the correct model
regardless of whether promptAsync honors its model override.
148 lines
5.3 KiB
TypeScript
148 lines
5.3 KiB
TypeScript
import type { CallOmoAgentArgs } from "./types"
|
|
import type { PluginInput } from "@opencode-ai/plugin"
|
|
import { subagentSessions, syncSubagentSessions } from "../../features/claude-code-session-state"
|
|
import { getAgentToolRestrictions, log } from "../../shared"
|
|
import { applySessionPromptParams } from "../../shared/session-prompt-params-helpers"
|
|
import type { DelegatedModelConfig } from "../../shared/model-resolution-types"
|
|
import type { FallbackEntry } from "../../shared/model-requirements"
|
|
import { stripAgentListSortPrefix } from "../../shared/agent-display-names"
|
|
import { waitForCompletion } from "./completion-poller"
|
|
import { processMessages } from "./message-processor"
|
|
import { createOrGetSession } from "./session-creator"
|
|
|
|
type SessionWithPromptAsync = {
|
|
promptAsync: (opts: { path: { id: string }; body: Record<string, unknown> }) => Promise<unknown>
|
|
}
|
|
|
|
type ExecuteSyncDeps = {
|
|
createOrGetSession: typeof createOrGetSession
|
|
waitForCompletion: typeof waitForCompletion
|
|
processMessages: typeof processMessages
|
|
setSessionFallbackChain: (sessionID: string, fallbackChain: FallbackEntry[] | undefined) => void
|
|
clearSessionFallbackChain: (sessionID: string) => void
|
|
}
|
|
|
|
type SpawnReservation = {
|
|
commit: () => number
|
|
rollback: () => void
|
|
}
|
|
|
|
const defaultDeps: ExecuteSyncDeps = {
|
|
createOrGetSession,
|
|
waitForCompletion,
|
|
processMessages,
|
|
setSessionFallbackChain: () => {},
|
|
clearSessionFallbackChain: () => {},
|
|
}
|
|
|
|
function buildPromptGenerationParams(model: DelegatedModelConfig | undefined): Record<string, unknown> {
|
|
if (!model) {
|
|
return {}
|
|
}
|
|
|
|
const promptOptions: Record<string, unknown> = {
|
|
...(model.reasoningEffort ? { reasoningEffort: model.reasoningEffort } : {}),
|
|
...(model.thinking ? { thinking: model.thinking } : {}),
|
|
}
|
|
|
|
return {
|
|
...(model.temperature !== undefined ? { temperature: model.temperature } : {}),
|
|
...(model.top_p !== undefined ? { topP: model.top_p } : {}),
|
|
...(model.maxTokens !== undefined ? { maxOutputTokens: model.maxTokens } : {}),
|
|
...(Object.keys(promptOptions).length > 0 ? { options: promptOptions } : {}),
|
|
}
|
|
}
|
|
|
|
export async function executeSync(
|
|
args: CallOmoAgentArgs,
|
|
toolContext: {
|
|
sessionID: string
|
|
messageID: string
|
|
agent: string
|
|
abort: AbortSignal
|
|
metadata?: (input: { title?: string; metadata?: Record<string, unknown> }) => void | Promise<void>
|
|
},
|
|
ctx: PluginInput,
|
|
deps: ExecuteSyncDeps = defaultDeps,
|
|
fallbackChain?: FallbackEntry[],
|
|
spawnReservation?: SpawnReservation,
|
|
model?: DelegatedModelConfig,
|
|
): Promise<string> {
|
|
let sessionID: string | undefined
|
|
let createdSessionForExecution = false
|
|
let appliedFallbackChain = false
|
|
|
|
try {
|
|
const session = await deps.createOrGetSession(args, toolContext, ctx, model)
|
|
sessionID = session.sessionID
|
|
createdSessionForExecution = session.isNew
|
|
subagentSessions.add(sessionID)
|
|
syncSubagentSessions.add(sessionID)
|
|
|
|
if (session.isNew) {
|
|
spawnReservation?.commit()
|
|
}
|
|
|
|
if (fallbackChain && fallbackChain.length > 0) {
|
|
deps.setSessionFallbackChain(sessionID, fallbackChain)
|
|
appliedFallbackChain = true
|
|
}
|
|
|
|
applySessionPromptParams(sessionID, model)
|
|
|
|
await Promise.resolve(
|
|
toolContext.metadata?.({
|
|
title: args.description,
|
|
metadata: { sessionId: sessionID },
|
|
})
|
|
)
|
|
|
|
log(`[call_omo_agent] Sending prompt to session ${sessionID}`)
|
|
log(`[call_omo_agent] Prompt text:`, args.prompt.substring(0, 100))
|
|
const normalizedSubagentType = stripAgentListSortPrefix(args.subagent_type)
|
|
|
|
try {
|
|
await (ctx.client.session as unknown as SessionWithPromptAsync).promptAsync({
|
|
path: { id: sessionID },
|
|
body: {
|
|
agent: normalizedSubagentType,
|
|
tools: {
|
|
...getAgentToolRestrictions(normalizedSubagentType),
|
|
task: false,
|
|
question: false,
|
|
},
|
|
parts: [{ type: "text", text: args.prompt }],
|
|
...(model ? { model: { providerID: model.providerID, modelID: model.modelID } } : {}),
|
|
...(model?.variant ? { variant: model.variant } : {}),
|
|
...buildPromptGenerationParams(model),
|
|
},
|
|
})
|
|
} catch (error) {
|
|
const errorMessage = error instanceof Error ? error.message : String(error)
|
|
log(`[call_omo_agent] Prompt error:`, errorMessage)
|
|
if (errorMessage.includes("agent.name") || errorMessage.includes("undefined")) {
|
|
return `Error: Agent "${normalizedSubagentType}" not found. Make sure the agent is registered in your opencode.json or provided by a plugin.\n\n<task_metadata>\nsession_id: ${sessionID}\n</task_metadata>`
|
|
}
|
|
return `Error: Failed to send prompt: ${errorMessage}\n\n<task_metadata>\nsession_id: ${sessionID}\n</task_metadata>`
|
|
}
|
|
|
|
await deps.waitForCompletion(sessionID, toolContext, ctx)
|
|
|
|
const responseText = await deps.processMessages(sessionID, ctx)
|
|
|
|
return responseText + "\n\n" + ["<task_metadata>", `session_id: ${sessionID}`, "</task_metadata>"].join("\n")
|
|
} catch (error) {
|
|
spawnReservation?.rollback()
|
|
throw error
|
|
} finally {
|
|
if (sessionID && appliedFallbackChain) {
|
|
deps.clearSessionFallbackChain(sessionID)
|
|
}
|
|
|
|
if (sessionID && createdSessionForExecution) {
|
|
subagentSessions.delete(sessionID)
|
|
syncSubagentSessions.delete(sessionID)
|
|
}
|
|
}
|
|
}
|