(view) Claude fixes on top of buildkit

[gilescope]

Same idea as #17, but based at 67d0d850 (the 2026-04-08 Merge moby-buildkit/master point) instead of moby-merge-base. This narrows the diff to our changes since that upstream merge — i.e. this session's diff-reduction pass plus fixes:

• drop redundant LockOSThread workaround (go-runc handles it)
• restore COPY ModeStr / AlwaysReplaceExistingDestPaths (vendored fsutil supports them)
• revert no-op divergences (diffapply casts, scheduler_test t.Context)
• revert the Rosetta /proc archutil patch
• remove scheduler "inconsistent graph state" diagnostics (scheduler.go/jobs.go back to upstream)
• guard nil frontendAttrs map in Client.solve (fixes a multi-image+cache panic)

Review-only view — do not merge. The base branch moby-merge-base-apr8 is a throwaway pointer to 67d0d850; keep it while this PR is open.

[github-actions]

⚠️ Are we earthbuild yet?

Warning: "earthly" occurrences have increased by 28 (12.9%)

📈 Overall Progress

Branch	Total Count
main	217
This PR	245
Difference	+28 (12.9%)

📁 Changes by file type:

File Type	Change
Go files (.go)	❌ +25
Documentation (.md)	➖ No change
Earthfiles	➖ No change

---

Keep up the great work migrating from Earthly to Earthbuild! 🚀

💡 Tips for finding more occurrences

Run locally to see detailed breakdown:

./.github/scripts/count-earthly.sh

Note that the goal is not to reach 0.
There is anticipated to be at least some occurences of earthly in the source code due to backwards compatibility with config files and language constructs.

[gemini-code-assist]

Code Review

This pull request transitions the codebase from gogo protobuf to the standard Go protobuf API, regenerating protobuf files and removing custom earthly-specific marshaling implementations. It also updates dependencies, disables gRPC ALPN enforcement in buildkitd for compatibility, and skips the mount cache to ensure persistent cache mounts reflect the latest writes. The review feedback highlights a critical resource leak in frontend/gateway/gateway.go where old mounters are overwritten without being unmounted, as well as multiple compilation errors across several files due to name collisions between the standard library errors package and github.com/pkg/errors.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

[gemini-code-assist]

Skipping the mount cache check to ensure persistent cache mounts reflect the latest writes is intentional, but always creating a new mounter and overwriting lbf.mounts[id] without unmounting the previous one will leak the old mount. To prevent resource and mount leaks, the previous mounter must be unmounted before being overwritten.

	if oldMounter, ok := lbf.mounts[id]; ok {
		if err := oldMounter.Unmount(); err != nil {
			return nil, err
		}
	}
	// Earthly: skip mount cache to ensure persistent cache mounts
	// reflect latest writes between consecutive SAVE ARTIFACT calls.
	// Upstream commit 7aaa7974d introduced this cache for performance,
	// but it causes stale reads when the same cache mount is modified
	// between operations within a single target.
	var mountable snapshot.Mountable
	if ref != nil {
		var err error

[gemini-code-assist]

To avoid a compilation error due to a name collision between the standard library errors package (needed for errors.Is) and github.com/pkg/errors (needed for errors.WithStack), import the standard library errors package as stdErrors and alias github.com/pkg/errors as pkgerrors.

Suggested change

	import (
	"context"
	"io"
	"github.com/pkg/errors"
	context "golang.org/x/net/context"
	"golang.org/x/sync/errgroup"
	)
	import (
	"context"
	stdErrors "errors"
	"io"
	pkgerrors "github.com/pkg/errors"
	"golang.org/x/sync/errgroup"
	)

[gemini-code-assist]

Use the aliased stdErrors and pkgerrors packages to resolve the name collision.

Suggested change

	if errors.Is(err, io.EOF) {
	return nil
	}
	return errors.WithStack(err)
	if stdErrors.Is(err, io.EOF) {
	return nil
	}
	return pkgerrors.WithStack(err)

[gemini-code-assist]

Use stdErrors.Is to check for io.EOF.

Suggested change

	case errors.Is(err, io.EOF):
	case stdErrors.Is(err, io.EOF):

[gemini-code-assist]

To avoid a compilation error due to a name collision between the standard library errors package (needed for errors.Is) and github.com/pkg/errors (needed for errors.WithStack), you should alias github.com/pkg/errors as pkgerrors in the imports of this file and use pkgerrors.WithStack here.

Suggested change

	if errors.Is(err, io.EOF) {
	break
	}
	return errors.WithStack(err)
	if errors.Is(err, io.EOF) {
	break
	}
	return pkgerrors.WithStack(err)

[gemini-code-assist]

Use pkgerrors.Wrapf to avoid name collision with the standard library errors package.

Suggested change

	if errors.Is(err, io.EOF) {
	break
	}
	return errors.Wrapf(err, "failed to read from %s", src)
	if errors.Is(err, io.EOF) {
	break
	}
	return pkgerrors.Wrapf(err, "failed to read from %s", src)

[gemini-code-assist]

To avoid a compilation error due to a name collision between the standard library errors package (needed for errors.Is) and github.com/pkg/errors (needed for errors.WithStack), you should alias github.com/pkg/errors as pkgerrors in the imports of this file and use pkgerrors.WithStack here.

Suggested change

	} else if errors.Is(err, io.EOF) {
	break outer
	default:
	} else {
	return errors.WithStack(err)
	} else if errors.Is(err, io.EOF) {
	break outer
	} else {
	return pkgerrors.WithStack(err)

[gemini-code-assist]

To avoid a compilation error due to a name collision between the standard library errors package (needed for errors.Is) and github.com/pkg/errors (needed for errors.Errorf), you should alias github.com/pkg/errors as pkgerrors in the imports of this file and use pkgerrors.Errorf here.

Suggested change

	if errors.Is(err, context.Canceled) && errors.Is(context.Cause(ctx), errSessionTimeout) {
	return resp, errors.Errorf("build exceeded max duration of %s", sessionTimeout.String())
	if errors.Is(err, context.Canceled) && errors.Is(context.Cause(ctx), errSessionTimeout) {
	return resp, pkgerrors.Errorf("build exceeded max duration of %s", sessionTimeout.String())

[gemini-code-assist]

Use pkgerrors.Errorf to avoid name collision with the standard library errors package.

Suggested change

	if errors.Is(err, context.Canceled) && errors.Is(context.Cause(ctx), errSessionTimeout) {
	return errors.Errorf("build exceeded max duration of %s", sessionTimeout.String())
	if errors.Is(err, context.Canceled) && errors.Is(context.Cause(ctx), errSessionTimeout) {
	return pkgerrors.Errorf("build exceeded max duration of %s", sessionTimeout.String())

[gemini-code-assist]

The standard library errors package must be imported to use errors.As. If github.com/pkg/errors is also imported in this file, alias one of them to avoid a name collision.

[socket-security]

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance	License
	golang/​github.com/​tonistiigi/​fsutil@​v0.0.0-20251211185533-a2aa163d723f

View full report