clean up ContextItem<->ContextMessage conversion, remove duplicate wrapping & unused code #3307
Conversation
This file contains 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
sqs
changed the title
|
Note: most of the diff is the agent recordings. The rest is a major deletion: |
sqs
force-pushed
the
sqs/rm-legacy-transcript
branch
from
a3c7cab
to
04c0526
Compare
umpox
reviewed
Mar 6, 2024
Comment on lines
-169
to
-176
| for (const file of userContextFiles) { | ||
| if (file.uri) { | ||
| const content = await editor.getTextEditorContentForFile(file.uri, file.range) | ||
| if (content) { | ||
| const message = createContextMessageByFile(file, content) | ||
| userProvidedContextMessages.push(...message) | ||
| } | ||
| } |
There was a problem hiding this comment.
I think we'll need to use fillInContextItemContent here like we do for chat, otherwise the user context files won't actually have any content and will be ignored as context.
quick fix here: #3318
steveyegge
pushed a commit
that referenced
this pull request
Mar 13, 2024
…apping & unused code (#3307)
| } | ||
|
|
||
| return extractContextItemsFromContextMessages([ |
There was a problem hiding this comment.
Based on this diff and behavior before this PR, my best guess is that we should preserve the contextMessage to contextItem conversion until we properly remove the duplication between these types. Fixing it here: #4432
valerybugakov
added a commit
that referenced
this pull request
Jun 3, 2024
- #3307 removed `extractContextItemsFromContextMessages` and replaced it with `isContextItem(value) ? value : value.file` which removes context items content from the final prompt.
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.
I noticed in the conversion
ContextItem <-> ContextMessagethere are several possible places where we were wrapping context files with multiple layers of preamble, like:There was a
stripContextWrapperto try to undo that in some places, but it's not applied everywhere it's needed. Examples (from the agent recordings):This PR cleans up code related to this to remove the multiple layers of preamble, and deletes other related unused code.
Cleanups:
Test plan
CI