Skip to content

[cherry-pick] Update Copilot dependencies to version 1.0.28 #310381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vs-code-engineering wants to merge 1 commit into from
Closed

[cherry-pick] Update Copilot dependencies to version 1.0.28 #310381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions extensions/copilot/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions extensions/copilot/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6331,7 +6331,11 @@
"@anthropic-ai/claude-agent-sdk": "0.2.98",
"@anthropic-ai/sdk": "^0.82.0",
"@github/blackbird-external-ingest-utils": "^0.3.0",
<<<<<<< HEAD
"@github/copilot": "^1.0.26",
=======
"@github/copilot": "^1.0.28",
>>>>>>> 210358b4 (Update Copilot dependencies to version 1.0.28 (#310361))
"@google/genai": "^1.22.0",
"@humanwhocodes/gitignore-to-minimatch": "1.0.2",
"@microsoft/tiktokenizer": "^1.0.10",
Expand Down
13 changes: 7 additions & 6 deletions extensions/copilot/src/extension/chatSessions/copilotcli/node/test/copilotcliSession.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import type { ChatParticipantToolToken } from 'vscode';
import { ConfigKey, IConfigurationService } from '../../../../../platform/configuration/common/configurationService';
import { ILogService } from '../../../../../platform/log/common/logService';
import { NoopOTelService, resolveOTelConfig } from '../../../../../platform/otel/common/index';
import { NullRequestLogger } from '../../../../../platform/requestLogger/node/nullRequestLogger';
import { IRequestLogger } from '../../../../../platform/requestLogger/common/requestLogger';
import { NullRequestLogger } from '../../../../../platform/requestLogger/node/nullRequestLogger';
import { TestWorkspaceService } from '../../../../../platform/test/node/testWorkspaceService';
import { IWorkspaceService } from '../../../../../platform/workspace/common/workspaceService';
import { CancellationToken } from '../../../../../util/vs/base/common/cancellation';
Expand Down Expand Up @@ -349,7 +349,7 @@ describe('CopilotCLISession', () => {
sdkSession.send = async ({ prompt }: any) => {
sdkSession.emit('assistant.turn_start', {});
sdkSession.emit('assistant.message', { content: `Echo: ${prompt}` });
result = await sdkSession.emitPermissionRequest({ kind: 'write', fileName: sessionFilePath, intention: 'Write plan', diff: '' });
result = await sdkSession.emitPermissionRequest({ kind: 'write', fileName: sessionFilePath, intention: 'Write plan', diff: '', canOfferSessionApproval: false });
sdkSession.emit('assistant.turn_end', {});
};
const session = await createSession();
Expand Down Expand Up @@ -500,7 +500,7 @@ describe('CopilotCLISession', () => {
sdkSession.emit('assistant.turn_start', {});
sdkSession.emit('assistant.message', { content: `Echo: ${prompt}` });
// Mid way through, make it look like the sdk requested permission while emitting other messages.
result = await sdkSession.emitPermissionRequest({ kind: 'write', fileName: 'a.ts', intention: 'Update file', diff: '' });
result = await sdkSession.emitPermissionRequest({ kind: 'write', fileName: 'a.ts', intention: 'Update file', diff: '', canOfferSessionApproval: false });
sdkSession.emit('assistant.turn_end', {});
};
const stream = new MockChatResponseStream();
Expand All @@ -519,7 +519,7 @@ describe('CopilotCLISession', () => {
sdkSession.emit('assistant.turn_start', {});
sdkSession.emit('assistant.message', { content: `Echo: ${prompt}` });
// Mid way through, make it look like the sdk requested permission while emitting other messages.
result = await sdkSession.emitPermissionRequest({ kind: 'write', fileName: 'b.ts', intention: 'Update file', diff: '' });
result = await sdkSession.emitPermissionRequest({ kind: 'write', fileName: 'b.ts', intention: 'Update file', diff: '', canOfferSessionApproval: false });
sdkSession.emit('assistant.turn_end', {});
};
const stream = new MockChatResponseStream();
Expand All @@ -539,7 +539,7 @@ describe('CopilotCLISession', () => {
sdkSession.emit('assistant.turn_start', {});
sdkSession.emit('assistant.message', { content: `Echo: ${prompt}` });
// Mid way through, make it look like the sdk requested permission while emitting other messages.
result = await sdkSession.emitPermissionRequest({ kind: 'write', fileName: 'err.ts', intention: 'Update file', diff: '' });
result = await sdkSession.emitPermissionRequest({ kind: 'write', fileName: 'err.ts', intention: 'Update file', diff: '', canOfferSessionApproval: false });
sdkSession.emit('assistant.turn_end', {});
};
const stream = new MockChatResponseStream();
Expand Down Expand Up @@ -591,7 +591,8 @@ describe('CopilotCLISession', () => {
fileName: filePath,
intention: 'Apply edit',
diff: '',
toolCallId: String(i)
toolCallId: String(i),
canOfferSessionApproval: false
});
permissionResults.push(result);
// Complete the edit so the tracker (if it were real) would finish; emit completion event
Expand Down
2 changes: 1 addition & 1 deletion extensions/copilot/src/extension/chatSessions/copilotcli/node/test/permissionHelpers.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ describe('CopilotCLI permissionHelpers', () => {
});

it('maps write requests with filename', async () => {
const result = await getConfirmationToolParams(instaService, { kind: 'write', fileName: 'foo.ts', diff: '', intention: '' });
const result = await getConfirmationToolParams(instaService, { kind: 'write', fileName: 'foo.ts', diff: '', intention: '', canOfferSessionApproval: false });
assert(!!result);
expect(result.tool).toBe(ToolName.CoreConfirmationTool);
const input = result.input as any;
Expand Down
4 changes: 4 additions & 0 deletions extensions/copilot/src/extension/chatSessions/vscode-node/test/copilotCLISDKUpgrade.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ describe('CopilotCLI SDK Upgrade', function () {
path.join('prebuilds', 'linux-x64', 'computer.node'),
path.join('prebuilds', 'win32-arm64', 'computer.node'),
path.join('prebuilds', 'win32-x64', 'computer.node'),
<<<<<<< HEAD
// win32 native module (formerly win_error_mode)
=======
// win32
>>>>>>> 210358b4 (Update Copilot dependencies to version 1.0.28 (#310361))
path.join('prebuilds', 'win32-arm64', 'win32.node'),
path.join('prebuilds', 'win32-x64', 'win32.node'),
path.join('ripgrep', 'bin', 'darwin-arm64', 'rg'),
Expand Down
Loading