bug: currentDir context is not shown in UI

[Bruno-DaSilva]

Version

v1.0.4

Describe the bug

When using the currentDir context option, eg. when running the generate-tests command (/test), the list of files used for context is incomplete. None of the files generated by the currentDir context are shown. Yet, if you examine the debug promptCompletion output, the context files are there..

Expected behavior

The UI that shows the list of files sent as context should contain the files from the currentDir context option.
Here's what it looks like with one of the below fixes applied:

Additional context

To be clear, I'm talking about this UI Component:

Why this happens:

After some debugging within the extension, I found the prompt message generated for currentDir context files is hardcoded in here:

cody/lib/shared/src/chat/prompts/vscode-context/helpers.ts

Line 358 in 52a3187

const templateText = 'Codebase context from file path {fileName}: '

EDIT: also in getCurrentDirFilteredContext().

Yet, the SimpleChatRecipeAdapter calls contextMessageToContextItem(message):

cody/vscode/src/chat/chat-view/SimpleChatRecipeAdapter.ts

Lines 96 to 101 in 52a3187

	const fullContext = await interaction.getFullContext()
	const prompt: Message[] = fullContext.concat([humanInteractionMessage] as Message[])
	const contextItems = fullContext
	.map(m => contextMessageToContextItem(m))
	.filter((m): m is ContextItem => m !== null)

which strips the prompt messages down to the file information so long as they match these strings:

cody/vscode/src/chat/chat-view/chat-helpers.ts

Line 172 in 52a3187

const start = text.indexOf('Use following code snippet')

cody/vscode/src/chat/chat-view/chat-helpers.ts

Line 180 in 52a3187

const start = text.indexOf('Use the following text from file')

cody/vscode/src/chat/chat-view/chat-helpers.ts

Line 188 in 52a3187

const start = text.indexOf('My selected ')

And otherwise returns undefined.

Well, as you can see, the currentDir prompt string doesn't match any of these. Thus all files from this context are filtered out and don't appear in the UI.

Proposed Fixes:

1. add the hardcoded Codebase context from file path to the prompt templates file and then add it to the stripContextWrapper() function in chat-helpers.ts, OR
2. change the hardcoded prompt prefix to use one of the already existing file context templates, which will match what's used in chat-helpers.ts.

[Bruno-DaSilva]

I've updated the original with root cause and proposed fixes. Hoping that can mean a swift fix from someone :)

[Bruno-DaSilva]

quick ping to @abeatrix as you're the implementer of vscode-context and @beyang as you're the implementer of the simplify-chat-prompts refactor:
I assume one of you should know which fix is preferred here.

[Bruno-DaSilva]

Note this hardcoding-not-matching seems to happen in at least one other place: getCurrentDirFilteredContext(). So that will have to change as well. Might be worth verifying that there aren't more places with this problem.

[abeatrix]

@Bruno-DaSilva hey there, thank you so much for the detailed report! I am working on a PR that would address this issue, will keep you posted here!

[Bruno-DaSilva]

hahaha you were already working on it before I reported, I see. Wonderful. Thanks for picking this up, @abeatrix!

[abeatrix]

@Bruno-DaSilva This should be fixed on the latest pre-release version. Can you give that a try and let us know if that doesn't work, please? 🙇‍♀️

[Bruno-DaSilva]

This looks like it's working on the pre-release version! Thanks for the quick fix 🙌

I'll leave it to you to close this issue (dunno if your definition of done includes waiting for full release)