diff --git a/docs/agentic-batch-changes/collaboration.mdx b/docs/agentic-batch-changes/collaboration.mdx index f8200e89e..39f52ed8e 100644 --- a/docs/agentic-batch-changes/collaboration.mdx +++ b/docs/agentic-batch-changes/collaboration.mdx @@ -16,6 +16,7 @@ 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 publish approvals. - 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. - **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. @@ -57,7 +58,7 @@ In these cases, the user an action runs as or is charged to is not the user who - **Retry**: a retried turn runs as the user who clicks **Retry**, not as the author of the original message. - **Answers and approvals**: when a turn is waiting for an answer or an approval, any owner or collaborator can answer. The turn then continues as the user who answered. - **Publish approvals**: before the agent publishes, it shows an approval card. A publish approval covers specific repositories and a mode, such as draft. Only the owner can give a publish approval. A collaborator can publish only to repositories and in a mode that the owner already approved for this agent. -- **Code host pushes and syncs**: Sourcegraph pushes and syncs all changesets of the agent with the Batch Changes credential of the user who published most recently, or the global credential when that user has none. This also applies to changesets that another user published. +- **Code host pushes and syncs**: Sourcegraph pushes and syncs all changesets of the agent with the Batch Changes credential of the user who published most recently, or the global credential when that user has none. This also applies to changesets that another user published. A merge uses the credential of the user whose turn asked for it. - **Published changesets entitlement**: when a collaborator publishes, the published changeset counts against the collaborator's entitlement. When the owner publishes, it counts against the owner's. - **Billing**: merged changesets are [billed](/agentic-batch-changes/configuration#billing) to the subscription and recorded for the owner, no matter who published or merged them. - **Uploaded files**: files are stored with the agent under the owner, no matter who uploaded them. Every user who can open the agent can download them. diff --git a/docs/agentic-batch-changes/index.mdx b/docs/agentic-batch-changes/index.mdx index c0f195d61..36ad85d77 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 other users follow the work, use **Share** on the agent page. See [Sharing and visibility](/agentic-batch-changes/configuration#sharing-and-visibility). To let another user 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 other users, invite them as collaborators. See [Collaboration](/agentic-batch-changes/collaboration).