Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-18 06:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix error in handling Copilot CLI edits (#2064)

Browse Source
This commit is contained in:
Don Jayamanne
2025-11-18 20:02:25 +00:00
committed by GitHub
parent 17f63340fe
commit 16c06e5a8a
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/copilot/src/extension/agents/copilotcli/node/copilotcliSession.ts
+3 -5
View File
@@ -281,13 +281,12 @@ export class CopilotCLISession extends DisposableStore implements ICopilotCLISes
}
}
let toolCall: ToolCall | undefined;
if (workingDirectory && permissionRequest.kind === 'write') {
const editFile = permissionRequest.kind === 'write' ? Uri.file(permissionRequest.fileName) : undefined;
const toolCall = editFile ? getEditKeyForFile(editFile) : undefined;
if (workingDirectory && permissionRequest.kind === 'write' && editFile) {
// TODO:@rebornix @lszomoru
// If user is writing a file in the working directory configured for the session, AND the working directory is not a workspace folder,
// auto-approve the write request. Currently we only set non-workspace working directories when using git worktrees.
const editFile = Uri.file(permissionRequest.fileName);
toolCall = getEditKeyForFile(editFile);
const isWorkspaceFile = this.workspaceService.getWorkspaceFolder(editFile);
const isWorkingDirectoryFile = !this.workspaceService.getWorkspaceFolder(Uri.file(workingDirectory)) && extUriBiasedIgnorePathCase.isEqualOrParent(editFile, Uri.file(workingDirectory));
@@ -324,7 +323,6 @@ export class CopilotCLISession extends DisposableStore implements ICopilotCLISes
if (await permissionHandler(permissionRequest, toolCall, token)) {
// If we're editing a file, start tracking the edit & wait for core to acknowledge it.
const editFile = permissionRequest.kind === 'write' ? Uri.file(permissionRequest.fileName) : undefined;
if (editFile && toolCall && this._stream) {
this.logService.trace(`[CopilotCLISession] Starting to track edit for toolCallId ${toolCall.toolCallId} & file ${editFile.fsPath}`);
await editTracker.trackEdit(toolCall.toolCallId, [editFile], this._stream);