Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions content/cli/deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -343,10 +343,9 @@ A reported commit Volcano can't confirm is recorded with `verification: none`,
and LavaFlow diagnoses that deployment from the logs alone. That includes a
frontend upload that doesn't match its commit, and a workflow run for a pull
request, which deploys GitHub's merge commit on no branch. At autonomy
`merge`, LavaFlow holds a fix built on a reported commit, at either level, for
a person to merge. A fix built on a commit that a
[push to the repository deployed](#cloud-projects-that-deploy-from-git) has no
such hold. `frontends deploy --from` keeps the commit of the build it
`merge`, fixes on file-verified uploads can merge after the required reviews
and checks. LavaFlow holds a fix with repository-only verification for you to
check against the deployed code and merge. `frontends deploy --from` keeps the commit of the build it
publishes. A frontend redeploy reports no commit of its own, and LavaFlow
reads it as the commit of the build that made its artifact.

Expand Down
15 changes: 9 additions & 6 deletions content/cli/lavaflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,11 @@ that changes a path, use `--human-review-path`; see [Merge fixes](#merge-fixes).

### Merge fixes

At autonomy `merge`, LavaFlow can merge its fix pull requests. A fix built on
a commit the deploy reported, at either
[verification level](deploy.md#verification), is always held for a person.
Only a fix on a commit that a push to the repository deployed is free of that
hold. A fix it holds or stops is yours to review and merge on GitHub.
At autonomy `merge`, LavaFlow can merge fixes built on verified source,
including a frontend upload with [file verification](deploy.md#verification).

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 P2: CLI deploy guide still says fixes on reported commits at either verification level are held

This PR changes the CLI LavaFlow page to say LavaFlow can merge fixes built on a frontend upload with file verification, and only repository-verified uploads get the client_reported_commit hold. The platform guide's hold table now says the same. But the page this line links to, content/cli/deploy.md#verification (lines 345–349), still says: "At autonomy merge, LavaFlow holds a fix built on a reported commit, at either level, for a person to merge." Someone who deploys a frontend with the CLI and follows this link gets the opposite answer about whether LavaFlow will merge the fix without them. Update that paragraph in deploy.md to say that only verification: repository fixes are held with client_reported_commit.

Found by claude-opus-5-5

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 P2: Align the linked deploy guide with file-verified merge eligibility

This now allows automatic merging for file-verified frontend uploads, but the linked content/cli/deploy.md:345–349 still says reported commits at either verification level always require a person to merge. Readers following the verification link therefore receive opposite answers about whether their frontend fix can merge automatically. Update that reference to reserve the hold for repository-only verification.

Found by gpt-6.1-sol

For an upload with repository verification only, check the fix against the
deployed code and merge it yourself. LavaFlow gives those fixes the
`client_reported_commit` hold.

```bash
volcano cloud lavaflow settings set --autonomy merge
Expand Down Expand Up @@ -237,7 +237,10 @@ volcano cloud lavaflow settings set --human-review-path 'infra/**' --human-revie
```

`show` prints `Merge:` in its `Fix:` block with where the merge is:
`waiting for CI`, `queued to merge`, `merged`, `held` or `stopped`. A merged
`waiting for CI`, `queued to merge`, `merged`, `held` or `stopped`. When
GitHub still requires an approval, the run's API status is
`merge.status: waiting_for_approval`. LavaFlow continues after approval.
A merged
fix says `merged by LavaFlow`, or `merged by someone else` when a person
merged it while LavaFlow waited. While merging is paused, a
waiting fix says `paused while merging is off` instead. `held` and
Expand Down
12 changes: 7 additions & 5 deletions content/platform/guides/lavaflow-aikido.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ description: 'Connect an Aikido workspace so LavaFlow opens fix pull requests fo
Connect your [Aikido](https://www.aikido.dev) workspace, bind a project, and
each new code (SAST) issue Aikido finds on the project's GitHub repository
starts a [LavaFlow](lavaflow.md) run. LavaFlow
reads the issue, diagnoses it, and opens a pull request with the fix for you
to review. It never merges an Aikido fix, and it writes nothing back to
Aikido: follow the run in Volcano.
reads the issue, diagnoses it, and opens a pull request when it can fix the
problem. With `autonomy: merge`, LavaFlow follows the PR through review,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 P2: Reconcile the remaining manual-only delivery descriptions

The introduction now promises merging under autonomy: merge, but this guide's lines 119–121 still say the run stops at a pull request whatever the project's autonomy. content/platform/guides/lavaflow.md:2920–2922 repeats that restriction, and its Slack summary at lines 2913–2915 still describes requested changes as requiring a person's review. Readers can therefore expect a manual handoff when the newly documented behavior permits automatic merging. Update these passages to distinguish open_pr from merge.

Found by gpt-6.1-sol

required checks, and merge. Follow the run in Volcano. LavaFlow writes
nothing back to Aikido.

Aikido reports need the project's `lavaflow.aikido` capability. They are
rolling out environment by environment, so check it first. It is available
Expand Down Expand Up @@ -116,8 +117,9 @@ A new issue starts a run when all of these hold:
- Its code repository is on GitHub, and is the bound project's repository.

LavaFlow reads the issue's title, rule, file and lines, and Aikido's advice
for fixing it, then runs its usual diagnosis, fix and review. The run stops at
a pull request, whatever the project's own autonomy.
for fixing it, then runs its usual diagnosis, fix, and review. The project's
autonomy determines whether LavaFlow follows the fix through merge or leaves
the merge to you.
If several bound projects share the repository, the first one bound that
LavaFlow can run on gets the issue.

Expand Down
39 changes: 26 additions & 13 deletions content/platform/guides/lavaflow-slack.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,24 @@ report. A later mention in the thread starts a new report, which reads the
thread again: for example, a request for a change after the run's result, or a
retry after LavaFlow refused the report at a limit.

LavaFlow then answers in the thread with the project it picked and a link to
its repository, and posts the outcome as a new reply. It never edits an
earlier reply, so the thread keeps each step of the report. A run from Slack goes as far as opening a fix
pull request, even where the project lets LavaFlow merge, and so does a run
someone starts again on the report's issue: merging a fix someone reported in
Slack stays a person's step. The outcome is the pull request's link, or a
fixed reason it opened none, and a link to the run in Volcano. The run link
opens the report's project in the same environment as the Slack app and still
LavaFlow replies with the project it picked and its repository. With
[`autonomy: merge`](lavaflow.md#merge-fixes), LavaFlow can take an issue from
Slack to a merge on the project's production branch. It pins the repository
revision and reviews the fix. Where review on a draft PR is available, it
revises that draft and marks it ready once review clears. It follows the required checks and approvals and merges the PR when
they pass. It uses the repository's merge queue when required. With
`autonomy: open_pr`, you review and merge the resulting PR.

The thread receives a link to the run in Volcano and a link to the PR when
one opens. LavaFlow replies when GitHub records the merge or LavaFlow needs
help. If no PR opens, the thread gives a reason.
LavaFlow follows an active report within its retention window, at most 10 days
from the report. If the report expires before the merge, or LavaFlow loses

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚪ P3: Data and retention still says a run waiting on a deleted report stops, while the new text says it holds the PR

The new paragraph says that if the report expires before the merge, "the run holds the PR with report_admission_lost". Data and retention (line 253 of the same page) still says "A run still waiting for a deleted report stops". Before this PR, Slack runs never merged, so that sentence only covered reports still waiting to start. Now a run waiting on checks, approval or the merge queue can also outlive the report. A reader can take "stops" to mean merge.status: stopped. Update the retention sentence to say a PR LavaFlow is still following is held with report_admission_lost.

Found by claude-opus-5-5

access or can no longer verify the base, the run holds the PR with
`report_admission_lost`. Review and merge the open PR on GitHub if it is
still applicable.

The run link opens the report's project in the same environment as the Slack app and still

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚪ P3: "The run link" no longer has anything to refer to

The old text said the outcome reply contains "the pull request's link, or a fixed reason it opened none, and a link to the run in Volcano". The rewrite keeps the next sentence, "The run link opens the report's project…", but drops the sentence that told readers the thread gets a run link at all. Add the run link back to the description of what LavaFlow posts, for example in the "LavaFlow links the PR while following it…" sentence.

Found by claude-opus-5-5

requires access to that project. It never holds the diagnosis:
everyone in the channel reads the answer, including people who can't see the
project's runs. Read the diagnosis in Volcano, and follow the run like any
Expand Down Expand Up @@ -164,11 +174,14 @@ what you're asking for:
run and asks you to say what to change in your own message.

LavaFlow builds what the request asks for and nothing beyond it, and its
reviewers hold anything else the change adds. The request can't change what
LavaFlow may do: its permissions, the files it may not change, its review, and
when it opens a pull request stay the same, and the run stops at a pull
request for a person to review and merge. The pull request says it proposes a
requested change, not a fix, and the run's `diagnosis.requested` is `true`.
reviewers hold anything else the change adds. Your project settings and
repository rules determine whether LavaFlow can merge. To stop after opening
the PR, write `@Volcano add hello.md containing "hello world". Open a PR and
leave the merge to me.` LavaFlow opens the PR and leaves the merge to you. To keep it
as a draft, say "leave the PR as a draft." Asking to open a draft PR still
lets LavaFlow mark it ready when reviews pass.
The pull request describes the requested change, and the run sets
`diagnosis.requested` to `true`.
When the request is unclear, the result already exists, or the change lies
outside the repository, LavaFlow opens nothing and says so in the thread.

Expand Down
Loading