luna/oh-my-opencode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(hooks): improve thinking block order recovery with error-based index targeting

Browse Source 
- Add findMessageByIndexNeedingThinking for precise message targeting
- Detect "expected X found Y" error pattern for thinking block order
- Remove isLastMessage skip - recovery now handles final assistant messages
- Simplify orphan detection: any non-thinking first part is orphan

🤖 GENERATED WITH ASSISTANCE OF [OhMyOpenCode](https://github.com/code-yeongyu/oh-my-opencode)
This commit is contained in:
YeonGyu-Kim
2025-12-11 11:07:07 +09:00
parent 06e0285b9c
commit c12f73f774
2 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hooks/session-recovery/storage.ts
+28 -9
View File
@@ -154,13 +154,9 @@ export function findMessagesWithThinkingBlocks(sessionID: string): string[] {
const messages = readMessages(sessionID)
const result: string[] = []
for (let i = 0; i < messages.length; i++) {
const msg = messages[i]
for (const msg of messages) {
if (msg.role !== "assistant") continue
const isLastMessage = i === messages.length - 1
if (isLastMessage) continue
const parts = readParts(msg.id)
const hasThinking = parts.some((p) => THINKING_TYPES.has(p.type))
if (hasThinking) {
@@ -179,8 +175,8 @@ export function findMessagesWithOrphanThinking(sessionID: string): string[] {
const msg = messages[i]
if (msg.role !== "assistant") continue
const isLastMessage = i === messages.length - 1
if (isLastMessage) continue
// NOTE: Removed isLastMessage skip - recovery needs to fix last message too
// when "thinking must start with" errors occur on final assistant message
const parts = readParts(msg.id)
if (parts.length === 0) continue
@@ -188,10 +184,11 @@ export function findMessagesWithOrphanThinking(sessionID: string): string[] {
const sortedParts = [...parts].sort((a, b) => a.id.localeCompare(b.id))
const firstPart = sortedParts[0]
const hasThinking = parts.some((p) => THINKING_TYPES.has(p.type))
const firstIsThinking = THINKING_TYPES.has(firstPart.type)
if (hasThinking && !firstIsThinking) {
// NOTE: Changed condition - if first part is not thinking, it's orphan
// regardless of whether thinking blocks exist elsewhere in the message
if (!firstIsThinking) {
result.push(msg.id)
}
}
@@ -246,3 +243,25 @@ export function stripThinkingParts(messageID: string): boolean {
return anyRemoved
}
export function findMessageByIndexNeedingThinking(sessionID: string, targetIndex: number): string | null {
const messages = readMessages(sessionID)
if (targetIndex < 0 || targetIndex >= messages.length) return null
const targetMsg = messages[targetIndex]
if (targetMsg.role !== "assistant") return null
const parts = readParts(targetMsg.id)
if (parts.length === 0) return null
const sortedParts = [...parts].sort((a, b) => a.id.localeCompare(b.id))
const firstPart = sortedParts[0]
const firstIsThinking = THINKING_TYPES.has(firstPart.type)
if (!firstIsThinking) {
return targetMsg.id
}
return null
}