Skip to content
Open
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Adds a new _upstream_ sub-command to the _branch_ Git Command Palette
- Adds updated AI model support for GitLens' AI features
- Adds GPT-5 family (GPT-5, GPT-5 Mini, GPT-5 Nano), and Claude 4.1 Opus models
- Add Azure DevOps Server integration support ([#4478](https://github.com/gitkraken/vscode-gitlens/issues/4478))
- Adds AI powered operations for a branch: "Recompose branch commits", "Recompose unpushed commits", "Explain Unpushed Changed". They are added to the _Commit Graph_ and views context menu for branches ([#4443](https://github.com/gitkraken/vscode-gitlens/issues/4443))
- Adds Azure DevOps Server integration support ([#4478](https://github.com/gitkraken/vscode-gitlens/issues/4478))

### Changed

Expand Down
4 changes: 2 additions & 2 deletions ThirdPartyNotices.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ This project incorporates components from the projects listed below.
13. @opentelemetry/sdk-trace-base version 2.0.1 (https://github.com/open-telemetry/opentelemetry-js)
14. @opentelemetry/semantic-conventions version 1.36.0 (https://github.com/open-telemetry/opentelemetry-js)
15. @shoelace-style/shoelace version 2.20.1 (https://github.com/shoelace-style/shoelace)
16. @vscode/codicons version 0.0.39 (https://github.com/microsoft/vscode-codicons)
16. @vscode/codicons version 0.0.36 (https://github.com/microsoft/vscode-codicons)
17. billboard.js version 3.16.0 (https://github.com/naver/billboard.js)
18. https-proxy-agent version 5.0.1 (https://github.com/TooTallNate/node-https-proxy-agent)
19. iconv-lite version 0.6.3 (https://github.com/ashtuchkin/iconv-lite)
20. lit version 3.3.1 (https://github.com/lit/lit)
21. marked version 16.1.1 (https://github.com/markedjs/marked)
21. marked version 16.0.0 (https://github.com/markedjs/marked)
22. microsoft/vscode (https://github.com/microsoft/vscode)
23. node-fetch version 2.7.0 (https://github.com/bitinn/node-fetch)
24. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify)
Expand Down
78 changes: 78 additions & 0 deletions contributions.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,58 @@
]
}
},
"gitlens.ai.aiRebaseBranch:graph": {
"label": "AI Recompose Branch Commits (Preview)",
"icon": "$(sparkle)",
"menus": {
"webview/context": [
{
"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+recomposable\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
"group": "1_gitlens_actions",
"order": 6
}
]
}
},
"gitlens.ai.aiRebaseBranch:views": {
"label": "AI Recompose Branch Commits (Preview)",
"icon": "$(sparkle)",
"menus": {
"view/item/context": [
{
"when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+recomposable\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
"group": "1_gitlens_actions",
"order": 6
}
]
}
},
"gitlens.ai.aiRebaseUnpushed:graph": {
"label": "AI Recompose Unpushed Commits (Preview)",
"icon": "$(sparkle)",
"menus": {
"webview/context": [
{
"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+ahead\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
"group": "1_gitlens_actions",
"order": 7
}
]
}
},
"gitlens.ai.aiRebaseUnpushed:views": {
"label": "AI Recompose Unpushed Commits (Preview)",
"icon": "$(sparkle)",
"menus": {
"view/item/context": [
{
"when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+ahead\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
"group": "1_gitlens_actions",
"order": 7
}
]
}
},
"gitlens.ai.explainBranch": {
"label": "Explain Branch Changes (Preview)...",
"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
Expand Down Expand Up @@ -113,6 +165,32 @@
]
}
},
"gitlens.ai.explainUnpushed:graph": {
"label": "Explain Unpushed Changes (Preview)",
"icon": "$(sparkle)",
"menus": {
"webview/context": [
{
"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+ahead\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
"group": "1_gitlens_actions_4",
"order": 102
}
]
}
},
"gitlens.ai.explainUnpushed:views": {
"label": "Explain Unpushed Changes (Preview)",
"icon": "$(sparkle)",
"menus": {
"view/item/context": [
{
"when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+ahead\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
"group": "3_gitlens_ai",
"order": 2
}
]
}
},
"gitlens.ai.explainWip": {
"label": "Explain Working Changes (Preview)...",
"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
Expand Down
2 changes: 1 addition & 1 deletion docs/telemetry-events.md

Large diffs are not rendered by default.

84 changes: 84 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6147,6 +6147,26 @@
"category": "GitLens",
"icon": "$(person-add)"
},
{
"command": "gitlens.ai.aiRebaseBranch:graph",
"title": "AI Recompose Branch Commits (Preview)",
"icon": "$(sparkle)"
},
{
"command": "gitlens.ai.aiRebaseBranch:views",
"title": "AI Recompose Branch Commits (Preview)",
"icon": "$(sparkle)"
},
{
"command": "gitlens.ai.aiRebaseUnpushed:graph",
"title": "AI Recompose Unpushed Commits (Preview)",
"icon": "$(sparkle)"
},
{
"command": "gitlens.ai.aiRebaseUnpushed:views",
"title": "AI Recompose Unpushed Commits (Preview)",
"icon": "$(sparkle)"
},
{
"command": "gitlens.ai.explainBranch",
"title": "Explain Branch Changes (Preview)...",
Expand Down Expand Up @@ -6192,6 +6212,16 @@
"title": "Explain Changes (Preview)",
"icon": "$(sparkle)"
},
{
"command": "gitlens.ai.explainUnpushed:graph",
"title": "Explain Unpushed Changes (Preview)",
"icon": "$(sparkle)"
},
{
"command": "gitlens.ai.explainUnpushed:views",
"title": "Explain Unpushed Changes (Preview)",
"icon": "$(sparkle)"
},
{
"command": "gitlens.ai.explainWip",
"title": "Explain Working Changes (Preview)...",
Expand Down Expand Up @@ -10796,6 +10826,22 @@
"command": "gitlens.addAuthors",
"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders"
},
{
"command": "gitlens.ai.aiRebaseBranch:graph",
"when": "false"
},
{
"command": "gitlens.ai.aiRebaseBranch:views",
"when": "false"
},
{
"command": "gitlens.ai.aiRebaseUnpushed:graph",
"when": "false"
},
{
"command": "gitlens.ai.aiRebaseUnpushed:views",
"when": "false"
},
{
"command": "gitlens.ai.explainBranch",
"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
Expand Down Expand Up @@ -10832,6 +10878,14 @@
"command": "gitlens.ai.explainStash:views",
"when": "false"
},
{
"command": "gitlens.ai.explainUnpushed:graph",
"when": "false"
},
{
"command": "gitlens.ai.explainUnpushed:views",
"when": "false"
},
{
"command": "gitlens.ai.explainWip",
"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
Expand Down Expand Up @@ -16990,6 +17044,16 @@
"when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+(remote|tracking)\\b)(?!.*?\\b\\+closed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:repos:withRemotes",
"group": "1_gitlens_actions@3"
},
{
"command": "gitlens.ai.aiRebaseBranch:views",
"when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+recomposable\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
"group": "1_gitlens_actions@6"
},
{
"command": "gitlens.ai.aiRebaseUnpushed:views",
"when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+ahead\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
"group": "1_gitlens_actions@7"
},
{
"command": "gitlens.views.mergeBranchInto",
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)(?!.*?\\b\\+closed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
Expand Down Expand Up @@ -17080,6 +17144,11 @@
"when": "viewItem =~ /gitlens:branch\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
"group": "3_gitlens_ai@1"
},
{
"command": "gitlens.ai.explainUnpushed:views",
"when": "viewItem =~ /gitlens:branch\\b(?=.*?\\b\\+ahead\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
"group": "3_gitlens_ai@2"
},
{
"command": "gitlens.views.openChangedFileDiffsWithMergeBase",
"when": "viewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/ && !listMultiSelection",
Expand Down Expand Up @@ -22832,6 +22901,16 @@
"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+(remote|tracking)\\b)(?!.*?\\b\\+closed\\b)/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:repos:withRemotes",
"group": "1_gitlens_actions@3"
},
{
"command": "gitlens.ai.aiRebaseBranch:graph",
"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+recomposable\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
"group": "1_gitlens_actions@6"
},
{
"command": "gitlens.ai.aiRebaseUnpushed:graph",
"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+ahead\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
"group": "1_gitlens_actions@7"
},
{
"command": "gitlens.graph.mergeBranchInto",
"when": "webviewItem =~ /gitlens:branch\\b(?!.*?\\b\\+current\\b)/ && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
Expand Down Expand Up @@ -22907,6 +22986,11 @@
"when": "webviewItem =~ /gitlens:branch\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
"group": "1_gitlens_actions_4@100"
},
{
"command": "gitlens.ai.explainUnpushed:graph",
"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+ahead\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
"group": "1_gitlens_actions_4@102"
},
{
"command": "gitlens.graph.openBranchOnRemote",
"when": "webviewItem =~ /gitlens:branch\\b(?=.*?\\b\\+(tracking|remote)\\b)/ && gitlens:repos:withRemotes",
Expand Down
Loading