sessions: resolve focused chat for Copilot CLI state file and debug log export#322197
Draft
roblourens wants to merge 2 commits into
Draft
sessions: resolve focused chat for Copilot CLI state file and debug log export#322197roblourens wants to merge 2 commits into
roblourens wants to merge 2 commits into
Conversation
…og export The "Open Copilot CLI State File" and "Export Agent Host Debug Logs" actions resolved the session's main chat regardless of which chat tab was focused. Since the events file is per-chat, use the focused chat (IActiveSession.activeChat) when resolving the events.jsonl resource. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request updates two Agents window developer actions so they operate on the focused chat tab (via IActiveSession.activeChat) rather than always using the session’s main chat, which is important now that Copilot CLI state/events are stored per chat (~/.copilot/session-state/<chatId>/events.jsonl).
Changes:
- Resolve the Copilot CLI state/events file using the focused chat’s
resource, falling back to the sessionresourcewhen needed. - Export Agent Host debug logs scoped to the focused chat (resource + title) for the active session, while keeping the “most recent session” fallback behavior intact.
- Make the
isAgentHostSessiontype guard generic to preserve theIActiveSessionsubtype (soactiveChatremains accessible after narrowing).
Show a summary per file
| File | Description |
|---|---|
| src/vs/sessions/contrib/providers/agentHost/browser/openSessionEventsFileActions.ts | Uses activeSession.activeChat.get()?.resource (fallback to session resource) so “Open Copilot CLI State File” targets the focused chat tab. |
| src/vs/sessions/contrib/providers/agentHost/browser/exportDebugLogsAction.ts | Uses the focused chat’s resource/title when exporting debug logs for the active session; updates the type guard to preserve the active-session subtype. |
Copilot's findings
- Files reviewed: 2/2 changed files
- Comments generated: 0
…t's sdk session The "Open Copilot CLI State File" and "Export Agent Host Debug Logs" actions resolved events.jsonl from the chat resource's path id. For peer chats that path id is the main session id, not the peer chat's backing Copilot SDK session id, so they opened/exported the wrong file (and export filtered the shared ~/.copilot/logs by the wrong id). The host now reports each peer chat's backing sdk session id to the renderer under SessionState._meta (keyed by AHP chat id), the same carrier already used for git state. The front end maps the focused chat to its sdk id and reuses the existing resolveEventsUri / getCopilotCliSessionRawId pipeline by swapping the resource path to the sdk id. The default chat needs no entry (its path id already names its logs) and falls back to the chat resource. - common/state/sessionState.ts: readChatSessionIds / withChatSessionId accessors - common/agentService.ts: optional IAgent.getChatSessionId - node/copilot/copilotAgent.ts: implement getChatSessionId (in-mem + persisted) - node/agentService.ts: publish sdk id into _meta on create/restore, clean up on dispose - browser/baseAgentHostSessionsProvider.ts: getChatSdkSessionId / getChatSdkSessionResource - copilotCliEventsUri.ts: buildSdkSessionResource helper - sessions actions: resolve focused chat -> sdk resource, fall back to chat resource Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What
Two Agent Host developer actions in the Agents window were always operating on a session's main chat, ignoring which chat tab was actually focused:
agentHost.openSessionEventsFile)agentHost.exportDebugLogs)Now that a session can contain multiple chats, and the Copilot CLI state/events file is per-chat (
~/.copilot/session-state/<chatId>/events.jsonl), both actions opened/exported the wrong file when a non-main chat tab was focused.Change
Resolve the focused chat's resource via
IActiveSession.activeChatbefore delegating to the shared events-URI resolver:openSessionEventsFileActions.ts— useactiveSession.activeChat.get()?.resource, falling back to the session resource.exportDebugLogsAction.ts— use the focused chat's resource (and title) for the active session; the most-recent-session fallback path still uses the session resource since a plainISessionhas no focused-chat notion. TheisAgentHostSessiontype guard was made generic so it preserves theIActiveSessionsubtype (needed to accessactiveChat).The shared
resolveEventsUriresolver and the workbench-sideOpenCopilotCliStateFileAction(which already uses the last-focused chat widget and is disabled in the Agents window) are unchanged. A chat resource carries the same scheme/authority as its session resource, so remote-connection lookup and local/remote classification are unaffected — only the per-chat events path changes.Notes for reviewers
npm run typecheck-clientpasses; ESLint is clean on the changed files.(Written by Copilot)