[pull] main from microsoft:main#1386
Merged
Merged
Conversation
Add basic support for custom diff editors
Don't show extra save dialog when switching dirty editor to md preview
* agentHost/claude: post-Phase-4 cleanup - roadmap.md: mark Phase 4 as DONE, link merged PR #313780. - phase4-plan.md: record live-system smoke completion in §7.8; disabled-gate run skipped (covered by unit tests + env-var guard). - claudeAgent.test.ts: drop gratuitous 'as unknown as' cast in the CCAModel fixture (literal already matches CCAModelBilling exactly; plan §7.4 forbids unsafe casts in tests). * agentHost/claude: lock Phase 5 implementation plan Handoff plan for Phase 5 (replace 7 throwing stubs in claudeAgent.ts). Locked against post-PR-#313841 reality (provisional sessions, onDidMaterializeSession, 30s empty-session GC) and the IAgent contract on origin/main. Decisions captured: - Non-fork createSession is synchronous and in-memory; fork deferred to Phase 6 (throws TODO). - IClaudeAgentSdkService surface mirrors IAgent (no dir parameter on listSessions); SDK loader caches resolved module, retries on failure, logs once. - listSessions joins SDK enumeration with workbench session DB metadata via ISessionDataService; per-entry try/catch resilience. - shutdown() routes per-session teardown through the same SequencerByKey<string> used by disposeSession() so concurrent shutdown/disposeSession cannot double-dispose a wrapper in Phase 6. - 14 unit tests defined (12 lifecycle + 2 resolved-config), including log-once contract and shutdown/disposeSession race guard. * agentHost/claude: Phase 5 — IAgent provider skeleton Lands the ClaudeAgent IAgent provider behind the 'chat.agentHost.claudeAgent.enabled' setting (env gate VSCODE_AGENT_HOST_ENABLE_CLAUDE=1). Pins @anthropic-ai/claude-agent-sdk@0.2.112 in workspace + remote/. Implemented in this phase: * createSession - non-fork, in-memory wrapper only. Honors config.session for restore. The fork path and SDK session creation are deferred to Phase 6. * listSessions - SDK is source of truth; per-session DB read is a best-effort overlay (failure never excludes an entry). * disposeSession / shutdown - routed through a per-session SequencerByKey to serialize teardown. * getDescriptor, getProtectedResources, models, onDidSessionProgress, setClientCustomizations, setClientTools, onClientToolCallComplete, setCustomizationEnabled, authenticate, respondTo*Request - minimal Phase-5 wiring. Stubbed for Phase 6 (throw async 'TODO: Phase 6'): sendMessage, abortSession, changeModel, getSessionMessages, plus the createSession fork path. Tests: 29 unit tests in claudeAgent.test.ts cover the createSession restore-id path, listSessions overlay resilience, dispose serialization, and stub surfaces. Note: provisional / onDidMaterializeSession is intentionally omitted in Phase 5 (see plan section 3.3.1) - the workbench needs an immediate sessionAdded until the agent has real materialization work, which arrives in Phase 6 alongside SDK query() startup. * agentHost/claude: Phase 6 — sendMessage, single-turn, no tools Implements the Phase 6 plan: provisional sessions materialize on first sendMessage, route a single-turn prompt through the Anthropic Claude Agent SDK's WarmQuery, and stream SDKMessages back as protocol AgentSignals via a pure mapSDKMessageToAgentSignals reducer. Tools remain denied (canUseTool: 'deny'); fork moves to Phase 6.5; Plan Mode UI moves to Phase 7. Highlights: - ClaudeAgent.sendMessage routes through _sessionSequencer to collapse concurrent first sends into one materialize + N ordered sends. - _materializeProvisional has two abort gates (post-startup + post-customizationDirectory write) so disposeSession landing mid-materialize cannot leak a WarmQuery subprocess. - ClaudeAgentSession owns the prompt iterator + per-turn deferreds; mapSDKMessageToAgentSignals is a pure reducer with state owned by the session. - IClaudeAgentSdkService gains startup() alongside listSessions(). Tests: 43 unit + 2 proxy-backed integration. Council-review fixes (C1 dispose race, C2 missing integration test, S1 cwd-less ratification) included. * agentHost/claude: address PR review (listSessions resilience, dispose abort) Two Copilot-reviewer comments on #314216: 1. listSessions: wrap _sdkService.listSessions() in try/catch. AgentService.listSessions fans out across providers via Promise.all; an SDK dynamic-import failure would otherwise nuke every other provider's session list. Now logs and returns []. 2. dispose: abort _provisionalSessions AbortControllers before super.dispose(). Previously a racing first sendMessage parked inside _writeCustomizationDirectory could pass the materialize abort gates and call _sessions.set on a disposed DisposableMap, orphaning the WarmQuery. Aborting first triggers the existing post-customization-write abort gate, which asyncDisposes the WarmQuery. Tests: 2 new regressions (listSessions empty on SDK throw; agent.dispose() during racing materialize disposes the WarmQuery). 45/45 unit + 2/2 integration pass.
Rename sessionsConfigurationService to sessionsTasksService
* Agents - add branch name into the titlebar * Pull request feedback
--------- Co-authored-by: Copilot <copilot@github.com>
enable shared settings
…phase6 Revert "agentHost/claude: Phase 6 — sendMessage, single-turn, no tools"
fixes virtual scheduler in component explorer
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.
8 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 : )