add prompt snippets support #234220

legomushroom · 2024-11-19T21:34:10Z

Related issue: https://github.com/microsoft/vscode-internalbacklog/issues/5220#issuecomment-2486738649

src/vs/base/common/stream.ts

legomushroom · 2024-11-19T21:50:11Z

src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.ts

@@ -75,7 +75,15 @@ export class ImplicitContextAttachmentWidget extends Disposable {
 		});
 		this.domNode.ariaLabel = ariaLabel;
 		this.domNode.tabIndex = 0;
-		const hintElement = dom.append(this.domNode, dom.$('span.chat-implicit-hint', undefined, 'Current file'));
+
+		const hintElement = dom.append(


Made it a bit more readable by splitting params to separate lines.

legomushroom · 2024-11-19T21:52:49Z

src/vs/workbench/contrib/chat/browser/chatInputPart.ts

-		if (this.implicitContext?.value) {
-			const implicitPart = store.add(this.instantiationService.createInstance(ImplicitContextAttachmentWidget, this.implicitContext, this._contextResourceLabels));
+		if (this._implicitContext?.value) {
+			const implicitPart = store.add(this.instantiationService.createInstance(


Put params on separate lines only to improve readability.

legomushroom · 2024-11-19T21:54:22Z

src/vs/workbench/contrib/chat/browser/chatVariables.ts

-
-		prompt.parts
-			.forEach((part, i) => {
+	public async resolveVariables(


Mostly readability improvements in this file, the logic remains the same.

Thanks, but I'd prefer to keep PRs focused more narrowly, and the word "mostly" makes it a little harder to review :)

Yeah sorry, it was very hard to read even on 27" monitor, so I was formatting it on the go as I was parsing through the code, and then decided to keep it. The same applies for other cases where I split long lines over. Let me know if you think that reverting this would help with the review at this point 👂

legomushroom · 2024-11-19T21:55:25Z

src/vs/workbench/contrib/chat/browser/chatVariables.ts

+		// to go first so that an replacement logic is simple
+		resolvedVariables
+			.sort((left, right) => {
+				assertDefined(


These asserts are to omit TS hacks ☺️

I'm fine with the ! because we know that these are parts of a prompt and have ranges, but the assert is fine too

If they always have ranges, we need to update the TS types then?
The asserts just add a more readable error messages here as opposed to a cryptic cannot read 'start' of 'undefined' you'd get with the bang ☺️

legomushroom · 2024-11-19T21:58:19Z

src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts

 	) {
 		super();
 		this._register(widget.inputEditor.onDidChangeModelContent(e => {
 			e.changes.forEach(c => {
 				// Don't mutate entries in _variables, since they will be returned from the getter
-				this._variables = coalesce(this._variables.map(ref => {
+				this._variables = coalesce(this._variables.map((ref) => {
+					if (c.text === `#file:${ref.filenameWithReferences}`) {


That's the only way I made it work and its not ideal, any better ideas? cc @roblourens @joyceerhl

What is this trying to do? Is this triggered when that text is inserted all at once?

When we add the (+N more) label to a filename after nested references are resolved, this is run and as the result the variables are removed. The logic below infers that the variables text have changed and are hence the variables are no longer valid and need to be removed.

Because we update the variable objects when we update the labels, this if check works, - if the variable text is really the same as the variable should have, do nothing.

legomushroom · 2024-11-19T22:02:17Z

src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.ts

-								endLineNumber: ref.range.endLineNumber,
-								endColumn: ref.range.endColumn + delta
-							}
+						ref.range = {


@roblourens do you recall the main reason for the // Don't mutate entries in _variables.. above? Because the ref is now a class instance with event listeners now, I do need to mutate the variables here 🤔

Because those objects will have been previously returned, and other objects will be holding on to them, and not expecting them to change. Maybe there is somewhere that we diff the previous object with the new one, and mutating the object breaks that. There are other ways we can solve that. But I don't quite understand the problem for you

Maybe there is somewhere that we diff the previous object with the new one

But that would break only if the diff logic relies on the object pointers, doing diffing by-attribute should be unaffected in either case?

There is no really a problem for me, just wanted to make sure that mutating the objects is fine here. We do need to mutate them now because the ref variable is a class instance now rather than a simple object it was before. The class instance can have event listeners registered on it by other code, and it handles nested file references resolution which we don't want to again over and over 🤷

legomushroom · 2024-11-19T22:11:55Z

src/vs/workbench/contrib/chat/common/chatRequestParser.ts

 		const refAtThisPosition = references.find(r =>
 			r.range.startLineNumber === position.lineNumber &&
 			r.range.startColumn === position.column);
 		if (refAtThisPosition) {
 			const length = refAtThisPosition.range.endColumn - refAtThisPosition.range.startColumn;
 			const text = message.substring(0, length);
 			const range = new OffsetRange(offset, offset + length);
-			return new ChatRequestDynamicVariablePart(range, refAtThisPosition.range, text, refAtThisPosition.id, refAtThisPosition.modelDescription, refAtThisPosition.data, refAtThisPosition.fullName, refAtThisPosition.icon, refAtThisPosition.isFile);
+			return new ChatRequestDynamicVariablePart(


Refactored to reduce the number of params used.

legomushroom · 2024-11-19T22:12:48Z

src/vs/workbench/contrib/chat/common/chatParserTypes.ts

-					(part as ChatRequestDynamicVariablePart).fullName,
-					(part as ChatRequestDynamicVariablePart).icon,
-					(part as ChatRequestDynamicVariablePart).isFile
+					variable,


Refactored to reduce the number of params on the constructor.

…the first unit test

…prove unit tests

…changes, added unit test for the `assertDefined` util

… add more unit tests for it

…d update variable label

…prompt request

…rences

…ble test utilities

…e stream

…or the `PromptFileReference` class

…ence` class

…ence-recursion-proof and add approptiate tests

…lying data source

…eference object only if `prompt-snippets` config value is set

…ile reference object only if `prompt-snippets` config value is set

roblourens

Not done reviewing but wanted to drop the first round of comments. Overall, when I'm working on a large feature, I usually try to start pushing small PRs to main as early as possible. That's the best way to avoid merge conflicts and get feedback early. Don't be afraid of pushing an incomplete feature behind a hidden setting, as long as it won't break anything. We do that often on this team. I also would rather avoid PRs that make multiple unrelated changes. It just gets a bit hard to review.

roblourens · 2024-11-20T09:40:52Z

src/vs/base/common/assertDefined.ts

+ * assertDefined(null, new Error('Should throw this error.'))
+ * ```
+ */
+export function assertDefined<T>(value: T, error: string | NonNullable<Error>): asserts value is NonNullable<T> {


We have this in types.ts, assertIsDefined

This one is a little bit different since it is an assert and doesn't require variable reassignment. Let me see if I can use the existing one without need to create let variable just for the assertion 🤔

roblourens · 2024-11-20T09:41:22Z

src/vs/base/common/stream.ts

@@ -186,7 +186,7 @@ export interface ITransformer<Original, Transformed> {
 	error?: IErrorTransformer;
 }

-export function newWriteableStream<T>(reducer: IReducer<T>, options?: WriteableStreamOptions): WriteableStream<T> {
+export function newWriteableStream<T>(reducer: IReducer<T> | null, options?: WriteableStreamOptions): WriteableStream<T> {


Optional argument? We generally use undefined over null

Used null on purpose to make it explicit to prevent subtle silent errors. It is too easy to overlook a variable or a function return value being an undefined and pass it over, hence I wanted to make sure the folks that using this to be very specific.

I do appreciate the work that TS has done with void and not treating the foo?: string and foo: undefined | string the same anymore, but there is still the cases when requiring the explicit null saves some hair on your head 🤗 Do you think it would be fine with undefined? You have more context so happy to revert if you think it won't be a pain in the future.

roblourens · 2024-11-20T09:44:57Z

src/vs/workbench/contrib/chat/browser/attachments/implicitContextAttachment.ts

 		const currentFile = localize('openEditor', "Current file context");
 		const inactive = localize('enableHint', "disabled");
 		const currentFileHint = currentFile + (this.attachment.enabled ? '' : ` (${inactive})`);
-		const title = `${currentFileHint}\n${uriLabel}`;
+		const title = `${currentFileHint}${this.getUriLabel(file)}`;


Looks like this returns an array, concatenated to a string, is that right?

Great catch! I've found this issue too during smoke testing but didn't have a chance to fix it yet with all the power issues in the NW 🙈

roblourens · 2024-11-20T09:51:47Z

src/vs/workbench/contrib/chat/browser/chatInputPart.ts

 					state: WorkingSetEntryState.Attached,
 					kind: 'reference',
 				});
+
+				seenEntries.add(child);


This seems like a correct fix (cc @joyceerhl) but is this method even related to your new feature? I prefer not grouping unrelated fixes into a PR that's already really big

This one relates to my feature only - the child references is the new logic. The existing logic is now on the line 1086 above now, and that one would still need the fix to be applied.

roblourens · 2024-11-20T09:53:27Z

src/vs/workbench/contrib/chat/browser/chatVariables.ts

-
-		prompt.parts
-			.forEach((part, i) => {
+	public async resolveVariables(


Thanks, but I'd prefer to keep PRs focused more narrowly, and the word "mostly" makes it a little harder to review :)

roblourens · 2024-11-20T09:59:27Z

src/vs/workbench/contrib/chat/browser/chatWidget.ts

@@ -193,7 +195,18 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				return { text: '', parts: [] };
 			}

-			this.parsedChatRequest = this.instantiationService.createInstance(ChatRequestParser).parseChatRequest(this.viewModel!.sessionId, this.getInput(), this.location, { selectedAgent: this._lastSelectedAgent });
+			assertDefined(


Seems unnecessary, this is right after a !this.viewModel check

Good point 💥 I've tried to omit the ! in the this.viewModel!.sessionId but seems like that was also unnecessary here anyway ☺️

roblourens · 2024-11-20T10:01:10Z

src/vs/workbench/contrib/chat/browser/chatWidget.ts

@@ -1046,6 +1065,29 @@ export class ChatWidget extends Disposable implements IChatWidget {
 				this.telemetryService.publicLog2<ChatEditingWorkingSetEvent, ChatEditingWorkingSetClassification>('chatEditing/workingSetSize', { originalSize: this.inputPart.attemptedWorkingSetEntriesCount, actualSize: uniqueWorkingSetEntries.size });
 			}

+			// factor in nested references of dynamic variables into the implicit attached context
+			const variableModel = this.getContrib<ChatDynamicVariableModel>(ChatDynamicVariableModel.ID);


If the ChatWidget calls to a contrib directly, then it's no longer a "contrib". The point of that model is to have something that can implement a feature on top of an object using its public interface, but is totally decoupled from the object.

So either this should no longer be a 'contrib' or something else needs to change, I think I need to understand the overall thing better to decide.

I needed to get to the variables list to extend the attached context with the resolved nested file references below.
Maybe there is a better place of doing this, or a better place to add the nested file references to? 🤔

roblourens · 2024-11-20T10:04:04Z

src/vs/workbench/common/codecs/chatbotPromptCodec/tokens/fileReference.ts

+/**
+ * A file reference token inside a prompt.
+ */
+export class FileReference extends BaseToken {


I'm not sure workbench/common is the right place for these files, it all seems specific to the chat feature, so should it stay under workbench/contrib/chat/...?

roblourens · 2024-11-20T10:07:13Z

src/vs/workbench/contrib/chat/browser/promptFileReference.ts

+ * fileReference.dispose();
+ * ```
+ */
+export class PromptFileReference extends Disposable {


It looks like this is sort of a model object that doesn't depend on anything else in browser/ so can it go in the common/ layer?

Was thinking the same but wasn't 100% certain, let me try to move it over 🚀

roblourens · 2024-11-20T10:11:42Z

src/vs/workbench/contrib/chat/test/common/utils/randomInt.ts

+ * );
+ * ```
+ */
+export const randomInt = (max: number, min: number = 0): number => {


Might be a good one for src/vs/base/common/numbers.ts?

Thanks for the pointer! I definitely need tips on the files structure 🤗

roblourens · 2024-11-20T18:17:55Z

src/vs/workbench/contrib/chat/browser/promptFileReference.ts

+		}
+
+		if (typeof value === 'string') {
+			return value.trim().toLowerCase() === 'true';


Why is this also expecting a string vs boolean?

The returned value is unknown and we provide the JSON view of the config, so users may add the "true"(or even "True") value there and get confused? Or we already parse it to a correct boolean value under the hood?

roblourens · 2024-11-20T18:21:35Z

src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.ts

@@ -51,7 +51,9 @@ class InputEditorDecorations extends Disposable {

 		this.updateInputEditorDecorations();
 		this._register(this.widget.inputEditor.onDidChangeModelContent(() => this.updateInputEditorDecorations()));
-		this._register(this.widget.onDidChangeParsedInput(() => this.updateInputEditorDecorations()));
+		this._register(this.widget.onDidChangeParsedInput(() => {


I don't think this is necessarily an improvement, we use the single-line version a lot

I think it is a readability improvement in the sense it makes it more explicit, hence take less brain cycles to parse the syntax.

But the main reason for the change is not readability - it takes less keystrokes to change this code in the future, and you can set a breakpoint immediately during debugging.

Do you know what is the main reason for using this pattern in the codebase? Is it mostly less typing or some motives involved?

roblourens · 2024-11-20T18:29:57Z

src/vs/workbench/contrib/chat/browser/promptFileReference.ts

+		}
+
+		// get all file references in the file contents
+		const references = await this.codec.decode(fileStream.value).consumeAll();


Just wondering whether this needs to be a stream? Do you use it as a stream?

Maybe it's just nice to have the stream since you are working from a file stream, just wondering if there is a case where you would use it that way

Because the amount of data we need to parse might be substantial and because filesystem IO is involved, I thought it is important to keep it as a stream so we can do the parsing concurrently.

I have a follow-up task to make the logic here take leverage of that. Beside this line, the decoders are composed(e.g., PromptFileDecoder uses SimpleTokenDecoder) hence fully take advantage of the fact that an underlying decoder is a stream of messages 🚀

roblourens · 2024-11-20T18:34:13Z

I can't get this to work- I set the setting, should I see intellisense for #file? If I manually type #file:./test.js, it doesn't include that file.

Also, it seems like this might break normal implicit context?

legomushroom requested review from roblourens and joyceerhl November 19, 2024 21:34

legomushroom self-assigned this Nov 19, 2024

vs-code-engineering bot added this to the November 2024 milestone Nov 19, 2024

legomushroom commented Nov 19, 2024

View reviewed changes

src/vs/base/common/stream.ts Show resolved Hide resolved

legomushroom force-pushed the legomushroom/prompt-snippet-completions branch from 6f5026f to a927e4e Compare November 19, 2024 21:45

legomushroom commented Nov 19, 2024

View reviewed changes

legomushroom added 16 commits November 19, 2024 14:18

[prompt snippets]: working on recursive file references

cc31da6

[prompt snippets]: working on file contents codec

5d68be0

[prompt snippets]: implement the LinesCodecDecoder

f0d0faf

[prompt snippets]: working on the SimpleTokensCodecDecoder

f89e94c

[prompt snippets]: implement first version of PromptSyntaxCodec

6c42aa6

[prompt snippets]: add Range attributes to all the tokens

379d2bb

[prompt snippets]: refactoring components to standalone files

8683ea4

[prompt snippets]: move out components to separate files, working on …

93c6558

…the first unit test

[prompt snippets]: add the first unit test for LinesDecoder

cccb0bd

[prompt snippets]: add first unit test for the SimpleDecoder

0256ef3

[prompt snippets]: refactor SimpleDecoder logic

3f22fc7

[prompt snippets]: make SimpleDecoder handle \t characters and im…

14713d5

…prove unit tests

[prompt snippets]: add unit tests for the ChatbotPromptCodec codec

678b4f9

[prompt snippets]: add unit test for the ChatbotPromptReference

504b34e

[prompt snippets]: working on enhancing prompt context

52eb47f

[prompt snippets]: enahnce working set file references on submit

d363c1b

legomushroom added 24 commits November 19, 2024 14:18

[prompt snippets]: PromptReference can now subscribe to filesystem …

f006d0b

…changes, added unit test for the `assertDefined` util

[prompt snippets]: make LinesDecoder to also emit NewLine tokens,…

1ff7e53

… add more unit tests for it

[prompt snippets]: resolve nested references for dynamic variables an…

1b03e4c

…d update variable label

[prompt snippets]: add nested file references to implicit context of …

e656a9f

…prompt request

[prompt snippets]: variable hover label now includes nested file refe…

8d369fc

…rences

[prompt snippets]: add the TestDecoder and TestLinesDecoder reusa…

5c10ca5

…ble test utilities

[prompt snippets]: add unit tests for ChatbotPromptDecoder decoder

22daaea

[prompt snippets]: refactor decoders to eliminate static type hacks

b9e20b3

[prompt snippets]: improve BaseDecoder logic and docs

6bbf235

[prompt snippets]: add unit tests for the new reduce-less logic of th…

f7aa6fe

…e stream

[prompt snippets]: improve doc comments, finish the basic unit test f…

bd154da

…or the `PromptFileReference` class

[prompt snippets]: finish the main unit test for the `PromptFileRefer…

e843802

…ence` class

[prompt snippets]: make the PromptFileReference class ininite-refer…

db733f5

…ence-recursion-proof and add approptiate tests

[prompt snippets]: cleanup

1b3cd2a

[prompt snippets]: ensure codecs work well with UTF16 codepoints

937c0be

[prompt snippets]: add randomInt() utility and related tests

d1a110b

[prompt snippets]: refactor and add more unit tests

85f5590

[prompt snippets]: fix unresolved Buffer import reference

c032941

[prompt snippets]: refactor LinesDecoder to use VSBuffer as under…

cefb756

…lying data source

[prompt snippets]: make the ImplicitContext to create prompt file r…

530d070

…eference object only if `prompt-snippets` config value is set

[prompt snippets]: make the ChatDynamicVariable to resolve prompt f…

8cbd1ca

…ile reference object only if `prompt-snippets` config value is set

[prompt snippets]: localize (+N more) labels

bdaf897

[prompt snippets]: pre PR cleanups

52497e7

[prompt snippets]: minor cleanups

2fa00b9

legomushroom force-pushed the legomushroom/prompt-snippet-completions branch from a927e4e to 2fa00b9 Compare November 19, 2024 22:18

roblourens reviewed Nov 20, 2024

View reviewed changes

add prompt snippets support #234220

Are you sure you want to change the base?

add prompt snippets support #234220

Conversation

legomushroom commented Nov 19, 2024

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

legomushroom Nov 19, 2024 • edited Loading

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

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

roblourens 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

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

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

roblourens commented Nov 20, 2024

legomushroom Nov 19, 2024 •

edited

Loading