From 1d44f8f88ed994bf20973051063a9308c7390c11 Mon Sep 17 00:00:00 2001 From: Michael Bahr Date: Wed, 18 Nov 2026 08:50:16 +0000 Subject: [PATCH 1/2] docs/abc: Document that the agent can merge changesets Amp-Thread-ID: https://ampcode.com/threads/T-01a1e4d8-de7d-7217-baa1-3fb2338878a6 --- docs/agentic-batch-changes/collaboration.mdx | 3 ++- docs/agentic-batch-changes/index.mdx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/agentic-batch-changes/collaboration.mdx b/docs/agentic-batch-changes/collaboration.mdx index 8006a5737..36140fb6f 100644 --- a/docs/agentic-batch-changes/collaboration.mdx +++ b/docs/agentic-batch-changes/collaboration.mdx @@ -23,7 +23,8 @@ Each action runs as the user who does it, not as the owner. See [Whose credentia - Answer the agent's questions and approve tool calls, except publication approvals. - Cancel and retry turns. - Run workspaces, publish, and clean up changesets that the current plan no longer produces. - - Act on changesets on the batch change page: publish, push the branch, comment, close, merge, rebase, sync, and retry. + - Ask the agent to merge changesets, and approve the merge. + - Act on changesets on the batch change page: publish, push the branch, comment, close, merge, rebase, sync, and retry. - **Administrator** with the `BATCH_CHANGE_AGENT_ADMINISTRATION#MANAGE` [permission](/admin/access-control/batch-changes): sees every agent on the [Threads page](/agentic-batch-changes/configuration#threads-page), can hand over any agent, and can invite, extend, and remove collaborators. An administrator who is not a collaborator cannot send messages or act on the agent. - **Previous owner**: after a handover, the previous owner keeps read access to the agent. This access does not expire, and the previous owner cannot act on the agent. - **Viewer**: a user who opens the agent through its [share link](/agentic-batch-changes/configuration#sharing-and-visibility). A viewer can read the transcript but cannot act on the agent or see the collaborator list. diff --git a/docs/agentic-batch-changes/index.mdx b/docs/agentic-batch-changes/index.mdx index dcb2681d6..b8160b5f1 100644 --- a/docs/agentic-batch-changes/index.mdx +++ b/docs/agentic-batch-changes/index.mdx @@ -62,6 +62,6 @@ If everything goes well, the agent might ask if it can continue. By default, the ### Let the agent finish -When configured to handle CI failures, the agent fetches the logs, iterates to fix the problem, and updates the changeset. You can step away and ask "what happened while I was away?" when you return for a summary of everything that changed. When reviewers approve and CI is green, merge on the code host or use **Merge** in Sourcegraph's changeset view, where available. The agent cannot merge changesets from the conversation. +When configured to handle CI failures, the agent fetches the logs, iterates to fix the problem, and updates the changeset. You can step away and ask "what happened while I was away?" when you return for a summary of everything that changed. When reviewers approve and CI is green, merge on the code host, use **Merge** in Sourcegraph's changeset view where available, or ask the agent to merge. The agent shows an approval card before each merge. To let colleagues follow the work, use **Share** on the agent page. See [Sharing and visibility](/agentic-batch-changes/configuration#sharing-and-visibility). To let a colleague take over the work, use **Share** > **Hand over**. See [Handing over an agent](/agentic-batch-changes/configuration#handing-over-an-agent). To work on it together with colleagues, invite them as collaborators. See [Collaboration](/agentic-batch-changes/collaboration). From 9e56f85597740b77ed05d27569bd540eb671d549 Mon Sep 17 00:00:00 2001 From: Michael Bahr Date: Wed, 18 Nov 2026 08:50:36 +0000 Subject: [PATCH 2/2] docs/abc: Fix collaborator list indentation Amp-Thread-ID: https://ampcode.com/threads/T-01a1e4d8-de7d-7217-baa1-3fb2338878a6 --- docs/agentic-batch-changes/collaboration.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/agentic-batch-changes/collaboration.mdx b/docs/agentic-batch-changes/collaboration.mdx index 36140fb6f..305fb8909 100644 --- a/docs/agentic-batch-changes/collaboration.mdx +++ b/docs/agentic-batch-changes/collaboration.mdx @@ -24,7 +24,7 @@ Each action runs as the user who does it, not as the owner. See [Whose credentia - Cancel and retry turns. - Run workspaces, publish, and clean up changesets that the current plan no longer produces. - Ask the agent to merge changesets, and approve the merge. - - Act on changesets on the batch change page: publish, push the branch, comment, close, merge, rebase, sync, and retry. + - Act on changesets on the batch change page: publish, push the branch, comment, close, merge, rebase, sync, and retry. - **Administrator** with the `BATCH_CHANGE_AGENT_ADMINISTRATION#MANAGE` [permission](/admin/access-control/batch-changes): sees every agent on the [Threads page](/agentic-batch-changes/configuration#threads-page), can hand over any agent, and can invite, extend, and remove collaborators. An administrator who is not a collaborator cannot send messages or act on the agent. - **Previous owner**: after a handover, the previous owner keeps read access to the agent. This access does not expire, and the previous owner cannot act on the agent. - **Viewer**: a user who opens the agent through its [share link](/agentic-batch-changes/configuration#sharing-and-visibility). A viewer can read the transcript but cannot act on the agent or see the collaborator list.