Revert "V1 new client extension API, for inline edits + document code (…

…#3445)" This reverts commit 5356bb5. This is missing code review feedback which went to stevey/extension-client-api branch.
sourcegraph · Mar 21, 2024 · 2c7c8e8 · 2c7c8e8
1 parent 9036dbf
commit 2c7c8e8
Show file tree

Hide file tree

Showing 33 changed files with 501 additions and 874 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -62,13 +62,6 @@
       "outFiles": ["${workspaceFolder}/vscode/dist/**/*.js"],
       "args": ["--extensionDevelopmentPath=${workspaceRoot}/vscode", "--extensionDevelopmentKind=web"]
     },
-    {
-      "name": "Attach to Agent",
-      "port": 9229,
-      "request": "attach",
-      "skipFiles": ["<node_internals>/**"],
-      "type": "node"
-    },
     {
       "type": "node",
       "request": "launch",

diff --git a/...ngs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/CodyAgentClient.kt b/...ngs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/CodyAgentClient.kt
@@ -28,10 +28,8 @@ interface CodyAgentClient {
   // =============
   @JsonNotification("debug/message")
   fun debug_message(params: DebugMessage)
-  @JsonNotification("editTask/didUpdate")
-  fun editTask_didUpdate(params: EditTask)
-  @JsonNotification("editTask/didDelete")
-  fun editTask_didDelete(params: EditTask)
+  @JsonNotification("editTaskState/didChange")
+  fun editTaskState_didChange(params: EditTask)
   @JsonNotification("codeLenses/display")
   fun codeLenses_display(params: DisplayCodeLensParams)
   @JsonNotification("webview/postMessage")

diff --git a/...ngs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/CodyAgentServer.kt b/...ngs/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/CodyAgentServer.kt
@@ -34,20 +34,10 @@ interface CodyAgentServer {
   fun commands_smell(params: Null): CompletableFuture<String>
   @JsonRequest("commands/custom")
   fun commands_custom(params: Commands_CustomParams): CompletableFuture<CustomCommandResult>
-  @JsonRequest("editCommands/code")
-  fun editCommands_code(params: EditCommands_CodeParams): CompletableFuture<EditTask>
   @JsonRequest("editCommands/test")
   fun editCommands_test(params: Null): CompletableFuture<EditTask>
   @JsonRequest("commands/document")
   fun commands_document(params: Null): CompletableFuture<EditTask>
-  @JsonRequest("editTask/accept")
-  fun editTask_accept(params: FixupTaskID): CompletableFuture<Null>
-  @JsonRequest("editTask/undo")
-  fun editTask_undo(params: FixupTaskID): CompletableFuture<Null>
-  @JsonRequest("editTask/cancel")
-  fun editTask_cancel(params: FixupTaskID): CompletableFuture<Null>
-  @JsonRequest("editTask/getFoldingRanges")
-  fun editTask_getFoldingRanges(params: GetFoldingRangeParams): CompletableFuture<GetFoldingRangeResult>
   @JsonRequest("command/execute")
   fun command_execute(params: ExecuteCommandParams): CompletableFuture<Any>
   @JsonRequest("autocomplete/execute")

diff --git a/...in/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/EditCommands_CodeParams.kt b/...in/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/EditCommands_CodeParams.kt
diff --git a/...t/bindings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/EditTask.kt b/...t/bindings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/EditTask.kt
@@ -5,6 +5,5 @@ data class EditTask(
   val id: String? = null,
   val state: CodyTaskState? = null,
   val error: CodyError? = null,
-  val selectionRange: Range? = null,
 )
 
diff --git a/...indings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/FixupTaskID.kt b/...indings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/FixupTaskID.kt
diff --git a/...tlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/GetFoldingRangeParams.kt b/...tlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/GetFoldingRangeParams.kt
diff --git a/...tlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/GetFoldingRangeResult.kt b/...tlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/GetFoldingRangeResult.kt
diff --git a/...ndings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ParamsParams.kt b/...ndings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ParamsParams.kt
diff --git a/agent/package.json b/agent/package.json
@@ -17,7 +17,7 @@
     "build": "pnpm run build:root && pnpm run build:agent",
     "build-minify": "pnpm run build --minify",
     "agent": "pnpm run build && node dist/index.js",
-    "agent:debug": "pnpm run build && CODY_AGENT_TRACE_PATH=/tmp/agent.json CODY_AGENT_DEBUG_REMOTE=true node --enable-source-maps ./dist/index.js",
+    "agent:debug": "pnpm run build && node --inspect --enable-source-maps ./dist/index.js",
     "build-ts": "tsc --build",
     "build-agent-binaries": "pnpm run build && pkg  --compress GZip --no-bytecode --public-packages \"*\" --public . --out-path ${AGENT_EXECUTABLE_TARGET_DIRECTORY:-dist}",
     "test-agent-binary": "esbuild ./scripts/test-agent-binary.ts --bundle --platform=node --alias:vscode=./src/vscode-shim.ts --outdir=dist && node ./dist/test-agent-binary.js",

diff --git a/agent/src/AgentFixupControls.ts b/agent/src/AgentFixupControls.ts
diff --git a/agent/src/TestClient.ts b/agent/src/TestClient.ts
@@ -343,52 +343,33 @@ export class TestClient extends MessageHandler {
                 )
         }
 
-        let disposables: vscode.Disposable[]
+        let disposable: vscode.Disposable
         return new Promise<void>((resolve, reject) => {
-            disposables = [
-                this.onDidUpdateTask(({ id, state, error }) => {
-                    if (id === params.id) {
-                        switch (state) {
-                            case CodyTaskState.applied:
-                                return resolve()
-                            case CodyTaskState.error:
-                            case CodyTaskState.finished:
-                                return reject(
-                                    new Error(
-                                        `Task reached terminal state before being applied ${JSON.stringify(
-                                            {
-                                                id,
-                                                state: CodyTaskState[state],
-                                                error,
-                                            }
-                                        )}`
-                                    )
+            disposable = this.onDidChangeTaskState(({ id, state, error }) => {
+                if (id === params.id) {
+                    switch (state) {
+                        case CodyTaskState.applied:
+                            return resolve()
+                        case CodyTaskState.error:
+                        case CodyTaskState.finished:
+                            return reject(
+                                new Error(
+                                    `Task reached terminal state before being applied ${JSON.stringify({
+                                        id,
+                                        state: CodyTaskState[state],
+                                        error,
+                                    })}`
                                 )
-                        }
+                            )
                     }
-                }),
-                this.onDidDeleteTask(task => {
-                    if (task.id === params.id) {
-                        // Applied tasks can also be deleted, but in that case
-                        // the Promise is already resolved and this is a no-op.
-                        reject(
-                            new Error(`Task was deleted before being applied ${JSON.stringify(task)}`)
-                        )
-                    }
-                }),
-            ]
-        }).finally(() => {
-            for (const disposable of disposables) {
-                disposable.dispose()
-            }
-        })
+                }
+            })
+        }).finally(() => disposable.dispose())
     }
 
     public codeLenses = new Map<string, ProtocolCodeLens[]>()
-    public taskUpdate = new vscode.EventEmitter<EditTask>()
-    public onDidUpdateTask = this.taskUpdate.event
-    public taskDelete = new vscode.EventEmitter<EditTask>()
-    public onDidDeleteTask = this.taskDelete.event
+    public newTaskState = new vscode.EventEmitter<EditTask>()
+    public onDidChangeTaskState = this.newTaskState.event
     public webviewMessages: WebviewPostMessageParams[] = []
     public webviewMessagesEmitter = new vscode.EventEmitter<WebviewPostMessageParams>()
 
@@ -435,11 +416,8 @@ export class TestClient extends MessageHandler {
         this.connectProcess(this.agentProcess, error => {
             console.error(error)
         })
-        this.registerNotification('editTask/didUpdate', params => {
-            this.taskUpdate.fire(params)
-        })
-        this.registerNotification('editTask/didDelete', params => {
-            this.taskDelete.fire(params)
+        this.registerNotification('editTaskState/didChange', params => {
+            this.newTaskState.fire(params)
         })
 
         this.registerNotification('webview/postMessage', params => {