refactor(cli): simplify model fallback using new resolution system
Replace complex fallback logic with new shared model resolution utilities. The model-fallback module now delegates to resolveModelWithFallback() for cleaner, consistent model selection across the codebase. Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
justsisyphus
+80
-146
@@ -1,17 +1,10 @@
|
||||
import {
|
||||
AGENT_MODEL_REQUIREMENTS,
|
||||
CATEGORY_MODEL_REQUIREMENTS,
|
||||
type FallbackEntry,
|
||||
} from "../shared/model-requirements"
|
||||
import type { InstallConfig } from "./types"
|
||||
|
||||
type NativeProvider = "claude" | "openai" | "gemini"
|
||||
|
||||
type ModelCapability =
|
||||
| "unspecified-high"
|
||||
| "unspecified-low"
|
||||
| "quick"
|
||||
| "ultrabrain"
|
||||
| "visual-engineering"
|
||||
| "artistry"
|
||||
| "writing"
|
||||
| "glm"
|
||||
|
||||
interface ProviderAvailability {
|
||||
native: {
|
||||
claude: boolean
|
||||
@@ -41,106 +34,8 @@ export interface GeneratedOmoConfig {
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
interface NativeFallbackEntry {
|
||||
provider: NativeProvider
|
||||
model: string
|
||||
}
|
||||
|
||||
const NATIVE_FALLBACK_CHAINS: Record<ModelCapability, NativeFallbackEntry[]> = {
|
||||
"unspecified-high": [
|
||||
{ provider: "claude", model: "anthropic/claude-opus-4-5" },
|
||||
{ provider: "openai", model: "openai/gpt-5.2" },
|
||||
{ provider: "gemini", model: "google/gemini-3-pro-preview" },
|
||||
],
|
||||
"unspecified-low": [
|
||||
{ provider: "claude", model: "anthropic/claude-sonnet-4-5" },
|
||||
{ provider: "openai", model: "openai/gpt-5.2" },
|
||||
{ provider: "gemini", model: "google/gemini-3-flash-preview" },
|
||||
],
|
||||
quick: [
|
||||
{ provider: "claude", model: "anthropic/claude-haiku-4-5" },
|
||||
{ provider: "openai", model: "openai/gpt-5.1-codex-mini" },
|
||||
{ provider: "gemini", model: "google/gemini-3-flash-preview" },
|
||||
],
|
||||
ultrabrain: [
|
||||
{ provider: "openai", model: "openai/gpt-5.2-codex" },
|
||||
{ provider: "claude", model: "anthropic/claude-opus-4-5" },
|
||||
{ provider: "gemini", model: "google/gemini-3-pro-preview" },
|
||||
],
|
||||
"visual-engineering": [
|
||||
{ provider: "gemini", model: "google/gemini-3-pro-preview" },
|
||||
{ provider: "openai", model: "openai/gpt-5.2" },
|
||||
{ provider: "claude", model: "anthropic/claude-sonnet-4-5" },
|
||||
],
|
||||
artistry: [
|
||||
{ provider: "gemini", model: "google/gemini-3-pro-preview" },
|
||||
{ provider: "openai", model: "openai/gpt-5.2" },
|
||||
{ provider: "claude", model: "anthropic/claude-opus-4-5" },
|
||||
],
|
||||
writing: [
|
||||
{ provider: "gemini", model: "google/gemini-3-flash-preview" },
|
||||
{ provider: "openai", model: "openai/gpt-5.2" },
|
||||
{ provider: "claude", model: "anthropic/claude-sonnet-4-5" },
|
||||
],
|
||||
glm: [],
|
||||
}
|
||||
|
||||
const OPENCODE_ZEN_MODELS: Record<ModelCapability, string> = {
|
||||
"unspecified-high": "opencode/claude-opus-4-5",
|
||||
"unspecified-low": "opencode/claude-sonnet-4-5",
|
||||
quick: "opencode/claude-haiku-4-5",
|
||||
ultrabrain: "opencode/gpt-5.2-codex",
|
||||
"visual-engineering": "opencode/gemini-3-pro",
|
||||
artistry: "opencode/gemini-3-pro",
|
||||
writing: "opencode/gemini-3-flash",
|
||||
glm: "opencode/glm-4.7-free",
|
||||
}
|
||||
|
||||
const GITHUB_COPILOT_MODELS: Record<ModelCapability, string> = {
|
||||
"unspecified-high": "github-copilot/claude-opus-4.5",
|
||||
"unspecified-low": "github-copilot/claude-sonnet-4.5",
|
||||
quick: "github-copilot/claude-haiku-4.5",
|
||||
ultrabrain: "github-copilot/gpt-5.2-codex",
|
||||
"visual-engineering": "github-copilot/gemini-3-pro-preview",
|
||||
artistry: "github-copilot/gemini-3-pro-preview",
|
||||
writing: "github-copilot/gemini-3-flash-preview",
|
||||
glm: "github-copilot/gpt-5.2",
|
||||
}
|
||||
|
||||
const ZAI_MODEL = "zai-coding-plan/glm-4.7"
|
||||
|
||||
interface AgentRequirement {
|
||||
capability: ModelCapability
|
||||
variant?: string
|
||||
}
|
||||
|
||||
const AGENT_REQUIREMENTS: Record<string, AgentRequirement> = {
|
||||
Sisyphus: { capability: "unspecified-high" },
|
||||
oracle: { capability: "ultrabrain", variant: "high" },
|
||||
librarian: { capability: "glm" },
|
||||
explore: { capability: "quick" },
|
||||
"multimodal-looker": { capability: "visual-engineering" },
|
||||
"Prometheus (Planner)": { capability: "unspecified-high" },
|
||||
"Metis (Plan Consultant)": { capability: "unspecified-high" },
|
||||
"Momus (Plan Reviewer)": { capability: "ultrabrain", variant: "medium" },
|
||||
Atlas: { capability: "unspecified-high" },
|
||||
}
|
||||
|
||||
interface CategoryRequirement {
|
||||
capability: ModelCapability
|
||||
variant?: string
|
||||
}
|
||||
|
||||
const CATEGORY_REQUIREMENTS: Record<string, CategoryRequirement> = {
|
||||
"visual-engineering": { capability: "visual-engineering" },
|
||||
ultrabrain: { capability: "ultrabrain" },
|
||||
artistry: { capability: "artistry", variant: "max" },
|
||||
quick: { capability: "quick" },
|
||||
"unspecified-low": { capability: "unspecified-low" },
|
||||
"unspecified-high": { capability: "unspecified-high" },
|
||||
writing: { capability: "writing" },
|
||||
}
|
||||
|
||||
const ULTIMATE_FALLBACK = "opencode/glm-4.7-free"
|
||||
const SCHEMA_URL = "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json"
|
||||
|
||||
@@ -158,31 +53,46 @@ function toProviderAvailability(config: InstallConfig): ProviderAvailability {
|
||||
}
|
||||
}
|
||||
|
||||
function resolveModel(capability: ModelCapability, avail: ProviderAvailability): string {
|
||||
const nativeChain = NATIVE_FALLBACK_CHAINS[capability]
|
||||
for (const entry of nativeChain) {
|
||||
if (avail.native[entry.provider]) {
|
||||
return entry.model
|
||||
}
|
||||
function isProviderAvailable(provider: string, avail: ProviderAvailability): boolean {
|
||||
const mapping: Record<string, boolean> = {
|
||||
anthropic: avail.native.claude,
|
||||
openai: avail.native.openai,
|
||||
google: avail.native.gemini,
|
||||
"github-copilot": avail.copilot,
|
||||
opencode: avail.opencodeZen,
|
||||
"zai-coding-plan": avail.zai,
|
||||
}
|
||||
|
||||
if (avail.opencodeZen) {
|
||||
return OPENCODE_ZEN_MODELS[capability]
|
||||
}
|
||||
|
||||
if (avail.copilot) {
|
||||
return GITHUB_COPILOT_MODELS[capability]
|
||||
}
|
||||
|
||||
if (avail.zai) {
|
||||
return ZAI_MODEL
|
||||
}
|
||||
|
||||
return ULTIMATE_FALLBACK
|
||||
return mapping[provider] ?? false
|
||||
}
|
||||
|
||||
function resolveClaudeCapability(avail: ProviderAvailability): ModelCapability {
|
||||
return avail.isMaxPlan ? "unspecified-high" : "unspecified-low"
|
||||
function resolveModelFromChain(
|
||||
fallbackChain: FallbackEntry[],
|
||||
avail: ProviderAvailability
|
||||
): { model: string; variant?: string } | null {
|
||||
for (const entry of fallbackChain) {
|
||||
for (const provider of entry.providers) {
|
||||
if (isProviderAvailable(provider, avail)) {
|
||||
return {
|
||||
model: `${provider}/${entry.model}`,
|
||||
variant: entry.variant,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
function getSisyphusFallbackChain(isMaxPlan: boolean): FallbackEntry[] {
|
||||
// Sisyphus uses opus when isMaxPlan, sonnet otherwise
|
||||
if (isMaxPlan) {
|
||||
return AGENT_MODEL_REQUIREMENTS.Sisyphus.fallbackChain
|
||||
}
|
||||
// For non-max plan, use sonnet instead of opus
|
||||
return [
|
||||
{ providers: ["anthropic", "github-copilot", "opencode"], model: "claude-sonnet-4-5" },
|
||||
{ providers: ["openai", "github-copilot", "opencode"], model: "gpt-5.2", variant: "high" },
|
||||
{ providers: ["google", "github-copilot", "opencode"], model: "gemini-3-pro-preview" },
|
||||
]
|
||||
}
|
||||
|
||||
export function generateModelConfig(config: InstallConfig): GeneratedOmoConfig {
|
||||
@@ -199,10 +109,10 @@ export function generateModelConfig(config: InstallConfig): GeneratedOmoConfig {
|
||||
return {
|
||||
$schema: SCHEMA_URL,
|
||||
agents: Object.fromEntries(
|
||||
Object.keys(AGENT_REQUIREMENTS).map((role) => [role, { model: ULTIMATE_FALLBACK }])
|
||||
Object.keys(AGENT_MODEL_REQUIREMENTS).map((role) => [role, { model: ULTIMATE_FALLBACK }])
|
||||
),
|
||||
categories: Object.fromEntries(
|
||||
Object.keys(CATEGORY_REQUIREMENTS).map((cat) => [cat, { model: ULTIMATE_FALLBACK }])
|
||||
Object.keys(CATEGORY_MODEL_REQUIREMENTS).map((cat) => [cat, { model: ULTIMATE_FALLBACK }])
|
||||
),
|
||||
}
|
||||
}
|
||||
@@ -210,28 +120,52 @@ export function generateModelConfig(config: InstallConfig): GeneratedOmoConfig {
|
||||
const agents: Record<string, AgentConfig> = {}
|
||||
const categories: Record<string, CategoryConfig> = {}
|
||||
|
||||
const claudeCapability = resolveClaudeCapability(avail)
|
||||
|
||||
for (const [role, req] of Object.entries(AGENT_REQUIREMENTS)) {
|
||||
for (const [role, req] of Object.entries(AGENT_MODEL_REQUIREMENTS)) {
|
||||
// Special case: librarian always uses ZAI first if available
|
||||
if (role === "librarian" && avail.zai) {
|
||||
agents[role] = { model: ZAI_MODEL }
|
||||
} else if (role === "explore") {
|
||||
if (avail.native.claude && avail.isMaxPlan) {
|
||||
continue
|
||||
}
|
||||
|
||||
// Special case: explore has custom Gemini → Claude → Grok logic
|
||||
if (role === "explore") {
|
||||
if (avail.native.gemini) {
|
||||
agents[role] = { model: "google/gemini-3-flash-preview" }
|
||||
} else if (avail.native.claude && avail.isMaxPlan) {
|
||||
agents[role] = { model: "anthropic/claude-haiku-4-5" }
|
||||
} else {
|
||||
agents[role] = { model: "opencode/grok-code" }
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
// Special case: Sisyphus uses different fallbackChain based on isMaxPlan
|
||||
const fallbackChain =
|
||||
role === "Sisyphus" ? getSisyphusFallbackChain(avail.isMaxPlan) : req.fallbackChain
|
||||
|
||||
const resolved = resolveModelFromChain(fallbackChain, avail)
|
||||
if (resolved) {
|
||||
const variant = resolved.variant ?? req.variant
|
||||
agents[role] = variant ? { model: resolved.model, variant } : { model: resolved.model }
|
||||
} else {
|
||||
const capability = req.capability === "unspecified-high" ? claudeCapability : req.capability
|
||||
const model = resolveModel(capability, avail)
|
||||
agents[role] = req.variant ? { model, variant: req.variant } : { model }
|
||||
agents[role] = { model: ULTIMATE_FALLBACK }
|
||||
}
|
||||
}
|
||||
|
||||
for (const [cat, req] of Object.entries(CATEGORY_REQUIREMENTS)) {
|
||||
const capability = req.capability === "unspecified-high" ? claudeCapability : req.capability
|
||||
const model = resolveModel(capability, avail)
|
||||
categories[cat] = req.variant ? { model, variant: req.variant } : { model }
|
||||
for (const [cat, req] of Object.entries(CATEGORY_MODEL_REQUIREMENTS)) {
|
||||
// Special case: unspecified-high downgrades to unspecified-low when not isMaxPlan
|
||||
const fallbackChain =
|
||||
cat === "unspecified-high" && !avail.isMaxPlan
|
||||
? CATEGORY_MODEL_REQUIREMENTS["unspecified-low"].fallbackChain
|
||||
: req.fallbackChain
|
||||
|
||||
const resolved = resolveModelFromChain(fallbackChain, avail)
|
||||
if (resolved) {
|
||||
const variant = resolved.variant ?? req.variant
|
||||
categories[cat] = variant ? { model: resolved.model, variant } : { model: resolved.model }
|
||||
} else {
|
||||
categories[cat] = { model: ULTIMATE_FALLBACK }
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user