Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
56 changes: 28 additions & 28 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5928,7 +5928,7 @@
"@anthropic-ai/claude-agent-sdk": "^0.2.52",
"@anthropic-ai/sdk": "^0.78.0",
"@github/blackbird-external-ingest-utils": "^0.3.0",
"@github/copilot": "^0.0.415",
"@github/copilot": "^0.0.420",
"@google/genai": "^1.22.0",
"@humanwhocodes/gitignore-to-minimatch": "1.0.2",
"@microsoft/tiktokenizer": "^1.0.10",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,11 @@ export function buildChatHistoryFromEvents(sessionId: string, modelId: string |
}
});
((event.data.attachments || []))
.filter(attachment => attachment.type === 'selection' ? true : !isInstructionAttachmentPath(attachment.path))
.filter(attachment => attachment.type === 'selection' || attachment.type === 'github_reference' ? true : !isInstructionAttachmentPath(attachment.path))
.forEach(attachment => {
if (attachment.type === 'github_reference') {
return;
}
if (attachment.type === 'selection') {
const range = attachment.displayName ? getRangeInPrompt(event.data.content || '', attachment.displayName) : undefined;
const uri = Uri.file(attachment.filePath);
Expand Down
2 changes: 1 addition & 1 deletion src/extension/chatSessions/copilotcli/node/copilotCli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export interface CopilotCLIModelInfo {
readonly maxInputTokens?: number;
readonly maxOutputTokens?: number;
readonly maxContextWindowTokens: number;
readonly supportsVision: boolean;
readonly supportsVision?: boolean;
}

export interface ICopilotCLIModels {
Expand Down
12 changes: 10 additions & 2 deletions src/extension/chatSessions/copilotcli/node/copilotcliSession.ts
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,11 @@ export class CopilotCLISession extends DisposableStore implements ICopilotCLISes
result.push(`## Attachments`);
result.push(`~~~`);
attachments.forEach(attachment => {
result.push(`- ${attachment.displayName} (${attachment.type}, ${attachment.type === 'selection' ? attachment.filePath : attachment.path})`);
if (attachment.type === 'github_reference') {
result.push(`- ${attachment.title}: (${attachment.number}, ${attachment.type}, ${attachment.referenceType})`);
} else {
result.push(`- ${attachment.displayName} (${attachment.type}, ${attachment.type === 'selection' ? attachment.filePath : attachment.path})`);
}
});
result.push(`~~~`);
result.push(``);
Expand Down Expand Up @@ -717,7 +721,11 @@ export class CopilotCLISession extends DisposableStore implements ICopilotCLISes
result.push(`## Attachments`);
result.push(`~~~`);
attachments.forEach(attachment => {
result.push(`- ${attachment.displayName} (${attachment.type}, ${attachment.type === 'selection' ? attachment.filePath : attachment.path})`);
if (attachment.type === 'github_reference') {
result.push(`- ${attachment.title}: (${attachment.number}, ${attachment.type}, ${attachment.referenceType})`);
} else {
result.push(`- ${attachment.displayName} (${attachment.type}, ${attachment.type === 'selection' ? attachment.filePath : attachment.path})`);
}
});
result.push(`~~~`);
result.push(``);
Expand Down