Make log history only for non-chat edit actions

sourcegraph · Oct 25, 2024 · 56ae168 · 56ae168
1 parent 6ae80ae
commit 56ae168
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/vscode/src/commands/types.ts b/vscode/src/commands/types.ts
@@ -29,8 +29,6 @@ export interface CodyCommandArgs extends ExecuteEditArguments {
     requestID: string
     // where the command was triggered from
     source?: EventSource
-    // runs the command in chat mode, even if it's an edit command
-    runInChatMode?: boolean
     // current context to add on top of the command context
     userContextFiles?: ContextItem[]
     additionalInstruction?: PromptString

diff --git a/vscode/src/edit/execute.ts b/vscode/src/edit/execute.ts
@@ -50,6 +50,8 @@ export interface ExecuteEditArguments {
         insertionPoint?: vscode.Position
     }
     source?: EventSource
+    // runs the command in chat mode, even if it's an edit command
+    runInChatMode?: boolean
     telemetryMetadata?: FixupTelemetryMetadata
 }
 

diff --git a/vscode/src/edit/manager.ts b/vscode/src/edit/manager.ts
@@ -88,6 +88,7 @@ export class EditManager implements vscode.Disposable {
 
     public async executeEdit(args: ExecuteEditArguments = {}): Promise<FixupTask | undefined> {
         const {
+            runInChatMode,
             configuration = {},
             /**
              * Note: Source must default to `editor` as these are
@@ -231,7 +232,7 @@ export class EditManager implements vscode.Disposable {
             )
         }
         const provider = this.getProviderForTask(task)
-        await provider.startEdit()
+        await provider.startEdit({ saveInHistory: !runInChatMode })
         return task
     }
 

diff --git a/vscode/src/edit/provider.ts b/vscode/src/edit/provider.ts
@@ -58,7 +58,7 @@ export class EditProvider {
 
     constructor(public config: EditProviderOptions) {}
 
-    public async startEdit(): Promise<void> {
+    public async startEdit(options?: { saveInHistory: boolean }): Promise<void> {
         return wrapInActiveSpan('command.edit.start', async span => {
             this.config.controller.startTask(this.config.task)
             const model = this.config.task.model
@@ -103,7 +103,9 @@ export class EditProvider {
                 onTurnComplete: async () => {
                     typewriter.close()
                     typewriter.stop()
-                    void this.saveEditAsChatEntry(text)
+                    if (options?.saveInHistory) {
+                        void this.saveEditAsChatEntry(text)
+                    }
                     void this.handleResponse(text, false)
                     return Promise.resolve()
                 },
@@ -213,7 +215,7 @@ export class EditProvider {
         responseMessage += '```\n' + `${responseContent}\n` + '```'
 
         const chatEntry: SerializedChatTranscript = {
-            id: this.config.task.id,
+            id: Date.now().toString(36).replaceAll(/\d+/g, ''),
             interactions: [
                 {
                     humanMessage: {