Skip to content

[pull] main from microsoft:main - #1612

Merged
pull[bot] merged 6 commits into
code:mainfrom
microsoft:main
Aug 20, 2026
Merged

[pull] main from microsoft:main#1612
pull[bot] merged 6 commits into
code:mainfrom
microsoft:main

Conversation

@pull

@pull pull Bot commented Aug 20, 2026

Copy link
Copy Markdown

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 : )

connor4312 and others added 6 commits August 20, 2026 04:40
Keep the five-second timeout for client tool calls that this client owns.
Do not cancel or deny user input, authentication, or confirmation requests that
another client can claim.

- Return before creating client-tool lifecycle state for requests from other clients.
- Update request-timeout tests to verify unassigned requests remain pending.

(Commit message generated by Copilot)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Probe the optional origin/HEAD symbolic ref in quiet mode so repositories without it do not produce recurring agent host warnings. Add an integration test covering the expected missing-ref case.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…31719)

* agentHost: cover GraphQL mutation roots and null merge permission

The mutation fix had no regression coverage: the existing tests only match
operation names and variables, so reintroducing the invalid root-level
rateLimit selection still passed. That is why the bug survived.

ProgrammableGitHubServer now rejects any mutation that selects a Query-root-only
field at the mutation root. Placing the check in the fake server rather than in
individual assertions means every current and future mutation test enforces it
automatically. Verified by reintroducing the bug, which now fails two tests with
a direct diagnostic.

The permission test also only covered a READ viewer. It now snapshots the whole
RepositoryPermission range including null, the GitHub App case that deliberately
disables Agent Merge, so the fail-closed path cannot regress on its own.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* agentHost: resolve the selected operation in the GraphQL mutation guard

The mutation-root guard only recognized documents whose first token was
mutation, so a leading fragment definition or a multi-operation document
bypassed it entirely. It also scanned every top-level selection set, so a
sibling query selecting rateLimit failed an otherwise valid mutation.

The guard now parses the document into operations, resolves the one selected
by operationName (or the sole operation when the document is unambiguous), and
inspects only that operation's root selection set. Parsing blanks comments and
string literals first so braces inside them cannot skew matching, and skips
variable definitions and inline fragment headers.

ProgrammableGitHubServer tests now cover both regressions plus aliases, nested
selections and string arguments. Verified they fail against the previous
implementation in both directions: the fragment-prefixed mutation goes
undetected, and the valid mutation beside a rateLimit query is wrongly rejected.

The permission test folded its discriminant check into the recorded value, so a
non-mergeability result collapsed to false and silently matched the TRIAGE,
READ and null cases. It now asserts the fragment before snapshotting.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
)

Agent Host changes for benibenj/agents/log-analysis-error-fix-prioritization-60ed07f4
agentHost: address session catalog review feedback

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Agent Host changes for benibenj/agents/vscode-insiders-agent-logs-review
@pull pull Bot locked and limited conversation to collaborators Aug 20, 2026
@pull pull Bot added the ⤵️ pull label Aug 20, 2026
@pull
pull Bot merged commit be1bc52 into code:main Aug 20, 2026
6 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants