[pull] main from microsoft:main#1366
Merged
Merged
Conversation
Make sure we still set isInitialized when git is disabled or not active
…s and active session changes (#313394) * Fix model selection logic in SessionModelPicker to handle empty models and active session changes * Updates Co-authored-by: Copilot <copilot@github.com> * Updates Co-authored-by: Copilot <copilot@github.com> * new tests --------- Co-authored-by: Copilot <copilot@github.com>
Also bumps to use sha256 since we're changing the hashing This will cause clients to re-evaluate their checkpoints but should not actually cause a large re-upload because the file hashes themselves haven't changed Co-authored-by: Copilot <copilot@github.com>
…Search/externalIngestIndex.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Don't try watching readonly file systems
Catch and log error during reconcileDbFiles
* update github copilot npm and update permission handling to use 'approve-once' instead of 'approved' * Updates * Fix permissionHelpers tests: update 'approved' to 'approve-once' and fix conditional check Agent-Logs-Url: https://github.com/microsoft/vscode/sessions/6e5d31b2-034c-4c94-8145-c6a5c7c9c81b Co-authored-by: DonJayamanne <1948812+DonJayamanne@users.noreply.github.com> * Add setPermissionsRequired to MockCliSdkSession test helper Agent-Logs-Url: https://github.com/microsoft/vscode/sessions/25f015e8-12a6-41d3-84b5-26cc1ef86ea1 Co-authored-by: DonJayamanne <1948812+DonJayamanne@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
* Clean up agent host worktrees on session archive
When a session that owns a Copilot CLI worktree is archived, remove the
worktree from disk so it doesn't pile up. When the session is unarchived,
recreate the worktree pointing at the preserved branch so the user can
keep working.
- Persist `copilot.worktree.{path,repositoryRoot}` alongside the
existing branch metadata so cleanup can reconstruct the worktree
after a process restart.
- Add an optional `IAgent.onArchivedChanged` hook dispatched from
`AgentSideEffects` after the archived flag is persisted.
- Add `branchExists`, `hasUncommittedChanges`, and
`addExistingWorktree` to `IAgentHostGitService`.
- `CopilotAgent.onArchivedChanged` skips removal when the worktree
is dirty or its branch is gone, and skips recreation when the
directory already exists. All work is sequenced through
`_sessionSequencer` so it can't race with `disposeSession`.
(Written by Copilot)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Fall back to legacy metadata for sessions missing worktree path/repo root
Sessions created before `copilot.worktree.path` and
`copilot.worktree.repositoryRoot` were persisted only have the branch
name and the resolved working directory (which, for worktree-isolated
sessions, IS the worktree path). Without a fallback, archive could
delete the worktree but unarchive couldn't recreate it, and any session
older than this change wouldn't recreate at all.
`_readWorktreeMetadata` now falls back to `copilot.workingDirectory`
for the worktree path and reverses the worktrees-root convention
(`<repoBasename>.worktrees/<wt>`) to recover the repository root.
Added `deriveRepositoryRootFromWorktree` for the inversion plus a
unit test for the helper and an end-to-end test that pre-populates
unarchive still works.
(Written by Copilot)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Drop legacy worktree-metadata fallback; just skip cleanup instead
If `copilot.worktree.path` and `copilot.worktree.repositoryRoot`
weren't persisted (sessions created before those keys existed), don't
try to derive them from `_META_CWD` and the worktrees-root naming
convention. Without saved metadata we can't reliably restore the
worktree on unarchive, so deleting it on archive would lose work.
`_cleanupWorktreeOnArchive` and `_recreateWorktreeOnUnarchive`
already early-return when those fields are missing, so dropping the
fallback is enough -- legacy sessions simply leave their worktree on
disk untouched.
(Written by Copilot)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* cleanup
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ing terminal ID (#313414)
Fixes #312425 Also adds a toggle preview command
Include uri when computing external ingest checkpoint
This makes `enabled` style settings use working more like we do in core Co-authored-by: Copilot <copilot@github.com>
Make it easy to switch current md doc between preview and edit mode
Fixes #305931 Takes advantage of the anchor based layout we already use but fixes an issue with the z-index. Previously this fix only worked for the `webviewEditor` Also aligns the notebook editor with the webvieweditor for clipping and modals
* agents welcome: add theme selection step after sign-in After signing in (or for first-launch signed-in users after clicking Get Started), show a theme selection step with 4 theme preview cards (Dark 2026, Dark HC, Light 2026, Light HC). Theme is applied live on card click. Continue button dismisses the overlay. External sign-in via onDidChangeDefaultAccount now transitions to the theme step instead of auto-completing. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * agents welcome: theme importer restructure and environment improvements - Rename vsCodeThemeImporter folder to vscode, merge interface and service - Rename hostExtensionsPath to hostExtensionsHome returning URI - Move host environment paths to common environmentService Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Fixes extension editor readmes in modals
…313430) --------- Co-authored-by: Copilot <copilot@github.com>
Align more markdown settings strings
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )