Skip to content

test - #89

Closed
eric-wang-1990 wants to merge 1 commit into
mainfrom
stack/test
Closed

test#89
eric-wang-1990 wants to merge 1 commit into
mainfrom
stack/test

Conversation

@eric-wang-1990

@eric-wang-1990 eric-wang-1990 commented Dec 18, 2025

Copy link
Copy Markdown
Collaborator

🥞 Stacked PR

Use this link to review incremental changes.


What's Changed

Please fill in a description of the changes here.

This contains breaking changes.

Closes #NNN.

eric-wang-1990 added a commit that referenced this pull request Jul 31, 2026
…ed arg)

The engine's followup phase now REQUIRES --system-prompt (engine #89 removed the
.bot/ prompt-name fallback); adbc's engineer-bot-followup invoked it without the
flag, so every run failed with "engineer-bot: error: the following arguments are
required: --system-prompt". Point at the engineer-followup system prompt that
already exists at .bot/prompts/engineer-followup/system.md, mirroring how
databricks-jdbc wires it.

Co-authored-by: Isaac
eric-wang-1990 added a commit to CurtHagenlocher/databricks that referenced this pull request Aug 11, 2026
…t + .github access (adbc-drivers#605)

## Summary

Four related fixes aligning adbc's bot workflows with the other consumer
repos and the engine's current contract.

### 1. Reviewer bot auto-reviews (drop the `review-bot` label gate)
adbc was the **only** consumer whose reviewer required an opt-in
`review-bot` label; databricks-sql-python/go/nodejs/kernel auto-review
every non-draft, non-fork PR. Dropped the `contains(labels,
'review-bot')` clause from the job `if:` in both `reviewer-bot.yml` and
`reviewer-bot-followup.yml` (and removed the now-unneeded `labeled`
trigger). Fork/draft security floor unchanged.

### 2. engineer-bot follow-up: pass the required `--system-prompt`
The engine's followup phase now **requires** `--system-prompt` (engine
adbc-drivers#89 removed the `.bot/` prompt-name fallback). adbc invoked `... --phase
followup --bot .bot` **without** it, so every run failed:
```
engineer-bot: error: the following arguments are required: --system-prompt
```
Added `--system-prompt .bot/prompts/engineer-followup/system.md` (the
prompt file already exists), mirroring databricks-jdbc's onboarding.

### 3. Allow the engineer-bot to edit `.github/`
Removed `.github` from `.bot/config.yaml` `denied_subpaths` (maintainer
decision) so the bug-fix bot can fix its own CI/workflow wiring (e.g. adbc-drivers#2
above) instead of reporting "denied in this workspace" and blocking.
`.bot` stays denied; the human PR-review gate is the backstop —
reviewers must scrutinize any `.github` diffs since workflows carry
secrets/tokens.

### 4. Remove the vestigial review-bot labeling step
`engineer-bot.yaml` had a "Label the fix PR for review" step that added
`review-bot` so the reviewer would pick up fix PRs. With adbc-drivers#1 (reviewer
auto-runs), that step is dead and its comment stale — removed. `publish`
still applies `engineer-bot` for the follow-up opt-in.

## Notes
- adbc-drivers#2, adbc-drivers#3, adbc-drivers#4 only take effect once this merges to `main` —
`pull_request`/comment-triggered bot jobs run from the base-branch copy
of the workflow, so the fixes are dormant on this PR itself (expected).
- adbc-drivers#3 was prompted by the reviewer bot itself flagging (on this PR) that
adbc-drivers#1 left the `engineer-bot.yaml` label step vestigial — which it couldn't
fix because `.github/` was denied. This PR both enables that access and
does the cleanup.

## Verification
- All touched workflows + `.bot/config.yaml` parse; reviewer/followup
jobs intact.
- `.github` no longer in `denied_subpaths`; no `--add-label review-bot`
step remains; engineer-followup invocation includes `--system-prompt`
pointing at the existing prompt file.

This pull request and its description were written by Isaac.
eric-wang-1990 added a commit that referenced this pull request Aug 11, 2026
Engine #89 requires the author phase to receive BOTH --system-prompt
(argparse-required) and --user-prompt (enforced in run.py main()). This
repo's .bot/config.yaml has no author.build_user_prompt hook and renders
.bot/prompts/engineer/user.md via author.env_tokens, so --user-prompt is
mandatory. Passing only --system-prompt clears the argparse error but the
run would still SystemExit at the user-prompt check. Mirror the engine's
canonical engineer-bot.yml, which passes both.

Co-authored-by: Isaac
eric-wang-1990 added a commit to CurtHagenlocher/databricks that referenced this pull request Aug 11, 2026
…dbc-drivers#642)

The engineer-bot **Fix** workflow fails at the "Run bug-fix author" step
for every issue-triggered run:

```
engineer-bot: error: the following arguments are required: --system-prompt
##[error]Process completed with exit code 2.
```

## Root cause

`engineer-bot.yaml` invoked the author phase with the pre-adbc-drivers#89 CLI form:

```
python -m databricks_bot_engine.engineer_bot.run --phase author --bot .bot
```

Engine
[adbc-drivers#89](databricks/databricks-bot-engine#89)
externalized the prompts out of the engine. The author phase now
requires **both**:

- `--system-prompt PATH` — argparse-`required=True` (this is the arg
that produced the `exit 2` above).
- `--user-prompt PATH` — required for the author phase, enforced in
`run.py` `main()` (rendered as a template, filling `{{issue_*}}` from
`author.env_tokens` in `.bot/config.yaml`).

All bot workflows are pinned to `ENGINE_REF d05dcb1`, which includes
adbc-drivers#89. The **followup** workflow was updated for it; the **author** step
here was missed. This breaks *every* issue-triggered engineer-bot fix,
e.g. [run
31474456965](https://github.com/adbc-drivers/databricks/actions/runs/31474456965/job/93724838757)
on adbc-drivers#640.

## Fix

Pass both prompt paths, mirroring the engine's own canonical
`engineer-bot.yml`:

```
--system-prompt .bot/prompts/engineer/system.md
--user-prompt   .bot/prompts/engineer/user.md
```

Both files already exist in this repo. `--flow` is intentionally omitted
— `.bot/config.yaml` sets `flow: bug-fix` as the default.

This pull request and its description were written by Isaac.
@eric-wang-1990

Copy link
Copy Markdown
Collaborator Author

Closing — abandoned experiment (a +1/-1 PR titled 'test').

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.

1 participant