Skip to content

fix(handoff): preserve the current instruction #1707

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

Draft
sentry-junior wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(handoff): preserve the current instruction #1707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 20 additions & 1 deletion packages/junior/src/chat/services/context-compaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import { getConversationEventStore } from "@/chat/db";
import type { ThreadConversationState } from "@/chat/state/conversation";
import { logWarn, setSpanAttributes } from "@/chat/logging";
import {
getUserMessageInstructionText,
retainRuntimeTurnContext,
stripRuntimeTurnContext,
trimTrailingAssistantMessages,
Expand Down Expand Up @@ -667,7 +668,25 @@ export async function compactContextForHandoff(
throw new Error("Handoff requires the current runtime turn context");
}
const generatedSummary = await summarizeContext(args, deps);
const summary = `${MODEL_HANDOFF_SUMMARY_PREFIX}\n${generatedSummary}`;
const currentInstruction = [...args.piMessages]
.reverse()
.map(getUserMessageInstructionText)
.find((text) => text && !isCompactionSummary(text));
const boundedCurrentInstruction = currentInstruction
? sanitizeText(currentInstruction).slice(0, MAX_RENDERED_MESSAGE_CHARS)
: undefined;
const summary = [
MODEL_HANDOFF_SUMMARY_PREFIX,
...(boundedCurrentInstruction
? [
"Current user instruction at handoff:",
boundedCurrentInstruction,
"",
]
: []),
"Continuation summary:",
generatedSummary,
].join("\n");
const instructionMessage = {
role: "user",
content: [{ type: "text", text: renderCurrentInstruction(summary) }],
Expand Down
7 changes: 5 additions & 2 deletions packages/junior/tests/component/services/context-compaction.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,11 +542,14 @@ describe("context compaction projection reset", () => {
"Continue the outstanding request now",
);
expect(textOf(handoffMessages[1]!)).toContain(
"Continue the multi-file implementation.",
"Current user instruction at handoff:\nImplement the multi-file change.",
);
expect(textOf(handoffMessages[1]!)).toContain(
"Continuation summary:\nContinue the multi-file implementation.",
);
const durableHandoffMessages = [
user(
"<current-instruction>\nModel handoff checkpoint. Continue the outstanding request now using this summary as the complete prior context:\nContinue the multi-file implementation.\n</current-instruction>",
"<current-instruction>\nModel handoff checkpoint. Continue the outstanding request now using this summary as the complete prior context:\nCurrent user instruction at handoff:\nImplement the multi-file change.\n\nContinuation summary:\nContinue the multi-file implementation.\n</current-instruction>",
3,
),
];
Expand Down
Loading