Skip to content

fix(server): preserve queued steering across restarts #21610

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
juliusmarminge wants to merge 8 commits into from
+1,262 −153
Open

fix(server): preserve queued steering across restarts #21610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
69e443f
test(server): cover restart steering delivery and stopped streams
juliusmarminge Oct 19, 2026
e618ea0
fix(server): preserve steering through restart recovery
juliusmarminge Oct 19, 2026
0e2c50e
test(server): cover recovery delivery and attachment gaps
juliusmarminge Oct 19, 2026
09867bc
fix(server): retain accepted steering during recovery
juliusmarminge Oct 19, 2026
dded4e2
test(server): cover sibling steers across repeated recovery
juliusmarminge Oct 19, 2026
91923d2
fix(server): preserve steering ownership across restart recovery
juliusmarminge Oct 19, 2026
6a20ce3
test(server): preserve user stops across sibling restart recovery
juliusmarminge Oct 19, 2026
26da5b0
fix(server): preserve interrupted steering ownership after restart
juliusmarminge Oct 19, 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
4 changes: 4 additions & 0 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1625,6 +1625,7 @@ export function makeClaudeUserMessage(input: {
const makeClaudeUserMessageWithAttachments = Effect.fnUntraced(function* (input: {
readonly text: string;
readonly attachments: ReadonlyArray<ChatAttachment>;
readonly attachmentPromptParts?: ProviderAdapter.ProviderAdapterV2TurnMessage["attachmentPromptParts"];
readonly priority?: SDKUserMessage["priority"];
readonly uuid?: SDKUserMessage["uuid"];
readonly attachmentsDir: string;
Expand All @@ -1643,6 +1644,7 @@ const makeClaudeUserMessageWithAttachments = Effect.fnUntraced(function* (input:
const textWithAttachmentPaths = providerMessageTextWithAttachmentPaths({
text: input.text,
attachments: input.attachments,
attachmentPromptParts: input.attachmentPromptParts,
resolveAttachmentPath: (attachment) =>
resolveAttachmentPath({ attachmentsDir: input.attachmentsDir, attachment }),
});
Expand Down Expand Up @@ -8739,6 +8741,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
compileClaudeModelSelection(turnInput.modelSelection).promptEffort,
),
attachments: turnInput.message.attachments,
attachmentPromptParts: turnInput.message.attachmentPromptParts,
attachmentsDir,
fileSystem,
skillNames: yield* userInvocableSkillNames(turnInput.runtimePolicy.cwd),
Expand Down Expand Up @@ -9043,6 +9046,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
compileClaudeModelSelection(currentTurn.input.modelSelection).promptEffort,
),
attachments: turnInput.message.attachments,
attachmentPromptParts: turnInput.message.attachmentPromptParts,
priority: "now",
attachmentsDir,
fileSystem,
Expand Down
Loading
Loading