sapient/oh-my-openagent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve post-rebase runtime fallback merge leftovers

Browse Source
This commit is contained in:
YeonGyu-Kim
2026-02-21 02:45:48 +09:00
parent a8e3e1ea01
commit 13196aedb7
4 changed files with 324 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

459
assets/oh-my-opencode.schema.json
View File

@@ -91,7 +91,8 @@
"delegate-task-retry", "delegate-task-retry",
"prometheus-md-only", "prometheus-md-only",
"sisyphus-junior-notepad", "sisyphus-junior-notepad",
"sisyphus-gpt-hephaestus-reminder", "no-sisyphus-gpt",
"no-hephaestus-non-gpt",
"start-work", "start-work",
"atlas", "atlas",
"unstable-agent-babysitter", "unstable-agent-babysitter",
@@ -99,10 +100,11 @@
"task-resume-info", "task-resume-info",
"stop-continuation-guard", "stop-continuation-guard",
"tasks-todowrite-disabler", "tasks-todowrite-disabler",
"runtime-fallback",
"write-existing-file-guard", "write-existing-file-guard",
"anthropic-effort", "anthropic-effort",
"runtime-fallback", "hashline-read-enhancer",
"hashline-read-enhancer" "hashline-edit-diff-enhancer"
] ]
} }
}, },
@@ -127,6 +129,9 @@
"type": "string" "type": "string"
} }
}, },
"hashline_edit": {
"type": "boolean"
},
"agents": { "agents": {
"type": "object", "type": "object",
"properties": { "properties": {
@@ -136,6 +141,19 @@
"model": { "model": {
"type": "string" "type": "string"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"variant": { "variant": {
"type": "string" "type": "string"
}, },
@@ -300,18 +318,17 @@
"type": "object", "type": "object",
"additionalProperties": {} "additionalProperties": {}
}, },
"fallback_models": { "ultrawork": {
"anyOf": [ "type": "object",
{ "properties": {
"model": {
"type": "string" "type": "string"
}, },
{ "variant": {
"type": "array", "type": "string"
"items": {
"type": "string"
}
} }
] },
"additionalProperties": false
} }
}, },
"additionalProperties": false "additionalProperties": false
@@ -322,6 +339,19 @@
"model": { "model": {
"type": "string" "type": "string"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"variant": { "variant": {
"type": "string" "type": "string"
}, },
@@ -486,18 +516,17 @@
"type": "object", "type": "object",
"additionalProperties": {} "additionalProperties": {}
}, },
"fallback_models": { "ultrawork": {
"anyOf": [ "type": "object",
{ "properties": {
"model": {
"type": "string" "type": "string"
}, },
{ "variant": {
"type": "array", "type": "string"
"items": {
"type": "string"
}
} }
] },
"additionalProperties": false
} }
}, },
"additionalProperties": false "additionalProperties": false
@@ -508,6 +537,19 @@
"model": { "model": {
"type": "string" "type": "string"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"variant": { "variant": {
"type": "string" "type": "string"
}, },
@@ -672,18 +714,17 @@
"type": "object", "type": "object",
"additionalProperties": {} "additionalProperties": {}
}, },
"fallback_models": { "ultrawork": {
"anyOf": [ "type": "object",
{ "properties": {
"model": {
"type": "string" "type": "string"
}, },
{ "variant": {
"type": "array", "type": "string"
"items": {
"type": "string"
}
} }
] },
"additionalProperties": false
} }
}, },
"additionalProperties": false "additionalProperties": false
@@ -694,6 +735,19 @@
"model": { "model": {
"type": "string" "type": "string"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"variant": { "variant": {
"type": "string" "type": "string"
}, },
@@ -858,18 +912,17 @@
"type": "object", "type": "object",
"additionalProperties": {} "additionalProperties": {}
}, },
"fallback_models": { "ultrawork": {
"anyOf": [ "type": "object",
{ "properties": {
"model": {
"type": "string" "type": "string"
}, },
{ "variant": {
"type": "array", "type": "string"
"items": {
"type": "string"
}
} }
] },
"additionalProperties": false
} }
}, },
"additionalProperties": false "additionalProperties": false
@@ -880,6 +933,19 @@
"model": { "model": {
"type": "string" "type": "string"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"variant": { "variant": {
"type": "string" "type": "string"
}, },
@@ -1044,18 +1110,17 @@
"type": "object", "type": "object",
"additionalProperties": {} "additionalProperties": {}
}, },
"fallback_models": { "ultrawork": {
"anyOf": [ "type": "object",
{ "properties": {
"model": {
"type": "string" "type": "string"
}, },
{ "variant": {
"type": "array", "type": "string"
"items": {
"type": "string"
}
} }
] },
"additionalProperties": false
} }
}, },
"additionalProperties": false "additionalProperties": false
@@ -1066,6 +1131,19 @@
"model": { "model": {
"type": "string" "type": "string"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"variant": { "variant": {
"type": "string" "type": "string"
}, },
@@ -1230,18 +1308,17 @@
"type": "object", "type": "object",
"additionalProperties": {} "additionalProperties": {}
}, },
"fallback_models": { "ultrawork": {
"anyOf": [ "type": "object",
{ "properties": {
"model": {
"type": "string" "type": "string"
}, },
{ "variant": {
"type": "array", "type": "string"
"items": {
"type": "string"
}
} }
] },
"additionalProperties": false
} }
}, },
"additionalProperties": false "additionalProperties": false
@@ -1252,6 +1329,19 @@
"model": { "model": {
"type": "string" "type": "string"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"variant": { "variant": {
"type": "string" "type": "string"
}, },
@@ -1416,18 +1506,17 @@
"type": "object", "type": "object",
"additionalProperties": {} "additionalProperties": {}
}, },
"fallback_models": { "ultrawork": {
"anyOf": [ "type": "object",
{ "properties": {
"model": {
"type": "string" "type": "string"
}, },
{ "variant": {
"type": "array", "type": "string"
"items": {
"type": "string"
}
} }
] },
"additionalProperties": false
} }
}, },
"additionalProperties": false "additionalProperties": false
@@ -1438,6 +1527,19 @@
"model": { "model": {
"type": "string" "type": "string"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"variant": { "variant": {
"type": "string" "type": "string"
}, },
@@ -1602,18 +1704,17 @@
"type": "object", "type": "object",
"additionalProperties": {} "additionalProperties": {}
}, },
"fallback_models": { "ultrawork": {
"anyOf": [ "type": "object",
{ "properties": {
"model": {
"type": "string" "type": "string"
}, },
{ "variant": {
"type": "array", "type": "string"
"items": {
"type": "string"
}
} }
] },
"additionalProperties": false
} }
}, },
"additionalProperties": false "additionalProperties": false
@@ -1624,6 +1725,19 @@
"model": { "model": {
"type": "string" "type": "string"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"variant": { "variant": {
"type": "string" "type": "string"
}, },
@@ -1788,18 +1902,17 @@
"type": "object", "type": "object",
"additionalProperties": {} "additionalProperties": {}
}, },
"fallback_models": { "ultrawork": {
"anyOf": [ "type": "object",
{ "properties": {
"model": {
"type": "string" "type": "string"
}, },
{ "variant": {
"type": "array", "type": "string"
"items": {
"type": "string"
}
} }
] },
"additionalProperties": false
} }
}, },
"additionalProperties": false "additionalProperties": false
@@ -1810,6 +1923,19 @@
"model": { "model": {
"type": "string" "type": "string"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"variant": { "variant": {
"type": "string" "type": "string"
}, },
@@ -1974,18 +2100,17 @@
"type": "object", "type": "object",
"additionalProperties": {} "additionalProperties": {}
}, },
"fallback_models": { "ultrawork": {
"anyOf": [ "type": "object",
{ "properties": {
"model": {
"type": "string" "type": "string"
}, },
{ "variant": {
"type": "array", "type": "string"
"items": {
"type": "string"
}
} }
] },
"additionalProperties": false
} }
}, },
"additionalProperties": false "additionalProperties": false
@@ -1996,6 +2121,19 @@
"model": { "model": {
"type": "string" "type": "string"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"variant": { "variant": {
"type": "string" "type": "string"
}, },
@@ -2160,18 +2298,17 @@
"type": "object", "type": "object",
"additionalProperties": {} "additionalProperties": {}
}, },
"fallback_models": { "ultrawork": {
"anyOf": [ "type": "object",
{ "properties": {
"model": {
"type": "string" "type": "string"
}, },
{ "variant": {
"type": "array", "type": "string"
"items": {
"type": "string"
}
} }
] },
"additionalProperties": false
} }
}, },
"additionalProperties": false "additionalProperties": false
@@ -2182,6 +2319,19 @@
"model": { "model": {
"type": "string" "type": "string"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"variant": { "variant": {
"type": "string" "type": "string"
}, },
@@ -2346,18 +2496,17 @@
"type": "object", "type": "object",
"additionalProperties": {} "additionalProperties": {}
}, },
"fallback_models": { "ultrawork": {
"anyOf": [ "type": "object",
{ "properties": {
"model": {
"type": "string" "type": "string"
}, },
{ "variant": {
"type": "array", "type": "string"
"items": {
"type": "string"
}
} }
] },
"additionalProperties": false
} }
}, },
"additionalProperties": false "additionalProperties": false
@@ -2368,6 +2517,19 @@
"model": { "model": {
"type": "string" "type": "string"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"variant": { "variant": {
"type": "string" "type": "string"
}, },
@@ -2532,18 +2694,17 @@
"type": "object", "type": "object",
"additionalProperties": {} "additionalProperties": {}
}, },
"fallback_models": { "ultrawork": {
"anyOf": [ "type": "object",
{ "properties": {
"model": {
"type": "string" "type": "string"
}, },
{ "variant": {
"type": "array", "type": "string"
"items": {
"type": "string"
}
} }
] },
"additionalProperties": false
} }
}, },
"additionalProperties": false "additionalProperties": false
@@ -2554,6 +2715,19 @@
"model": { "model": {
"type": "string" "type": "string"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"variant": { "variant": {
"type": "string" "type": "string"
}, },
@@ -2718,18 +2892,17 @@
"type": "object", "type": "object",
"additionalProperties": {} "additionalProperties": {}
}, },
"fallback_models": { "ultrawork": {
"anyOf": [ "type": "object",
{ "properties": {
"model": {
"type": "string" "type": "string"
}, },
{ "variant": {
"type": "array", "type": "string"
"items": {
"type": "string"
}
} }
] },
"additionalProperties": false
} }
}, },
"additionalProperties": false "additionalProperties": false
@@ -2748,6 +2921,19 @@
"model": { "model": {
"type": "string" "type": "string"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"variant": { "variant": {
"type": "string" "type": "string"
}, },
@@ -2812,19 +2998,6 @@
"is_unstable_agent": { "is_unstable_agent": {
"type": "boolean" "type": "boolean"
}, },
"fallback_models": {
"anyOf": [
{
"type": "string"
},
{
"type": "array",
"items": {
"type": "string"
}
}
]
},
"disable": { "disable": {
"type": "boolean" "type": "boolean"
} }
@@ -3030,7 +3203,7 @@
"safe_hook_creation": { "safe_hook_creation": {
"type": "boolean" "type": "boolean"
}, },
"hashline_edit": { "disable_omo_env": {
"type": "boolean" "type": "boolean"
} }
}, },

1
src/config/schema/oh-my-opencode-config.ts
View File

@@ -54,7 +54,6 @@ export const OhMyOpenCodeConfigSchema = z.object({
websearch: WebsearchConfigSchema.optional(), websearch: WebsearchConfigSchema.optional(),
tmux: TmuxConfigSchema.optional(), tmux: TmuxConfigSchema.optional(),
sisyphus: SisyphusConfigSchema.optional(), sisyphus: SisyphusConfigSchema.optional(),
runtime_fallback: RuntimeFallbackConfigSchema.optional(),
/** Migration history to prevent re-applying migrations (e.g., model version upgrades) */ /** Migration history to prevent re-applying migrations (e.g., model version upgrades) */
_migrations: z.array(z.string()).optional(), _migrations: z.array(z.string()).optional(),
}) })

12
src/plugin/event.ts
View File

@@ -20,16 +20,20 @@ type FirstMessageVariantGate = {
clear: (sessionID: string) => void clear: (sessionID: string) => void
} }
type EventInput = Parameters<
NonNullable<NonNullable<CreatedHooks["writeExistingFileGuard"]>["event"]>
>[0]
export function createEventHandler(args: { export function createEventHandler(args: {
ctx: PluginContext ctx: PluginContext
pluginConfig: OhMyOpenCodeConfig pluginConfig: OhMyOpenCodeConfig
firstMessageVariantGate: FirstMessageVariantGate firstMessageVariantGate: FirstMessageVariantGate
managers: Managers managers: Managers
hooks: CreatedHooks hooks: CreatedHooks
}): (input: { event: { type: string; properties?: Record<string, unknown> } }) => Promise<void> { }): (input: EventInput) => Promise<void> {
const { ctx, firstMessageVariantGate, managers, hooks } = args const { ctx, firstMessageVariantGate, managers, hooks } = args
const dispatchToHooks = async (input: { event: { type: string; properties?: Record<string, unknown> } }): Promise<void> => { const dispatchToHooks = async (input: EventInput): Promise<void> => {
await Promise.resolve(hooks.autoUpdateChecker?.event?.(input)) await Promise.resolve(hooks.autoUpdateChecker?.event?.(input))
await Promise.resolve(hooks.claudeCodeHooks?.event?.(input)) await Promise.resolve(hooks.claudeCodeHooks?.event?.(input))
await Promise.resolve(hooks.backgroundNotificationHook?.event?.(input)) await Promise.resolve(hooks.backgroundNotificationHook?.event?.(input))
@@ -45,7 +49,7 @@ export function createEventHandler(args: {
await Promise.resolve(hooks.runtimeFallback?.event?.(input)) await Promise.resolve(hooks.runtimeFallback?.event?.(input))
await Promise.resolve(hooks.agentUsageReminder?.event?.(input)) await Promise.resolve(hooks.agentUsageReminder?.event?.(input))
await Promise.resolve(hooks.categorySkillReminder?.event?.(input)) await Promise.resolve(hooks.categorySkillReminder?.event?.(input))
await Promise.resolve(hooks.interactiveBashSession?.event?.(input)) await Promise.resolve(hooks.interactiveBashSession?.event?.(input as EventInput))
await Promise.resolve(hooks.ralphLoop?.event?.(input)) await Promise.resolve(hooks.ralphLoop?.event?.(input))
await Promise.resolve(hooks.stopContinuationGuard?.event?.(input)) await Promise.resolve(hooks.stopContinuationGuard?.event?.(input))
await Promise.resolve(hooks.compactionTodoPreserver?.event?.(input)) await Promise.resolve(hooks.compactionTodoPreserver?.event?.(input))
@@ -88,7 +92,7 @@ export function createEventHandler(args: {
return return
} }
recentSyntheticIdles.set(sessionID, Date.now()) recentSyntheticIdles.set(sessionID, Date.now())
await dispatchToHooks(syntheticIdle) await dispatchToHooks(syntheticIdle as EventInput)
} }
const { event } = input const { event } = input

11
src/shared/model-resolver.ts
View File

@@ -7,17 +7,6 @@ export type ModelResolutionInput = {
systemDefault?: string systemDefault?: string
} }
/**
* Normalizes fallback_models to an array.
* Handles single string or array input, returns undefined for falsy values.
*/
export function normalizeFallbackModels(
fallbackModels: string | string[] | undefined | null
): string[] | undefined {
if (!fallbackModels) return undefined
return Array.isArray(fallbackModels) ? fallbackModels : [fallbackModels]
}
export type ModelSource = export type ModelSource =
| "override" | "override"
| "category-default" | "category-default"