fix(session): bound /btw side-question snapshot to recent messages - #2051
Open
YOMXXX wants to merge 2 commits into
Open
fix(session): bound /btw side-question snapshot to recent messages#2051YOMXXX wants to merge 2 commits into
YOMXXX wants to merge 2 commits into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #1855.
/btw <question>is marketed as a "side question without context cost", butforkQuery(packages/opencode/src/tool/session.ts) passed the entire session history tobuildPrefix, so the fork's prompt was the full session (observed 1M+ input tokens on ~300k-token sessions → empty answer / hang).Fix: bound the side-question snapshot to the most recent
MAX_FORK_QUERY_MESSAGES(12) messages, while guaranteeing the last user message stays in the window (buildLLMRequestPrefixdies without a user message — an uncatchable defect).sliceSideQuestionContext(msgs, max, mustInclude?)— new helper: normally the lastmaxmessages; extends to include the last matching element (the last user message) if it would otherwise be cut off.forkQuerypasses(m) => m.info.role === "user"as the predicate.watermark(session boundary) and agent identity stay computed from the full session — only the snapshot content is bounded.session.askroute +session asktool op both callforkQuery).The fork's prompt is
[...forkCtx.inheritedMessages, ...ownNewModelMsgs]and does not re-pull history, so boundinginheritedMessagesbounds the fork.Test Plan
sliceSideQuestionContextbounds to lastmax; keeps all under cap; preserves order; extends window to include the last user message when the tail has none; stays bounded when the tail already contains a user message.bun test test/tool/session-side-question.test.ts— 5 pass.bun typecheck— clean.