Skip to content

fix(orchestration): persist OpenCode abort state #8939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dlowzzxx wants to merge 10 commits into
base: main
Choose a base branch
from
Open

fix(orchestration): persist OpenCode abort state #8939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5d481c3
fix(orchestration): persist interrupted session state
dlowzzxx Aug 31, 2026
a202698
fix(orchestration): settle aborted provider turns safely
dlowzzxx Aug 31, 2026
4cff819
fix(orchestration): retain aborted provider turn id
dlowzzxx Aug 31, 2026
24c34c7
fix(orchestration): guard retained abort generations
dlowzzxx Aug 31, 2026
ac47004
fix(orchestration): correlate pending provider aborts
dlowzzxx Aug 31, 2026
75e3295
fix(orchestration): preserve provider abort compatibility
dlowzzxx Aug 31, 2026
884bf29
fix(opencode): preserve turn correlation across steering
dlowzzxx Sep 1, 2026
ffd373a
fix(orchestration): guard stale turn lifecycle events
dlowzzxx Sep 1, 2026
2ead279
fix(orchestration): correlate steered and stale aborts
dlowzzxx Sep 2, 2026
bf2192e
test(server): cover steering-timeout token and pending-start abort races
dlowzzxx Sep 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
type ChatAttachment,
CommandId,
EventId,
type MessageId,
type ModelSelection,
type OrchestrationEvent,
ProviderDriverKind,
Expand Down Expand Up @@ -775,6 +776,7 @@ const make = Effect.gen(function* () {

const buildSendTurnRequestForThread = Effect.fnUntraced(function* (input: {
readonly threadId: ThreadId;
readonly turnStartMessageId?: MessageId;
readonly messageText: string;
readonly attachments?: ReadonlyArray<ChatAttachment>;
readonly modelSelection?: ModelSelection;
Expand Down Expand Up @@ -826,6 +828,9 @@ const make = Effect.gen(function* () {

return {
threadId: input.threadId,
...(input.turnStartMessageId !== undefined
? { turnStartMessageId: input.turnStartMessageId }
: {}),
...(normalizedInput ? { input: normalizedInput } : {}),
...(normalizedAttachments.length > 0 ? { attachments: normalizedAttachments } : {}),
...(modelForTurn !== undefined ? { modelSelection: modelForTurn } : {}),
Expand Down Expand Up @@ -1213,6 +1218,7 @@ const make = Effect.gen(function* () {

const sendTurnRequest = yield* buildSendTurnRequestForThread({
threadId: event.payload.threadId,
turnStartMessageId: event.payload.messageId,
messageText: message.text,
...(message.attachments !== undefined ? { attachments: message.attachments } : {}),
...(event.payload.modelSelection !== undefined
Expand Down
Loading
Loading