Cody: Inline Assist #51679

abeatrix · 2023-05-09T22:15:10Z

Close #51363

This PR introduces the ability to interact with Cody in File View using Comments.:

You can initiate a conversation with Cody by creating a comment thread.
Add /fix or /f to your comment would initiate a fixup task, which just runs the existing fixup recipe (using /fix in non-comments view is not supported)
fixup tasks made from comments will highlight the selected code in Cody's color based on current state:
pending state:
Set behind the cody.experimental.inline flag

executed state:

Other minor changes:

rename the command folder to services
update recipes format for readability

Note:

The comments with fixup basically just provides the current fixup an interface that's easy and more intuitive to navigate. The recipe is still the same, except it now takes input from comments as additional instructions when available.
should be replaced with the interactive api when it's available

Test plan

All tests have passed

Check Loom for details: https://www.loom.com/share/28e7eac473b44501a7e011d9f26ac0ce

sourcegraph-buildkite · 2023-05-09T22:22:17Z

Bundle size report 📦

Initial size	Total size	Async size	Modules
0.00% (0.00 kb)	0.00% (+0.01 kb)	0.00% (+0.01 kb)	0.00% (0)

Look at the Statoscope report for a full comparison between the commits ad4da31 and d230a04 or learn more.

Open explanation

Initial size is the size of the initial bundle (the one that is loaded when you open the page)
Total size is the size of the initial bundle + all the async loaded chunks
Async size is the size of all the async loaded chunks
Modules is the number of modules in the initial bundle

sourcegraph-bot · 2023-05-09T22:23:18Z

📖 Storybook live preview

philipp-spiess

Amazing work!

Didn't do a full review as I’m not super familiar with the product direction but I've played around with it and it works well.

One question I have is if we should put this behind a feature flag, similar to completions?

After testing this branch, I am seeing this new comment sidebar which was a bit much for me personally (especially since the + icon moves around when I use the mouse 😐). Given the feedback we have for completions (and basically that people use Cody because it does not enable completions by default), I wonder if we should use the same for this feature since it, IMO, is in the same level of intrusiveness.

Screen.Recording.2023-05-10.at.11.45.26.mov

Also this PR is missing a changelog 😎

philipp-spiess · 2023-05-10T09:40:00Z

client/cody-shared/src/chat/recipes/fixup.ts

+    This is part of the file {fileName}. The part of the file I have selected is highlighted with <selection> tags. You are helping me to work on that part as my coding assistant.
+    Follow the instructions in the selected part plus the additional instructions to produce a rewritten replacement for only the selected part.
+    Put the rewritten replacement inside <selection> tags. I only want to see the code within <selection>.
+    Do not move code from outside the selection into the selection in your reply.
+    Do not remove code inside the <selection> tags that might be being used by the code outside the <selection> tags.
+    It is OK to provide some commentary within the replacement <selection>.
+    Only return provide me the replacement <selection> and nothing else.
+    If it doesn't make sense, you do not need to provide <selection>.


How is this placeholder insertion working in your test? I tried something similar for completions to simulate a "fill-in-middle" behavior but occasionally Claude wasn't responding with sensible content, e.g. it responded with adding more of these tags or creating invalid code.

Maybe the different is Claude 1.3 vs. Claude Instant?

It's been working well for me but it might be because I've only been making changes to small chunks of code 🤔 This is the original fixup prompt though so it should work the same as it currently is now but that's a good thing to note!

client/cody/src/editor/vscode-editor.ts

philipp-spiess · 2023-05-10T09:50:59Z

To add to the message above: I don't mind if we put this feature flag on by default but I would personally like to have an option to turn it off other than removing Cody!

But also cc @jdorfman who has shared the feedback for completions being off by default in Slack before (c.f. this thread)

abeatrix · 2023-05-10T16:47:30Z

I would personally like to have an option to turn it off other than removing Cody!

Yea 100% agree! Just put it behind a feature flag and set it to false by default.

dominiccooney

Looks good.

I look forward to getting the finer-grained fixup highlighting, fixup task list, etc. working with this.

I would love to talk offline with you and @philipp-spiess about prompting.

dominiccooney · 2023-05-11T03:37:20Z

client/cody-shared/src/chat/recipes/fixup.ts

+        const promptText = Fixup.prompt
+            .replace('{humanInput}', truncateText(humanChatInput, MAX_HUMAN_INPUT_TOKENS))
+            .replace('{responseMultiplexerPrompt}', context.responseMultiplexer.prompt())
+            .replace('{truncateFollowingText}', truncateText(selection.followingText, quarterFileContext))


For readability it makes more sense to have the preceding text, the selected text, and the following text in that order because that's the order they're in the file and the prompt. Doing it backwards here adds to the cognitive burden of which end of the context text is being truncated.

ahhh yea I can see how it is confusing. The reason I did it backward is because .replace would only replace the first match. So if I replace {truncateFollowingText} first, which is in the first part of the original prompt, and then replace {humanInput} afterward, it would look for the first {humanInput} match. So if the replaced context from {truncateFollowingText} happens to have the word {humanInput}, i think it will replace that instead (if I understand it correctly).

Makes perfect sense. Maybe a brief comment that these are replaced in reverse order to avoid colliding with the placeholder if it occurs in the input. You could also note in the template that if the order of the placeholders changes you have to update this to insert them in reverse order.

true that's a good point, i need to remember about adding comments and tests! I will do it in another PR tomorrow since I just merged this 😅 Thank you!

dominiccooney · 2023-05-11T03:39:24Z

client/cody-shared/src/chat/recipes/inline-chat.ts

+    As my coding assistant, please help me with my questions:
+    {humanInput}
+
+    ## Instruction


I'd love some background offline about how you arrived at these instructions.

dominiccooney · 2023-05-11T03:40:02Z

client/cody-shared/src/chat/recipes/inline-chat.ts

+    `
+
+    public static readonly displayPrompt = `
+    \nQuestions based on the code below:\n\`\`\`\n{selectedText}\n\`\`\`\n`


Did you try giving Cody some of the surrounding context, as well as the selection, and see if that made responses better?

Are there any cases you feel are particularly easy or hard for Cody with this prompt?

I did! I originally had it in the same message (link to code), but it seems like it works the same if i include it in the getContextMessages below

abeatrix · 2023-05-11T04:06:20Z

Looks good.

I look forward to getting the finer-grained fixup highlighting, fixup task list, etc. working with this.

I would love to talk offline with you and @philipp-spiess about prompting.

Thanks for the review! I'll put time on your calendar to chat with you and @philipp-spiess on prompting, or we can do it async :D ?

abeatrix added 2 commits May 9, 2023 07:25

Refactor and format fixup prompt

01e1414

Cody: Comments with fixup

fdaa664

cla-bot bot added the cla-signed label May 9, 2023

abeatrix requested review from dominiccooney and a team May 9, 2023 22:18

abeatrix added 3 commits May 9, 2023 15:26

Fix extra line count

02bc70f

Merge branch 'main' into bee/cody-file

cd31e09

Fix BUILD

8a3944b

philipp-spiess reviewed May 10, 2023

View reviewed changes

abeatrix added 2 commits May 10, 2023 09:38

Set feature flag

9dab460

Merge branch 'main' into bee/cody-file

b698983

abeatrix added 2 commits May 10, 2023 11:00

Rename to inline chat

a9db278

Fix BUILD

693dc9b

abeatrix changed the title ~~Cody: Comments with fixup decors~~ Cody: Inline Chat May 10, 2023

abeatrix added 2 commits May 10, 2023 16:08

clean up

1d0a73e

Fix BUILD

ad4da31

abeatrix changed the title ~~Cody: Inline Chat~~ Cody: Inline Assist May 10, 2023

abeatrix requested review from a team and philipp-spiess May 10, 2023 23:28

dominiccooney approved these changes May 11, 2023

View reviewed changes

abeatrix merged commit f692117 into main May 11, 2023
25 checks passed

abeatrix deleted the bee/cody-file branch May 11, 2023 04:07

This was referenced May 12, 2023

Non-Stop Cody: Clean up returned code from Claude #51305

Closed

Non-Stop Cody: Add Codelenses for post-fixup actions #51960

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cody: Inline Assist #51679

Cody: Inline Assist #51679

abeatrix commented May 9, 2023 •

edited

sourcegraph-buildkite commented May 9, 2023 •

edited

sourcegraph-bot commented May 9, 2023 •

edited

philipp-spiess left a comment

philipp-spiess May 10, 2023

abeatrix May 10, 2023

philipp-spiess commented May 10, 2023

abeatrix commented May 10, 2023

dominiccooney left a comment

dominiccooney May 11, 2023

abeatrix May 11, 2023

dominiccooney May 11, 2023

abeatrix May 11, 2023

dominiccooney May 11, 2023

dominiccooney May 11, 2023

abeatrix May 11, 2023

abeatrix commented May 11, 2023

Cody: Inline Assist #51679

Cody: Inline Assist #51679

Conversation

abeatrix commented May 9, 2023 • edited

Test plan

sourcegraph-buildkite commented May 9, 2023 • edited

Bundle size report 📦

sourcegraph-bot commented May 9, 2023 • edited

philipp-spiess left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

philipp-spiess commented May 10, 2023

abeatrix commented May 10, 2023

dominiccooney left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abeatrix commented May 11, 2023

abeatrix commented May 9, 2023 •

edited

sourcegraph-buildkite commented May 9, 2023 •

edited

sourcegraph-bot commented May 9, 2023 •

edited