fix: control buildkit cache exports by simonrosenberg · Pull Request #2399 · OpenHands/software-agent-sdk

simonrosenberg · 2026-03-12T15:08:07Z

Summary

disable shared registry cache-to export by default while keeping shared cache-from
add OPENHANDS_BUILDKIT_CACHE_MODE=off|min|max so callers can disable or reduce cache-to exports
add tests covering shared cache tag scoping, default non-export behavior, opt-in shared export, and fully disabled cache export

Scope

The prebuilt SDK sdist feature from this branch already merged separately in #2426, so this PR now carries only the remaining BuildKit cache export controls.

Behavior change

shared registry cache export is opt-in via OPENHANDS_SHARED_REGISTRY_CACHE_EXPORT=1
OPENHANDS_BUILDKIT_CACHE_MODE=max|min|off controls all cache-to exports
- max keeps full cache export behavior
- min exports a smaller cache
- off disables all cache-to exports while preserving cache-from

Validation

uv run pytest tests/agent_server/test_docker_build.py
uv run pre-commit run --files openhands-agent-server/openhands/agent_server/docker/build.py tests/agent_server/test_docker_build.py

Agent Server images for this PR

• GHCR package: https://github.com/OpenHands/agent-sdk/pkgs/container/agent-server

Variants & Base Images

Variant	Architectures	Base Image	Docs / Tags
java	amd64, arm64	`eclipse-temurin:17-jdk`	Link
python	amd64, arm64	`nikolaik/python-nodejs:python3.13-nodejs22`	Link
golang	amd64, arm64	`golang:1.21-bookworm`	Link

Pull (multi-arch manifest)

# Each variant is a multi-arch manifest supporting both amd64 and arm64
docker pull ghcr.io/openhands/agent-server:9c0379f-python

Run

docker run -it --rm \
  -p 8000:8000 \
  --name agent-server-9c0379f-python \
  ghcr.io/openhands/agent-server:9c0379f-python

All tags pushed for this build

ghcr.io/openhands/agent-server:9c0379f-golang-amd64
ghcr.io/openhands/agent-server:9c0379f-golang_tag_1.21-bookworm-amd64
ghcr.io/openhands/agent-server:9c0379f-golang-arm64
ghcr.io/openhands/agent-server:9c0379f-golang_tag_1.21-bookworm-arm64
ghcr.io/openhands/agent-server:9c0379f-java-amd64
ghcr.io/openhands/agent-server:9c0379f-eclipse-temurin_tag_17-jdk-amd64
ghcr.io/openhands/agent-server:9c0379f-java-arm64
ghcr.io/openhands/agent-server:9c0379f-eclipse-temurin_tag_17-jdk-arm64
ghcr.io/openhands/agent-server:9c0379f-python-amd64
ghcr.io/openhands/agent-server:9c0379f-nikolaik_s_python-nodejs_tag_python3.13-nodejs22-amd64
ghcr.io/openhands/agent-server:9c0379f-python-arm64
ghcr.io/openhands/agent-server:9c0379f-nikolaik_s_python-nodejs_tag_python3.13-nodejs22-arm64
ghcr.io/openhands/agent-server:9c0379f-golang
ghcr.io/openhands/agent-server:9c0379f-java
ghcr.io/openhands/agent-server:9c0379f-python

About Multi-Architecture Support

Each variant tag (e.g., 9c0379f-python) is a multi-arch manifest supporting both amd64 and arm64
Docker automatically pulls the correct architecture for your platform
Individual architecture tags (e.g., 9c0379f-python-amd64) are also available if needed

github-actions · 2026-03-12T15:08:34Z

API breakage checks (Griffe)

Result: Passed

Action log

github-actions · 2026-03-12T15:08:55Z

Agent server REST API breakage checks (OpenAPI)

Result: Failed

Log excerpt (first 1000 characters)

::error title=openhands-agent-server REST API::Breaking REST API change detected without MINOR version bump (1.14.0 -> 1.14.0).

Breaking REST API changes detected compared to baseline release:
- added '#/components/schemas/ACPAgent-Output, #/components/schemas/Agent-Output' to the '/items/anyOf[subschema #1: ConversationInfo]/agent' response property 'oneOf' list for the response status '200'
- the '/items/anyOf[subschema #1: ConversationInfo]/agent' response's property type/format changed from 'object'/'' to ''/'' for status '200'
- removed the required property '/items/anyOf[subschema #1: ConversationInfo]/agent/kind' from the response with the '200' status
- removed the required property '/items/anyOf[subschema #1: ConversationInfo]/agent/llm' from the response with the '200' status
- the 'agent' request property type/format changed from 'object'/'' to ''/''
- added '#/components/schemas/ACPAgent-Output, #/components/schemas/Agent-Output' to the 'agent' response property 'oneOf' li

Action log

github-actions · 2026-03-12T15:10:06Z

Coverage Report •

File	Stmts	Miss	Cover	Missing
openhands-agent-server/openhands/agent_server/docker
build.py	533	159	70%	73, 76–77, 91, 96, 100–102, 106, 111, 128–133, 136, 159, 161, 169, 171–172, 174–178, 180, 184, 187, 190–193, 195–197, 199, 201, 203, 205, 295–296, 300–301, 305–306, 310–311, 324, 326–334, 407, 509, 523, 526, 530–531, 535–536, 540, 556–558, 561, 567–570, 580, 595, 613, 618, 625, 629, 649, 652, 679, 698–699, 703–705, 750, 849, 859–860, 931–932, 937, 940, 947, 952, 957, 963, 968, 975–976, 981, 986, 992, 998, 1003, 1012, 1015–1021, 1024–1026, 1029, 1043–1048, 1050–1051, 1053–1055, 1058–1059, 1063–1066, 1068, 1077, 1089, 1092, 1108–1113, 1115–1116, 1118–1122, 1124, 1131, 1135
TOTAL	20321	9130	55%

all-hands-bot

🟢 Good taste - Clean, pragmatic solution solving a real performance problem. No over-engineering, just straightforward implementation: optional parameter, conditional build skip, proper cleanup. Backward compatible, well-tested. This is how code should be written. LGTM! 🚀

Co-authored-by: openhands <openhands@all-hands.dev>

all-hands-bot · 2026-03-19T12:26:23Z

[Automatic Post]: It has been a while since there was any activity on this PR. @simonrosenberg, are you still working on it? If so, please go ahead, if not then please request review, close it, or request that someone else follow up.

all-hands-bot · 2026-03-24T12:32:12Z

[Automatic Post]: It has been a while since there was any activity on this PR. @simonrosenberg, are you still working on it? If so, please go ahead, if not then please request review, close it, or request that someone else follow up.

all-hands-bot · 2026-03-30T12:32:54Z

[Automatic Post]: It has been a while since there was any activity on this PR. @simonrosenberg, are you still working on it? If so, please go ahead, if not then please request review, close it, or request that someone else follow up.

xingyaoww · 2026-03-30T15:24:11Z

@OpenHands can you fix merge conflict?

@simonrosenberg is this still needed?

openhands-ai · 2026-03-30T15:24:33Z

I'm on it! xingyaoww can track my progress at all-hands.dev

simonrosenberg · 2026-03-30T15:27:00Z

Not needed anymore.

openhands-ai · 2026-03-30T15:30:21Z

Summary

The merge conflict in PR #2399 has been resolved and pushed.

What was done:

✅ Merged main into fix/prebuilt-sdist-api — two files had conflicts:
- openhands-agent-server/openhands/agent_server/docker/build.py
- tests/agent_server/test_docker_build.py
✅ Resolved conflicts by taking main's version — this was the correct approach because main already incorporates the OPENHANDS_BUILDKIT_CACHE_MODE feature (the core of this PR) with a simpler implementation. The PR's additional shared cache features (OPENHANDS_SHARED_REGISTRY_CACHE_EXPORT, _scoped_cache_tags, shared_cache_tags) had been superseded by main's streamlined approach.
✅ Verified the resolution — all 35 tests in test_docker_build.py pass, and all pre-commit hooks pass (ruff, pycodestyle, pyright).
✅ Pushed to the PR branch — commit ea779d19 on fix/prebuilt-sdist-api.

Important note:

With this merge resolution, the PR now carries no meaningful diff against main. The cache export control features this PR originally introduced have already been incorporated into main through other work. This confirms the reviewer's suspicion — this PR can likely be closed as its changes are already in main.

Conciseness:

The changes are minimal — a single merge commit with no extraneous modifications. No new code was added beyond what was needed to resolve the conflict.

all-hands-bot approved these changes Mar 12, 2026

View reviewed changes

This was referenced Mar 13, 2026

SWT-Bench cold image builds regress badly under shared registry cache export OpenHands/benchmarks#510

Closed

feat: support reusing prebuilt SDK sdists #2426

Merged

fix: control buildkit cache exports

ed53ab2

Co-authored-by: openhands <openhands@all-hands.dev>

simonrosenberg force-pushed the fix/prebuilt-sdist-api branch from e1753d6 to ed53ab2 Compare March 13, 2026 21:08

simonrosenberg changed the title ~~feat: support reusing prebuilt SDK sdists~~ fix: control buildkit cache exports Mar 13, 2026

simonrosenberg and others added 2 commits March 13, 2026 18:39

Merge branch 'main' into fix/prebuilt-sdist-api

4acdc41

test: relax build context mock assertions

aa4d066

Co-authored-by: openhands <openhands@all-hands.dev>

simonrosenberg closed this Mar 30, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: control buildkit cache exports#2399

fix: control buildkit cache exports#2399
simonrosenberg wants to merge 3 commits intomainfrom
fix/prebuilt-sdist-api

simonrosenberg commented Mar 12, 2026 •

edited by github-actions bot

Loading

Uh oh!

github-actions bot commented Mar 12, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Mar 12, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Mar 12, 2026 •

edited

Loading

Uh oh!

all-hands-bot left a comment

Uh oh!

all-hands-bot commented Mar 19, 2026

Uh oh!

all-hands-bot commented Mar 24, 2026

Uh oh!

all-hands-bot commented Mar 30, 2026

Uh oh!

xingyaoww commented Mar 30, 2026

Uh oh!

openhands-ai bot commented Mar 30, 2026

Uh oh!

simonrosenberg commented Mar 30, 2026

Uh oh!

openhands-ai bot commented Mar 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

simonrosenberg commented Mar 12, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Scope

Behavior change

Validation

Uh oh!

github-actions bot commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

API breakage checks (Griffe)

Uh oh!

github-actions bot commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Agent server REST API breakage checks (OpenAPI)

Uh oh!

github-actions bot commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

all-hands-bot left a comment

Choose a reason for hiding this comment

Uh oh!

all-hands-bot commented Mar 19, 2026

Uh oh!

all-hands-bot commented Mar 24, 2026

Uh oh!

all-hands-bot commented Mar 30, 2026

Uh oh!

xingyaoww commented Mar 30, 2026

Uh oh!

openhands-ai bot commented Mar 30, 2026

Uh oh!

simonrosenberg commented Mar 30, 2026

Uh oh!

openhands-ai bot commented Mar 30, 2026

Summary

What was done:

Important note:

Conciseness:

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

simonrosenberg commented Mar 12, 2026 •

edited by github-actions bot

Loading

github-actions bot commented Mar 12, 2026 •

edited

Loading

github-actions bot commented Mar 12, 2026 •

edited

Loading

github-actions bot commented Mar 12, 2026 •

edited

Loading