Skip to content

Clarify Agent Merge notice scope and use On/Off for the session merge choice - #1

Open
huyn7539 wants to merge 3 commits into
mainfrom
antelier-replay/copilot-334224
Open

Clarify Agent Merge notice scope and use On/Off for the session merge choice#1
huyn7539 wants to merge 3 commits into
mainfrom
antelier-replay/copilot-334224

Conversation

@huyn7539

@huyn7539 huyn7539 commented Sep 3, 2026

Copy link
Copy Markdown
Owner

Replay of microsoft#334224 (Copilot agent PR, head 5a47196) on a fork, to test Antelier against a real large repo. Nothing here is proposed for upstream.

Description

Two wording changes to Agent Merge:

  1. The transcript notice posted when Agent Merge behavior changes read Agent Merge settings changed. regardless of whether the change was made for that one session or to the defaults every session follows.
  2. The session-scoped Merge Pull Request menu labeled its options Always/Never, absolutes that only hold for the setting, which applies across all sessions.

Notices name the scope

agentMergeConfigurationChangedNotice now takes a required scope and heads the notice accordingly:

Agent Merge settings changed for this session.
Agent Merge default settings changed for all sessions.

AgentMergeController derives the scope by comparing the session overrides that produced the last announcement with the current ones — a per-session change is exactly what writes overrides, so anything else that moved the effective configuration came from the defaults. Deriving it in one place rather than passing it from each call site also attributes changes that land while a session's runtime is stopped, which the existing announces effective session and global configuration changes while monitoring test exercises.

To support that, _announcedConfigurations records the overrides alongside the configuration it resolved from.

Session merge choice says On/Off

  • Menu labels are now On / Off; Only if Agent Merge Made No Changes is unchanged, and its description now says it "switches itself off".
  • Stored setting values remain always / ifUnchanged / never, unchanged in the settings editor.

Tests and fixtures

  • Updated the notice assertions in agentMerge.test.ts and agentMergeController.test.ts; the controller test now distinguishes the session heading from the global one.
  • Added a DefaultsChanged component fixture beside the existing ConfigurationChanged one so both headings render.

Co-authored-by: benibenj <44439583+benibenj@users.noreply.github.com>
@github-actions

github-actions Bot commented Sep 3, 2026

Copy link
Copy Markdown

Claim check for #1 — 7 of 9 claims checked · 7 present

Claims vs diff (9)
# Claim (quoted from the PR) Label Evidence
1 agentMergeConfigurationChangedNotice now takes a required scope and heads the notice accordingly:
…/node/agentMergeController.ts @@ -15,7 +15,7 @@ L18
present identifier appears in the expected changed hunk lines; identifiers also match src/vs/platform/agentHost/common/agentMerge.ts, src/vs/platform/agentHost/test/common/agentMerge.test.ts, src/vs/workbench/test/browser/componentFixtures/chat/chatAgentMergeNotice.fixture.ts
2 AgentMergeController derives the scope by comparing the session overrides that produced the last announcement with the current ones — a per-session change is exactly what writes overrides, so anything else that moved the effective configuration came from the defaults.
…/node/agentMergeController.ts @@ -705,25 +711,39 @@ L740
present identifier appears in the expected changed hunk lines
3 To support that, _announcedConfigurations records the overrides alongside the configuration it resolved from.
…/node/agentMergeController.ts @@ -103,7 +109,7 @@ L112
present identifier appears in the expected changed hunk lines
4 Menu labels are now On / Off; Only if Agent Merge Made No Changes is unchanged, and its description now says it "switches itself off".
…/browser/agentMergeActions.ts @@ -101,17 +101,23 @@ L107-L119
present identifier appears in the expected changed hunk lines
5 Stored setting values remain always / ifUnchanged / never, unchanged in the settings editor.
…/browser/agentMergeActions.ts @@ -101,17 +101,23 @@ L107-L120
present identifier appears in the expected changed hunk lines; identifiers also match src/vs/workbench/test/browser/componentFixtures/chat/chatAgentMergeNotice.fixture.ts
6 Updated the notice assertions in agentMerge.test.ts and agentMergeController.test.ts; the controller test now distinguishes the session heading from the global one.
…/common/agentMerge.test.ts @@ -288,7 +288,7 @@ L288
present test file is present in the PR file list
7 Added a DefaultsChanged component fixture beside the existing ConfigurationChanged one so both headings render.
…/common/agentMerge.test.ts @@ -304,15 +304,23 @@ L318-L319
present identifier appears in the expected changed hunk lines; identifiers also match src/vs/workbench/test/browser/componentFixtures/chat/chatAgentMergeNotice.fixture.ts, src/vs/platform/agentHost/common/agentMerge.ts, src/vs/platform/agentHost/node/agentMergeController.ts
2 not checkable (show)
  1. Clarify Agent Merge notice scope and use On/Off for the session merge choice — not checked (judged tier off)
  2. Name the scope of Agent Merge notices and use On/Off in the session menu — not checked (judged tier off)
not checkable collapsed by default
3 context lines (not claims, show)
  1. The transcript notice posted when Agent Merge behavior changes read Agent Merge settings changed. regardless of whether the change was made for that one session or to the defaults every session follows. — context: describes state or cause, not a change this PR makes
  2. The session-scoped Merge Pull Request menu labeled its options Always/Never, absolutes that only hold for the setting, which applies across all sessions. — context: describes state or cause, not a change this PR makes
  3. Deriving it in one place rather than passing it from each call site also attributes changes that land while a session's runtime is stopped, which the existing announces effective session and global configuration changes while monitoring test exercises. — context: describes state or cause, not a change this PR makes
context describes state or cause; never labelled
Attention (3)
  1. undisclosed-file — File changed but not mentioned in the PR body — src/vs/platform/agentHost/node/agentMergeController.ts — src/vs/platform/agentHost/node/agentMergeController.ts @@ -705,25 +711,39 @@ L711-L749
  2. entry-point-or-export — Public entry point or exported symbol touched — src/vs/platform/agentHost/common/agentMerge.ts (heuristic: patch syntax) — src/vs/platform/agentHost/common/agentMerge.ts @@ -341,8 +341,18 @@ L341-L358
  3. ci-reported — CI — reported Compile & Hygiene: QUEUED, claim-check: IN_PROGRESS, Screenshots & Tests: IN_PROGRESS, Monaco Editor checks: IN_PROGRESS, Check metadata: IN_PROGRESS, chat-lib tests (ubuntu-latest): IN_PROGRESS, chat-lib tests (macos-latest): IN_PROGRESS, chat-lib tests (windows-latest): IN_PROGRESS, Linux / CLI: QUEUED, Linux / Electron-Unit: IN_PROGRESS, Linux / Electron: IN_PROGRESS, Linux / Electron-Smoke: IN_PROGRESS, Linux / Browser: IN_PROGRESS, Linux / Remote: IN_PROGRESS, macOS / Electron-Unit: FAILURE, macOS / Electron: FAILURE, macOS / Electron-Smoke: FAILURE, macOS / Browser: FAILURE, macOS / Remote: FAILURE, Windows / Electron-Unit: QUEUED, Windows / Electron: QUEUED, Windows / Electron-Smoke: QUEUED, Windows / Browser: QUEUED, Windows / Remote: QUEUED, Copilot - Check Test Cache: QUEUED, Copilot - Check Telemetry: QUEUED, Copilot - Test (Linux): QUEUED, Copilot - Test (Windows): QUEUED; reported, not observed by Work Loop — src/vs/platform/agentHost/node/agentMergeController.ts @@ -705,25 +711,39 @@ L711-L749
Author attestation — draft, confirm or edit

What changed: agentMergeConfigurationChangedNotice now takes a required scope and heads the notice accordingly: — src/vs/platform/agentHost/node/agentMergeController.ts @@ -15,7 +15,7 @@ L18
Why: Why this change was made is not established by the excluded motivation text; confirm intent. — src/vs/platform/agentHost/node/agentMergeController.ts @@ -15,7 +15,7 @@ L18
What could break: Callers of the touched export AgentMergeController could break; confirm its compatibility at this diff. — src/vs/platform/agentHost/node/agentMergeController.ts @@ -705,25 +711,39 @@ L740
What was tested: Updated the notice assertions in agentMerge.test.ts and agentMergeController.test.ts; the controller test now distinguishes the session heading from the global one. — src/vs/platform/agentHost/test/common/agentMerge.test.ts @@ -288,7 +288,7 @@ L288

Confirm attestation in Antelier

After confirmation, each answer is checked against the same diff as the PR claims.

Rules applied (2) · Provenance · Not read (6 lines)
  • Rule: Claim labels use fetched patch bytes only
  • Rule: Citations are verified before rendering
    Provenance: human login huyn7539; Co-authored-by benibenj → agent-assisted (reported)
  • Not read: > Replay of Clarify Agent Merge notice scope and use On/Off for the session merge choice microsoft/vscode#334224 (Copilot agent PR, head 5a47196) on a fork, to test Antelier against a real large repo. Nothing here is proposed for upstream.
  • Not read: Agent Merge settings changed for this session.
  • Not read: Agent Merge default settings changed for all sessions.
  • Not read: Two wording changes to Agent Merge:
  • Not read: retrigger Antelier v1.1.0
  • Not read: retrigger Antelier v1.1.0

Rule version claim-check-rubric-v1 · JSON route /api/truth/v1/pr/1

Generated by Antelier. Every citation resolves to diff bytes; no human has reviewed these results.

@github-actions

github-actions Bot commented Sep 3, 2026

Copy link
Copy Markdown

No screenshot changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants