fix(ralph-loop): remove stale error recovery window
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
@@ -1,33 +0,0 @@
|
|||||||
type SessionState = {
|
|
||||||
isRecovering?: boolean
|
|
||||||
}
|
|
||||||
|
|
||||||
export function createLoopSessionRecovery(options?: { recoveryWindowMs?: number }) {
|
|
||||||
const recoveryWindowMs = options?.recoveryWindowMs ?? 5000
|
|
||||||
const sessions = new Map<string, SessionState>()
|
|
||||||
|
|
||||||
function getSessionState(sessionID: string): SessionState {
|
|
||||||
let state = sessions.get(sessionID)
|
|
||||||
if (!state) {
|
|
||||||
state = {}
|
|
||||||
sessions.set(sessionID, state)
|
|
||||||
}
|
|
||||||
return state
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
isRecovering(sessionID: string): boolean {
|
|
||||||
return getSessionState(sessionID).isRecovering === true
|
|
||||||
},
|
|
||||||
markRecovering(sessionID: string): void {
|
|
||||||
const state = getSessionState(sessionID)
|
|
||||||
state.isRecovering = true
|
|
||||||
setTimeout(() => {
|
|
||||||
state.isRecovering = false
|
|
||||||
}, recoveryWindowMs)
|
|
||||||
},
|
|
||||||
clear(sessionID: string): void {
|
|
||||||
sessions.delete(sessionID)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -11,11 +11,6 @@ import { continueIteration } from "./iteration-continuation"
|
|||||||
import { handlePendingVerification } from "./pending-verification-handler"
|
import { handlePendingVerification } from "./pending-verification-handler"
|
||||||
import { handleDeletedLoopSession, handleErroredLoopSession } from "./session-event-handler"
|
import { handleDeletedLoopSession, handleErroredLoopSession } from "./session-event-handler"
|
||||||
|
|
||||||
type SessionRecovery = {
|
|
||||||
isRecovering: (sessionID: string) => boolean
|
|
||||||
markRecovering: (sessionID: string) => void
|
|
||||||
clear: (sessionID: string) => void
|
|
||||||
}
|
|
||||||
type LoopStateController = {
|
type LoopStateController = {
|
||||||
getState: () => RalphLoopState | null
|
getState: () => RalphLoopState | null
|
||||||
clear: () => boolean
|
clear: () => boolean
|
||||||
@@ -25,7 +20,7 @@ type LoopStateController = {
|
|||||||
setVerificationSessionID: (sessionID: string, verificationSessionID: string) => RalphLoopState | null
|
setVerificationSessionID: (sessionID: string, verificationSessionID: string) => RalphLoopState | null
|
||||||
restartAfterFailedVerification: (sessionID: string, messageCountAtStart?: number) => RalphLoopState | null
|
restartAfterFailedVerification: (sessionID: string, messageCountAtStart?: number) => RalphLoopState | null
|
||||||
}
|
}
|
||||||
type RalphLoopEventHandlerOptions = { directory: string; apiTimeoutMs: number; getTranscriptPath: (sessionID: string) => string | undefined; checkSessionExists?: RalphLoopOptions["checkSessionExists"]; backgroundManager?: RalphLoopOptions["backgroundManager"]; sessionRecovery: SessionRecovery; loopState: LoopStateController }
|
type RalphLoopEventHandlerOptions = { directory: string; apiTimeoutMs: number; getTranscriptPath: (sessionID: string) => string | undefined; checkSessionExists?: RalphLoopOptions["checkSessionExists"]; backgroundManager?: RalphLoopOptions["backgroundManager"]; loopState: LoopStateController }
|
||||||
|
|
||||||
export function createRalphLoopEventHandler(
|
export function createRalphLoopEventHandler(
|
||||||
ctx: PluginInput,
|
ctx: PluginInput,
|
||||||
@@ -48,12 +43,6 @@ export function createRalphLoopEventHandler(
|
|||||||
inFlightSessions.add(sessionID)
|
inFlightSessions.add(sessionID)
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
if (options.sessionRecovery.isRecovering(sessionID)) {
|
|
||||||
log(`[${HOOK_NAME}] Skipped: in recovery`, { sessionID })
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const state = options.loopState.getState()
|
const state = options.loopState.getState()
|
||||||
if (!state || !state.active) {
|
if (!state || !state.active) {
|
||||||
return
|
return
|
||||||
@@ -229,12 +218,12 @@ export function createRalphLoopEventHandler(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (event.type === "session.deleted") {
|
if (event.type === "session.deleted") {
|
||||||
if (!handleDeletedLoopSession(props, options.loopState, options.sessionRecovery)) return
|
if (!handleDeletedLoopSession(props, options.loopState)) return
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event.type === "session.error") {
|
if (event.type === "session.error") {
|
||||||
handleErroredLoopSession(props, options.loopState, options.sessionRecovery)
|
handleErroredLoopSession(props, options.loopState)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import type { PluginInput } from "@opencode-ai/plugin"
|
import type { PluginInput } from "@opencode-ai/plugin"
|
||||||
import type { RalphLoopOptions, RalphLoopState } from "./types"
|
import type { RalphLoopOptions, RalphLoopState } from "./types"
|
||||||
import { getTranscriptPath as getDefaultTranscriptPath } from "../claude-code-hooks/transcript"
|
import { getTranscriptPath as getDefaultTranscriptPath } from "../claude-code-hooks/transcript"
|
||||||
import { createLoopSessionRecovery } from "./loop-session-recovery"
|
|
||||||
import { createLoopStateController } from "./loop-state-controller"
|
import { createLoopStateController } from "./loop-state-controller"
|
||||||
import { createRalphLoopEventHandler } from "./ralph-loop-event-handler"
|
import { createRalphLoopEventHandler } from "./ralph-loop-event-handler"
|
||||||
|
|
||||||
@@ -53,7 +52,6 @@ export function createRalphLoopHook(
|
|||||||
stateDir,
|
stateDir,
|
||||||
config,
|
config,
|
||||||
})
|
})
|
||||||
const sessionRecovery = createLoopSessionRecovery()
|
|
||||||
|
|
||||||
const event = createRalphLoopEventHandler(ctx, {
|
const event = createRalphLoopEventHandler(ctx, {
|
||||||
directory: ctx.directory,
|
directory: ctx.directory,
|
||||||
@@ -61,7 +59,6 @@ export function createRalphLoopHook(
|
|||||||
getTranscriptPath,
|
getTranscriptPath,
|
||||||
checkSessionExists,
|
checkSessionExists,
|
||||||
backgroundManager,
|
backgroundManager,
|
||||||
sessionRecovery,
|
|
||||||
loopState,
|
loopState,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -7,15 +7,9 @@ type LoopStateController = {
|
|||||||
clear: () => boolean
|
clear: () => boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
type SessionRecovery = {
|
|
||||||
clear: (sessionID: string) => void
|
|
||||||
markRecovering: (sessionID: string) => void
|
|
||||||
}
|
|
||||||
|
|
||||||
export function handleDeletedLoopSession(
|
export function handleDeletedLoopSession(
|
||||||
props: Record<string, unknown> | undefined,
|
props: Record<string, unknown> | undefined,
|
||||||
loopState: LoopStateController,
|
loopState: LoopStateController,
|
||||||
sessionRecovery: SessionRecovery,
|
|
||||||
): boolean {
|
): boolean {
|
||||||
const sessionInfo = props?.info as { id?: string } | undefined
|
const sessionInfo = props?.info as { id?: string } | undefined
|
||||||
if (!sessionInfo?.id) return false
|
if (!sessionInfo?.id) return false
|
||||||
@@ -25,14 +19,12 @@ export function handleDeletedLoopSession(
|
|||||||
loopState.clear()
|
loopState.clear()
|
||||||
log(`[${HOOK_NAME}] Session deleted, loop cleared`, { sessionID: sessionInfo.id })
|
log(`[${HOOK_NAME}] Session deleted, loop cleared`, { sessionID: sessionInfo.id })
|
||||||
}
|
}
|
||||||
sessionRecovery.clear(sessionInfo.id)
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
export function handleErroredLoopSession(
|
export function handleErroredLoopSession(
|
||||||
props: Record<string, unknown> | undefined,
|
props: Record<string, unknown> | undefined,
|
||||||
loopState: LoopStateController,
|
loopState: LoopStateController,
|
||||||
sessionRecovery: SessionRecovery,
|
|
||||||
): boolean {
|
): boolean {
|
||||||
const sessionID = props?.sessionID as string | undefined
|
const sessionID = props?.sessionID as string | undefined
|
||||||
const error = props?.error as { name?: string } | undefined
|
const error = props?.error as { name?: string } | undefined
|
||||||
@@ -44,13 +36,12 @@ export function handleErroredLoopSession(
|
|||||||
loopState.clear()
|
loopState.clear()
|
||||||
log(`[${HOOK_NAME}] User aborted, loop cleared`, { sessionID })
|
log(`[${HOOK_NAME}] User aborted, loop cleared`, { sessionID })
|
||||||
}
|
}
|
||||||
sessionRecovery.clear(sessionID)
|
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sessionID) {
|
if (sessionID) {
|
||||||
sessionRecovery.markRecovering(sessionID)
|
log(`[${HOOK_NAME}] Session error ignored, loop remains active`, { sessionID })
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user