Skip to content

Commit 57af22f

Browse files
author
harshitsinghbhandari
committed
fix: harden opencode activity hooks
1 parent 4a206f7 commit 57af22f

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

‎backend/internal/adapters/agent/opencode/assets/ao-activity.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ export const aoActivity: Plugin = async ({ directory, client }) => {
126126
if (msg.sessionID && switchedSession(msg.sessionID)) {
127127
callHookSync("session-start", { session_id: msg.sessionID })
128128
}
129-
messageStore.set(msg.id, msg)
130129
if (msg.role === "assistant" && msg.modelID) currentModel = msg.modelID
131130
// Fallback: some `opencode run` flows never deliver message.part.updated
132131
// for the prompt, so start the turn from the user message itself.
133132
if (msg.role === "user") {
133+
messageStore.set(msg.id, msg)
134134
const sessionID = msg.sessionID ?? currentSessionID
135135
if (sessionID) reportUserPrompt(sessionID, msg.id, "")
136136
}
@@ -143,14 +143,19 @@ export const aoActivity: Plugin = async ({ directory, client }) => {
143143
const msg = messageStore.get(part.messageID)
144144
if (msg?.role === "user" && part.type === "text") {
145145
const sessionID = msg.sessionID ?? currentSessionID
146-
if (sessionID) reportUserPrompt(sessionID, msg.id, part.text ?? "")
146+
const prompt = part.text ?? ""
147+
if (sessionID) reportUserPrompt(sessionID, msg.id, prompt)
148+
if (prompt.length > 0) messageStore.delete(part.messageID)
147149
}
148150
break
149151
}
150152

151153
case "session.status": {
152154
// session.status fires in both TUI and `opencode run`; session.idle
153155
// is deprecated and not reliably emitted in run mode.
156+
// AO's "stop" hook means "the current turn is idle/finished", not
157+
// "the whole native session has terminated", so multi-turn TUI
158+
// sessions intentionally emit one stop per idle transition.
154159
const props = (event as any).properties
155160
if (props?.status?.type !== "idle") break
156161
const sessionID = props?.sessionID ?? currentSessionID

‎backend/internal/adapters/agent/opencode/hooks.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@ func atomicWriteFile(path string, data []byte, perm os.FileMode) error {
174174
_ = tmp.Close()
175175
return err
176176
}
177+
if err := tmp.Sync(); err != nil {
178+
_ = tmp.Close()
179+
return err
180+
}
177181
if err := tmp.Close(); err != nil {
178182
return err
179183
}

0 commit comments

Comments
 (0)