Merge branch 'main' into bug/4387-fix-integration-status

Author: sergeibbb

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
     - name: Q & A
       url: https://github.com/gitkraken/vscode-gitlens/discussions?discussions_q=category%3AQ%26A

.github/copilot-instructions.md

@@ -0,0 +1,199 @@
+# GitLens Copilot Instructions
+
+This workspace contains **GitLens** - a VS Code extension that supercharges Git functionality. Below are key development guidelines and architecture insights.
+
+## Core Commands
+
+### Build & Development
+
+- `pnpm run build` - Full development build
+- `pnpm run build:quick` - Fast build without linting
+- `pnpm run watch` - Watch mode for development
+- `pnpm run watch:quick` - Fast watch mode without linting
+- `pnpm run bundle` - Production bundle
+
+### Testing & Quality
+
+- `pnpm run test` - Run unit tests with vscode-test
+- `pnpm run test:e2e` - End-to-end tests with Playwright
+- `pnpm run lint` - ESLint with TypeScript rules
+- `pnpm run lint:fix` - Auto-fix linting issues
+- `pnpm run pretty` - Format with Prettier
+
+### Specialized Commands
+
+- `pnpm run build:tests` - Build test files with esbuild
+- `pnpm run generate:contributions` - Generate package.json contributions from contributions.json
+- `pnpm run generate:commandTypes` - Generate command types from contributions
+- `pnpm run web` - Run extension in web environment for testing
+
+## High-Level Architecture
+
+### Core Container System
+
+- **Container** (`src/container.ts`) - Main dependency injection container, singleton pattern
+- All services registered in constructor and exposed as getters
+- Handles lifecycle, configuration changes, and service coordination
+
+### Major Services & Providers
+
+- **GitProviderService** - Core Git operations and repository management
+- **SubscriptionService** - GitLens Pro subscription and account management
+- **IntegrationService** - GitHub/GitLab/etc integrations
+- **AIProviderService** - AI features (commit messages, explanations)
+- **WebviewsController** - Manages all webview panels (Graph, Home, etc)
+- **AutolinksProvider** - Auto-linking issues/PRs in commit messages
+- **TelemetryService** - Usage analytics and error reporting
+
+### VS Code Contributions
+
+- Commands, Menus, Submenus, Keybindings, and Views are defined in `contributions.json`
+- Contributions are generated from `contributions.json` into `package.json` via `pnpm run generate:contributions`
+- Contributions can also be extracted from `package.json` into `contributions.json` via `pnpm run extract:contributions`
+
+### Webview Architecture
+
+- **Shared Components** (`src/webviews/apps/shared/`) - Common UI components using Lit
+- **Host-Guest Communication** - IPC between extension and webviews
+- **State Management** - Context providers with Lit reactive patterns
+- Major webviews: Home, Commit Graph, Timeline, Launchpad, Settings
+
+### Git Integration
+
+- **GitProviderService** - Abstracts Git operations across different providers
+- **Repository Models** - Strongly typed Git entities (Branch, Commit, Tag, etc)
+- **DocumentTracker** - Tracks file changes and editor state
+- **FileAnnotationController** - Blame, heatmap, and change annotations
+
+### Plus Features (Pro)
+
+- **Subscription gating** - Feature access control via SubscriptionService
+- **Cloud integrations** - GitHub/GitLab APIs for PRs, issues
+- **Worktrees** - Multi-branch workflow support
+- **AI features** - Commit generation, explanations using various providers
+
+## Coding Standards & Style Rules
+
+### TypeScript Configuration
+
+- Strict TypeScript with `strictTypeChecked` ESLint config
+- No `any` usage (exceptions for external APIs)
+- Explicit return types for public methods
+- Prefer `type` over `interface` for unions
+
+### Import Organization
+
+- Use path aliases: `@env/` for environment-specific code
+- Import order: node built-ins → external → internal → relative
+- No default exports (ESLint enforced)
+- Consistent type imports with `import type`
+
+### Naming Conventions
+
+- **Classes**: PascalCase (no `I` prefix for interfaces)
+- **Methods/Variables**: camelCase
+- **Constants**: camelCase for module-level constants
+- **Private members**: Leading underscore allowed
+- **Files**: camelCase.ts, camelCase.utils.ts for related utilities
+- **Folders**
+  - Models under a `models/` sub-folder
+  - Utilities under a `utils/` sub-folder if they can be used in both the extension host and webviews, or `utils/-webview/` sub-folder for extension host-specific utilities
+  - Webview apps under `webviews/apps/`
+
+### Code Structure
+
+- **Single responsibility** - Each service has focused purpose
+- **Dependency injection** - Services injected via Container
+- **Event-driven** - EventEmitter pattern for service communication
+- **Disposable pattern** - Proper cleanup with VS Code Disposable interface
+
+### Error Handling
+
+- Use custom error types extending Error
+- Log errors with context using Logger.error()
+- Graceful degradation for network/API failures
+- Validate external data with schema validators
+
+### Webview Specific
+
+- **Lit Elements** - Use for reactive UI components
+- **Context providers** - For sharing state across components
+- **Signal patterns** - For reactive state management
+- **CSS custom properties** - For theming support
+
+### Environment Abstractions
+
+- **Platform detection** - Use `@env/platform` abstractions
+- **Node vs Browser** - Environment-specific implementations in `src/env/`
+- **WebWorker support** - Browser extension compatibility
+
+## Repository Guidelines
+
+### Commit Messages
+
+- Use a future-oriented manner, third-person singular present tense (e.g., 'Fixes', 'Updates', 'Improves', 'Adds', 'Removes')
+- Reference issues with `#123` syntax for auto-linking
+- Keep first line under 72 characters
+
+### Branch Workflow
+
+- Feature branches from `main`
+- Prefix with feature type: `feature/`, `bug/`, `debt/`
+- Use descriptive names: `feature/search-natural-language`
+
+### Code Reviews
+
+- Check TypeScript compilation and tests pass
+- Verify no new ESLint violations
+- Test webview changes in both themes
+- Validate Plus features with subscription states
+
+## Key Extension Points
+
+### Adding New Commands
+
+1. Define in `src/commands/` directory
+2. Register in `src/commands.ts`
+3. Add to `contributions.json` for package.json generation
+4. Update command types with `pnpm run generate:commandTypes`
+
+### New Webviews
+
+1. Create provider in `src/webviews/`
+2. Add Lit app in `src/webviews/apps/`
+3. Register in WebviewsController
+4. Add protocol definitions for IPC
+
+### Git Provider Extensions
+
+- Implement GitProvider interface
+- Register with GitProviderService
+- Handle provider-specific authentication
+
+### AI Provider Integration
+
+- Implement AIProvider interface
+- Add to AIProviderService registry
+- Handle authentication and rate limiting
+
+## Development Environment
+
+### Prerequisites
+
+- **Node.js** ≥ 22.12.0
+- **pnpm** ≥ 10.x (via corepack)
+- **Git** ≥ 2.7.2
+
+### VS Code Tasks
+
+- **Build** - `Ctrl+Shift+P` → "Tasks: Run Task" → "watch"
+- **Test** - Use VS Code's built-in test runner
+- **Debug** - F5 to launch Extension Development Host
+
+### Multi-target Support
+
+- **Node.js** - Traditional VS Code extension
+- **Web Worker** - Browser/web VS Code compatibility
+- Shared code with environment abstractions
+
+This architecture enables GitLens to provide powerful Git tooling while maintaining clean separation of concerns and extensibility for new features.

CHANGELOG.md

@@ -6,13 +6,36 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+## [17.3.0] - 2025-07-08
+
+### Added
+
+- Adds support for using natural language to search for commits on the _Commit Graph_, _Search & Compare_ view, and in the _Search Commits_ command using AI ([#4471](https://github.com/gitkraken/vscode-gitlens/issues/4471))
+- Adds support for time-based commit searches on the _Commit Graph_, _Search & Compare_ view, and in the _Search Commits_ command
+- Adds 👍 "Helpful" and 👎 "Unhelpful" feedback buttons to AI-generated markdown previews such as Commit Composer and Explain Changes ([#4449](https://github.com/gitkraken/vscode-gitlens/issues/4449))
+- Adds a _Commit with AI (Preview)_ button to the _Inspect Overview_ tab of the _Commit Graph_ and _Inspect_ views
+
+### Changed
+
+- Improves experience for invalid AI rebase responses by implementing conversational retry logic that provides specific feedback to the AI about missing, extra, or duplicate hunks and automatically retries up to 3 times ([#4395](https://github.com/gitkraken/vscode-gitlens/issues/4395))
+
+### Fixed
+
+- Fixes stashes with parent commits older than the oldest stash not being visible on branches ([#4401](https://github.com/gitkraken/vscode-gitlens/issues/4401))
+- Fixes editing search result in Search & Compare view failure ([#4431](https://github.com/gitkraken/vscode-gitlens/issues/4431))
+- Fixes search results not paging properly on the _Commit Graph_ when the first page of results is contained within the already loaded commits
+
+## [17.2.1] - 2025-06-26
+
 ### Changed
 
 - Improves AI status label in integrations popup to "Select AI model to enable AI features" and fixes text brightness ([#4400](https://github.com/gitkraken/vscode-gitlens/issues/4400))
 
 ### Fixed
 
 - Fixes disabled GitLens view tabs on clean install ([#4416](https://github.com/gitkraken/vscode-gitlens/issues/4416))
+- Fixes Stashes view errors w/ ID already exists ([#4427](https://github.com/gitkraken/vscode-gitlens/issues/4427))
+- Fixes showing GitLens view tabs when the view is hidden ([#4426](https://github.com/gitkraken/vscode-gitlens/issues/4426), [#4389](https://github.com/gitkraken/vscode-gitlens/issues/4389))
 
 ## [17.2.0] - 2025-06-17
 
@@ -6211,7 +6234,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Initial release but still heavily a work in progress.
 
-[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v17.2.0...HEAD
+[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v17.3.0...HEAD
+[17.3.0]: https://github.com/gitkraken/vscode-gitlens/compare/v17.2.1...gitkraken:v17.3.0
+[17.2.1]: https://github.com/gitkraken/vscode-gitlens/compare/v17.2.0...gitkraken:v17.2.1
 [17.2.0]: https://github.com/gitkraken/vscode-gitlens/compare/v17.1.1...gitkraken:v17.2.0
 [17.1.1]: https://github.com/gitkraken/vscode-gitlens/compare/v17.1.0...gitkraken:v17.1.1
 [17.1.0]: https://github.com/gitkraken/vscode-gitlens/compare/v17.0.3...gitkraken:v17.1.0

ThirdPartyNotices.txt

@@ -13,17 +13,17 @@ This project incorporates components from the projects listed below.
 8. @octokit/request version 10.0.3 (https://github.com/octokit/request.js)
 9. @octokit/types version 14.1.0 (https://github.com/octokit/types.ts)
 10. @opentelemetry/api version 1.9.0 (https://github.com/open-telemetry/opentelemetry-js)
-11. @opentelemetry/exporter-trace-otlp-http version 0.202.0 (https://github.com/open-telemetry/opentelemetry-js)
+11. @opentelemetry/exporter-trace-otlp-http version 0.203.0 (https://github.com/open-telemetry/opentelemetry-js)
 12. @opentelemetry/resources version 2.0.1 (https://github.com/open-telemetry/opentelemetry-js)
 13. @opentelemetry/sdk-trace-base version 2.0.1 (https://github.com/open-telemetry/opentelemetry-js)
 14. @opentelemetry/semantic-conventions version 1.34.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.36 (https://github.com/microsoft/vscode-codicons)
-17. billboard.js version 3.15.1 (https://github.com/naver/billboard.js)
+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.0 (https://github.com/lit/lit)
-21. marked version 15.0.12 (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)

contributions.json

@@ -143,6 +143,58 @@
 				]
 			}
 		},
+		"gitlens.ai.feedback.helpful": {
+			"label": "Helpful",
+			"icon": "$(thumbsup)",
+			"menus": {
+				"editor/title": [
+					{
+						"when": "resourceScheme == gitlens-ai-markdown && resource not in gitlens:tabs:ai:helpful && config.gitlens.telemetry.enabled && config.telemetry.telemetryLevel != off && activeCustomEditorId == vscode.markdown.preview.editor",
+						"group": "navigation",
+						"order": 1
+					}
+				]
+			}
+		},
+		"gitlens.ai.feedback.helpful.chosen": {
+			"label": "Helpful",
+			"icon": "$(thumbsup-filled)",
+			"menus": {
+				"editor/title": [
+					{
+						"when": "resourceScheme == gitlens-ai-markdown && resource in gitlens:tabs:ai:helpful && config.gitlens.telemetry.enabled && config.telemetry.telemetryLevel != off && activeCustomEditorId == vscode.markdown.preview.editor",
+						"group": "navigation",
+						"order": 1
+					}
+				]
+			}
+		},
+		"gitlens.ai.feedback.unhelpful": {
+			"label": "Unhelpful",
+			"icon": "$(thumbsdown)",
+			"menus": {
+				"editor/title": [
+					{
+						"when": "resourceScheme == gitlens-ai-markdown && resource not in gitlens:tabs:ai:unhelpful && config.gitlens.telemetry.enabled && config.telemetry.telemetryLevel != off && activeCustomEditorId == vscode.markdown.preview.editor",
+						"group": "navigation",
+						"order": 2
+					}
+				]
+			}
+		},
+		"gitlens.ai.feedback.unhelpful.chosen": {
+			"label": "Unhelpful",
+			"icon": "$(thumbsdown-filled)",
+			"menus": {
+				"editor/title": [
+					{
+						"when": "resourceScheme == gitlens-ai-markdown && resource in gitlens:tabs:ai:unhelpful && config.gitlens.telemetry.enabled && config.telemetry.telemetryLevel != off && activeCustomEditorId == vscode.markdown.preview.editor",
+						"group": "navigation",
+						"order": 2
+					}
+				]
+			}
+		},
 		"gitlens.ai.generateChangelog": {
 			"label": "Generate Changelog (Preview)...",
 			"commandPalette": "gitlens:enabled && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
@@ -3682,14 +3734,14 @@
 			"menus": {
 				"editor/title": [
 					{
-						"when": "resourceScheme == gitlens-markdown && activeCustomEditorId == vscode.markdown.preview.editor",
+						"when": "resourceScheme == gitlens-ai-markdown && activeCustomEditorId == vscode.markdown.preview.editor && resourcePath =~ /^\\/explain\\//",
 						"group": "navigation",
-						"order": 0
+						"order": 3
 					}
 				],
 				"editor/title/context": [
 					{
-						"when": "resourceScheme == gitlens-markdown && activeCustomEditorId == vscode.markdown.preview.editor",
+						"when": "resourceScheme == gitlens-ai-markdown && activeCustomEditorId == vscode.markdown.preview.editor && resourcePath =~ /^\\/explain\\//",
 						"group": "1_gitlens",
 						"order": 0
 					}