bufbuild · doriable · Apr 10, 2026 · Apr 10, 2026
diff --git a/.golangci.yml b/.golangci.yml
@@ -253,7 +253,7 @@ linters:
       - linters:
           - containedctx
         # we actually want to embed a context here
-        path: private/bufpkg/bufimage/module_file_resolver.go
+        path: private/bufpkg/bufimage/parser_accessor_handler.go
       - linters:
           - containedctx
         # we actually want to embed a context here
@@ -449,13 +449,6 @@ linters:
         # term.IsTerminal. Safe on all supported platforms.
         path: private/pkg/slogapp/console.go
         text: "G115:"
-      - linters:
-          - gosec
-        # G115: uintptr->int conversion for passing a terminal file descriptor
-        # to term.IsTerminal, which requires int. Safe on all supported platforms;
-        # fd values fit in int.
-        path: private/buf/bufctl/controller.go
-        text: "G115:"
       - linters:
           - gosec
         # G602: false positive — the loop index i is bounded by the length of

diff --git a/cmd/buf/buf_test.go b/cmd/buf/buf_test.go
@@ -4493,10 +4493,7 @@ func TestProtoFileNoWorkspaceOrModule(t *testing.T) {
 		nil,
 		bufctl.ExitCodeFileAnnotation,
 		"", // no stdout
-		fmt.Sprintf(
-			"%[1]s:3:1:imported file does not exist\n%[1]s:6:3:cannot find `google.type.Date` in this scope",
-			filepath.FromSlash("testdata/protofileref/noworkspaceormodule/fail/import.proto"),
-		),
+		filepath.FromSlash(`testdata/protofileref/noworkspaceormodule/fail/import.proto:3:8:import "`)+`google/type/date.proto": file does not exist`,
 		"build",
 		filepath.Join("testdata", "protofileref", "noworkspaceormodule", "fail", "import.proto"),
 	)

diff --git a/cmd/buf/imports_test.go b/cmd/buf/imports_test.go
@@ -15,7 +15,6 @@
 package main
 
 import (
-	"fmt"
 	"io"
 	"path/filepath"
 	"strings"
@@ -149,10 +148,7 @@ func TestInvalidNonexistentImport(t *testing.T) {
 	t.Parallel()
 	testRunStderrWithCache(
 		t, nil, bufctl.ExitCodeFileAnnotation,
-		fmt.Sprintf(
-			"%[1]s:5:1:imported file does not exist",
-			filepath.FromSlash("testdata/imports/failure/people/people/v1/people1.proto"),
-		),
+		filepath.FromSlash(`testdata/imports/failure/people/people/v1/people1.proto:5:8:import "nonexistent.proto": file does not exist`),
 		"build",
 		filepath.Join("testdata", "imports", "failure", "people"),
 	)
@@ -162,10 +158,7 @@ func TestInvalidNonexistentImportFromDirectDep(t *testing.T) {
 	t.Parallel()
 	testRunStderrWithCache(
 		t, nil, bufctl.ExitCodeFileAnnotation,
-		fmt.Sprintf(
-			"%[1]s:6:1:imported file does not exist\n%[1]s:10:3:cannot find `people.v1.Person2` in this scope",
-			filepath.FromSlash("testdata/imports/failure/students/students/v1/students.proto"),
-		),
+		filepath.FromSlash(`testdata/imports/failure/students/students/v1/students.proto:`)+`6:8:import "people/v1/people_nonexistent.proto": file does not exist`,
 		"build",
 		filepath.Join("testdata", "imports", "failure", "students"),
 	)

diff --git a/cmd/buf/internal/command/breaking/breaking.go b/cmd/buf/internal/command/breaking/breaking.go
@@ -181,7 +181,6 @@ func run(
 		container,
 		bufctl.WithDisableSymlinks(flags.DisableSymlinks),
 		bufctl.WithFileAnnotationErrorFormat(flags.ErrorFormat),
-		bufctl.WithColorizedFileAnnotationSetDiagnosticReport(container.LogFormat() == appext.LogFormatColor),
 		bufctl.WithFileAnnotationsToStdout(),
 	)
 	if err != nil {
@@ -369,7 +368,7 @@ func run(
 		}
 	}
 	if len(allFileAnnotations) > 0 {
-		allFileAnnotationSet := bufanalysis.NewFileAnnotationSet(nil, allFileAnnotations...)
+		allFileAnnotationSet := bufanalysis.NewFileAnnotationSet(allFileAnnotations...)
 		if err := bufanalysis.PrintFileAnnotationSet(
 			container.Stdout(),
 			allFileAnnotationSet,

diff --git a/cmd/buf/internal/command/build/build.go b/cmd/buf/internal/command/build/build.go
@@ -152,7 +152,6 @@ func run(
 		container,
 		bufctl.WithDisableSymlinks(flags.DisableSymlinks),
 		bufctl.WithFileAnnotationErrorFormat(flags.ErrorFormat),
-		bufctl.WithColorizedFileAnnotationSetDiagnosticReport(container.LogFormat() == appext.LogFormatColor),
 	)
 	if err != nil {
 		return err

diff --git a/cmd/buf/internal/command/convert/convert.go b/cmd/buf/internal/command/convert/convert.go
@@ -174,7 +174,6 @@ func run(
 		container,
 		bufctl.WithDisableSymlinks(flags.DisableSymlinks),
 		bufctl.WithFileAnnotationErrorFormat(flags.ErrorFormat),
-		bufctl.WithColorizedFileAnnotationSetDiagnosticReport(container.LogFormat() == appext.LogFormatColor),
 	)
 	if err != nil {
 		return err

diff --git a/cmd/buf/internal/command/curl/curl.go b/cmd/buf/internal/command/curl/curl.go
@@ -1334,12 +1334,7 @@ func completeURLFromSchema(ctx context.Context, schemas []string, baseURL, rawPa
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	}
 	// Discard log output during shell completion.
-	container := appext.NewContainer(
-		nameContainer,
-		slog.New(slog.NewTextHandler(io.Discard, nil)),
-		appext.LogLevelError, // Doesn't matter, logs are discarded
-		appext.LogFormatText, // Doesn't matter, logs are discarded
-	)
+	container := appext.NewContainer(nameContainer, slog.New(slog.NewTextHandler(io.Discard, nil)))
 	controller, err := bufcli.NewController(container)
 	if err != nil {
 		reportError("%v", err)

diff --git a/cmd/buf/internal/command/dep/depgraph/depgraph.go b/cmd/buf/internal/command/dep/depgraph/depgraph.go
@@ -155,7 +155,6 @@ func run(
 		container,
 		bufctl.WithDisableSymlinks(flags.DisableSymlinks),
 		bufctl.WithFileAnnotationErrorFormat(flags.ErrorFormat),
-		bufctl.WithColorizedFileAnnotationSetDiagnosticReport(container.LogFormat() == appext.LogFormatColor),
 	)
 	if err != nil {
 		return err

diff --git a/cmd/buf/internal/command/format/format.go b/cmd/buf/internal/command/format/format.go
@@ -296,7 +296,6 @@ func run(
 		container,
 		bufctl.WithDisableSymlinks(flags.DisableSymlinks),
 		bufctl.WithFileAnnotationErrorFormat(flags.ErrorFormat),
-		bufctl.WithColorizedFileAnnotationSetDiagnosticReport(container.LogFormat() == appext.LogFormatColor),
 	)
 	if err != nil {
 		return err

diff --git a/cmd/buf/internal/command/generate/generate.go b/cmd/buf/internal/command/generate/generate.go
@@ -534,7 +534,6 @@ func run(
 		container,
 		bufctl.WithDisableSymlinks(flags.DisableSymlinks),
 		bufctl.WithFileAnnotationErrorFormat(flags.ErrorFormat),
-		bufctl.WithColorizedFileAnnotationSetDiagnosticReport(container.LogFormat() == appext.LogFormatColor),
 	)
 	if err != nil {
 		return err

diff --git a/cmd/buf/internal/command/lint/lint.go b/cmd/buf/internal/command/lint/lint.go
@@ -120,7 +120,6 @@ func run(
 		container,
 		bufctl.WithDisableSymlinks(flags.DisableSymlinks),
 		bufctl.WithFileAnnotationErrorFormat(controllerErrorFormat),
-		bufctl.WithColorizedFileAnnotationSetDiagnosticReport(container.LogFormat() == appext.LogFormatColor),
 		bufctl.WithFileAnnotationsToStdout(),
 	)
 	if err != nil {
@@ -173,7 +172,7 @@ func run(
 		}
 	}
 	if len(allFileAnnotations) > 0 {
-		allFileAnnotationSet := bufanalysis.NewFileAnnotationSet(nil, allFileAnnotations...)
+		allFileAnnotationSet := bufanalysis.NewFileAnnotationSet(allFileAnnotations...)
 		if flags.ErrorFormat == "config-ignore-yaml" {
 			if err := bufcli.PrintFileAnnotationSetLintConfigIgnoreYAMLV1(
 				container.Stdout(),

diff --git a/cmd/buf/internal/command/push/push.go b/cmd/buf/internal/command/push/push.go
@@ -312,7 +312,6 @@ func getBuildableWorkspace(
 		container,
 		bufctl.WithDisableSymlinks(flags.DisableSymlinks),
 		bufctl.WithFileAnnotationErrorFormat(flags.ErrorFormat),
-		bufctl.WithColorizedFileAnnotationSetDiagnosticReport(container.LogFormat() == appext.LogFormatColor),
 	)
 	if err != nil {
 		return nil, err

diff --git a/cmd/buf/internal/command/source/sourceedit/sourceeditdeprecate/sourceeditdeprecate.go b/cmd/buf/internal/command/source/sourceedit/sourceeditdeprecate/sourceeditdeprecate.go
@@ -183,7 +183,6 @@ func run(
 		container,
 		bufctl.WithDisableSymlinks(flags.DisableSymlinks),
 		bufctl.WithFileAnnotationErrorFormat(flags.ErrorFormat),
-		bufctl.WithColorizedFileAnnotationSetDiagnosticReport(container.LogFormat() == appext.LogFormatColor),
 	)
 	if err != nil {
 		return err

diff --git a/cmd/buf/workspace_test.go b/cmd/buf/workspace_test.go
@@ -141,15 +141,11 @@ func TestWorkspaceDir(t *testing.T) {
 			"lint",
 			filepath.Join("testdata", "workspace", "success", baseDirPath),
 		)
-		dirImportError := fmt.Sprintf(
-			"%[1]s:5:1:imported file does not exist\n%[1]s:8:5:cannot find `request.Request` in this scope",
-			filepath.FromSlash("testdata/workspace/success/"+baseDirPath+"/proto/rpc.proto"),
-		)
 		testRunStdoutStderrNoWarn(
 			t,
 			nil,
 			bufctl.ExitCodeFileAnnotation,
-			dirImportError,
+			filepath.FromSlash(`testdata/workspace/success/`+baseDirPath+`/proto/rpc.proto:5:8:import "request.proto": file does not exist`),
 			"",
 			"lint",
 			filepath.Join("testdata", "workspace", "success", baseDirPath),
@@ -160,7 +156,7 @@ func TestWorkspaceDir(t *testing.T) {
 			t,
 			nil,
 			bufctl.ExitCodeFileAnnotation,
-			dirImportError,
+			filepath.FromSlash(`testdata/workspace/success/`+baseDirPath+`/proto/rpc.proto:5:8:import "request.proto": file does not exist`),
 			"",
 			"lint",
 			filepath.Join("testdata", "workspace", "success", baseDirPath),
@@ -370,16 +366,12 @@ func TestWorkspaceDetached(t *testing.T) {
 		// we'd consider this a bug: you specified the proto directory, and no controlling workspace
 		// was discovered, therefore you build as if proto was the input directory, which results in
 		// request.proto not existing as an import.
-		detachedImportError := fmt.Sprintf(
-			"%[1]s:5:1:imported file does not exist\n%[1]s:8:5:cannot find `request.Request` in this scope",
-			filepath.FromSlash("testdata/workspace/success/"+dirPath+"/proto/rpc.proto"),
-		)
 		testRunStdoutStderrNoWarn(
 			t,
 			nil,
 			bufctl.ExitCodeFileAnnotation,
 			``,
-			detachedImportError,
+			filepath.FromSlash(`testdata/workspace/success/`+dirPath+`/proto/rpc.proto:5:8:import "request.proto": file does not exist`),
 			"build",
 			filepath.Join("testdata", "workspace", "success", dirPath, "proto"),
 		)
@@ -400,7 +392,7 @@ func TestWorkspaceDetached(t *testing.T) {
 			t,
 			nil,
 			bufctl.ExitCodeFileAnnotation,
-			detachedImportError,
+			filepath.FromSlash(`testdata/workspace/success/`+dirPath+`/proto/rpc.proto:5:8:import "request.proto": file does not exist`),
 			``,
 			"lint",
 			filepath.Join("testdata", "workspace", "success", dirPath, "proto"),

diff --git a/cmd/buf/workspace_unix_test.go b/cmd/buf/workspace_unix_test.go
@@ -17,7 +17,6 @@
 package main
 
 import (
-	"fmt"
 	"path/filepath"
 	"testing"
 
@@ -27,24 +26,24 @@ import (
 func TestWorkspaceSymlinkFail(t *testing.T) {
 	t.Parallel()
 	// The workspace includes a symlink that isn't buildable.
-	for _, dirPath := range []string{
-		"symlink",
-		"v2/symlink",
-	} {
-		symlinkImportError := fmt.Sprintf(
-			"%[1]s:5:1:imported file does not exist\n%[1]s:8:5:cannot find `c.C` in this scope",
-			filepath.FromSlash("testdata/workspace/fail/"+dirPath+"/b/b.proto"),
-		)
-		testRunStdoutStderrNoWarn(
-			t,
-			nil,
-			bufctl.ExitCodeFileAnnotation,
-			``,
-			symlinkImportError,
-			"build",
-			filepath.Join("testdata", "workspace", "fail", filepath.FromSlash(dirPath)),
-		)
-	}
+	testRunStdoutStderrNoWarn(
+		t,
+		nil,
+		bufctl.ExitCodeFileAnnotation,
+		``,
+		filepath.FromSlash(`testdata/workspace/fail/symlink/b/b.proto:5:8:import "c.proto": file does not exist`),
+		"build",
+		filepath.Join("testdata", "workspace", "fail", "symlink"),
+	)
+	testRunStdoutStderrNoWarn(
+		t,
+		nil,
+		bufctl.ExitCodeFileAnnotation,
+		``,
+		filepath.FromSlash(`testdata/workspace/fail/v2/symlink/b/b.proto:5:8:import "c.proto": file does not exist`),
+		"build",
+		filepath.Join("testdata", "workspace", "fail", "v2", "symlink"),
+	)
 }
 
 func TestWorkspaceSymlink(t *testing.T) {

diff --git a/go.mod b/go.mod
@@ -4,11 +4,10 @@ go 1.25.7
 
 require (
 	buf.build/gen/go/bufbuild/bufplugin/protocolbuffers/go v1.36.11-20250718181942-e35f9b667443.1
-	buf.build/gen/go/bufbuild/protodescriptor/protocolbuffers/go v1.36.11-20250109164928-1da0de137947.1
 	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260209202127-80ab13bee0bf.1
 	buf.build/gen/go/bufbuild/registry/connectrpc/go v1.19.1-20260126144947-819582968857.2
 	buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.11-20260126144947-819582968857.1
-	buf.build/go/app v0.2.1-0.20260407195847-833f8f978cda
+	buf.build/go/app v0.2.1-0.20260319180457-cfbf7e2b6a75
 	buf.build/go/bufplugin v0.9.0
 	buf.build/go/bufprivateusage v0.1.0
 	buf.build/go/protovalidate v1.1.3
@@ -18,7 +17,7 @@ require (
 	connectrpc.com/connect v1.19.1
 	connectrpc.com/grpcreflect v1.3.0
 	connectrpc.com/otelconnect v0.9.0
-	github.com/bufbuild/protocompile v0.14.2-0.20260410160725-0b5e706465a9
+	github.com/bufbuild/protocompile v0.14.2-0.20260409205102-f58612be4b0a
 	github.com/bufbuild/protoplugin v0.0.0-20250218205857-750e09ce93e1
 	github.com/cli/browser v1.3.0
 	github.com/gofrs/flock v0.13.0

diff --git a/go.sum b/go.sum
@@ -10,8 +10,8 @@ buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.11-20260126144947-81
 buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.36.11-20260126144947-819582968857.1/go.mod h1:1JJi9jvOqRxSMa+JxiZSm57doB+db/1WYCIa2lHfc40=
 buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.36.11-20241007202033-cf42259fcbfc.1 h1:iGPvEJltOXUMANWf0zajcRcbiOXLD90ZwPUFvbcuv6Q=
 buf.build/gen/go/pluginrpc/pluginrpc/protocolbuffers/go v1.36.11-20241007202033-cf42259fcbfc.1/go.mod h1:nWVKKRA29zdt4uvkjka3i/y4mkrswyWwiu0TbdX0zts=
-buf.build/go/app v0.2.1-0.20260407195847-833f8f978cda h1:eysSyjrJtkxU1A/9+Kv+1Mwq9K6BYBw+STIOVsZ256Y=
-buf.build/go/app v0.2.1-0.20260407195847-833f8f978cda/go.mod h1:V32mBaPWsfq6REAeZvvs/rQl7ZCl9Dn7eW1BBrmH0GQ=
+buf.build/go/app v0.2.1-0.20260319180457-cfbf7e2b6a75 h1:wb0B8XpzzfGIekqUXw4kUAvkroAiVmAg3uIpgo5S8sM=
+buf.build/go/app v0.2.1-0.20260319180457-cfbf7e2b6a75/go.mod h1:0XVOYemubVbxNXVY0DnsVgWeGkcbbAvjDa1fmhBC+Wo=
 buf.build/go/bufplugin v0.9.0 h1:ktZJNP3If7ldcWVqh46XKeiYJVPxHQxCfjzVQDzZ/lo=
 buf.build/go/bufplugin v0.9.0/go.mod h1:Z0CxA3sKQ6EPz/Os4kJJneeRO6CjPeidtP1ABh5jPPY=
 buf.build/go/bufprivateusage v0.1.0 h1:SzCoCcmzS3zyXHEXHeSQhGI7OTkgtljoknLzsUz9Gg4=
@@ -42,8 +42,8 @@ github.com/bmatcuk/doublestar/v4 v4.10.0 h1:zU9WiOla1YA122oLM6i4EXvGW62DvKZVxIe6
 github.com/bmatcuk/doublestar/v4 v4.10.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/brianvoe/gofakeit/v6 v6.28.0 h1:Xib46XXuQfmlLS2EXRuJpqcw8St6qSZz75OUo0tgAW4=
 github.com/brianvoe/gofakeit/v6 v6.28.0/go.mod h1:Xj58BMSnFqcn/fAQeSK+/PLtC5kSb7FJIq4JyGa8vEs=
-github.com/bufbuild/protocompile v0.14.2-0.20260410160725-0b5e706465a9 h1:7oOAVXCKsQ0LkyC5cr/EYKADCJIJLRnstt2bpo/ilOk=
-github.com/bufbuild/protocompile v0.14.2-0.20260410160725-0b5e706465a9/go.mod h1:DhgqsRznX/F0sGkUYtTQJRP+q8xMReQRQ3qr+n1opWU=
+github.com/bufbuild/protocompile v0.14.2-0.20260409205102-f58612be4b0a h1:mtZZcNBraTXNE1e/UG7Odlw8314ucNtRgnB2muW0/cs=
+github.com/bufbuild/protocompile v0.14.2-0.20260409205102-f58612be4b0a/go.mod h1:DhgqsRznX/F0sGkUYtTQJRP+q8xMReQRQ3qr+n1opWU=
 github.com/bufbuild/protoplugin v0.0.0-20250218205857-750e09ce93e1 h1:V1xulAoqLqVg44rY97xOR+mQpD2N+GzhMHVwJ030WEU=
 github.com/bufbuild/protoplugin v0.0.0-20250218205857-750e09ce93e1/go.mod h1:c5D8gWRIZ2HLWO3gXYTtUfw/hbJyD8xikv2ooPxnklQ=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=

diff --git a/private/buf/bufcli/protoc_plugin.go b/private/buf/bufcli/protoc_plugin.go
@@ -125,8 +125,6 @@ func NewAppextContainerForPluginEnv(
 	return appext.NewContainer(
 		nameContainer,
 		logger,
-		logLevel,
-		logFormat,
 	), nil
 }
 

diff --git a/private/buf/bufctl/controller.go b/private/buf/bufctl/controller.go
@@ -22,7 +22,6 @@ import (
 	"io/fs"
 	"log/slog"
 	"net/http"
-	"os"
 	"slices"
 	"sort"
 
@@ -54,7 +53,6 @@ import (
 	"github.com/bufbuild/buf/private/pkg/storage/storageos"
 	"github.com/bufbuild/buf/private/pkg/syserror"
 	"github.com/bufbuild/buf/private/pkg/wasm"
-	"golang.org/x/term"
 	"google.golang.org/protobuf/proto"
 )
 
@@ -215,11 +213,10 @@ type controller struct {
 	policyDataProvider bufpolicy.PolicyDataProvider
 	wktStore           bufwktstore.Store
 
-	disableSymlinks                            bool
-	fileAnnotationErrorFormat                  string
-	fileAnnotationsToStdout                    bool
-	colorizedFileAnnotationSetDiagnosticReport bool
-	copyToInMemory                             bool
+	disableSymlinks           bool
+	fileAnnotationErrorFormat string
+	fileAnnotationsToStdout   bool
+	copyToInMemory            bool
 
 	storageosProvider           storageos.Provider
 	buffetchRefParser           buffetch.RefParser
@@ -1368,26 +1365,15 @@ func (c *controller) handleFileAnnotationSetRetError(retErrAddr *error) {
 		return
 	}
 	var fileAnnotationSet bufanalysis.FileAnnotationSet
-	var printDiagnosticReport bool
 	if errors.As(*retErrAddr, &fileAnnotationSet) {
 		writer := c.container.Stderr()
 		if c.fileAnnotationsToStdout {
 			writer = c.container.Stdout()
-		} else {
-			// When writing to stderr, check if the input is TTY, if so, allow printing the
-			// diagnostic report.
-			//
-			// HACK: We need to check os.Stderr rather than writer, since c.container.Stderr()
-			// returns wrapped writer, which only implements io.Writer. A fix needs to be made
-			// upstream in order to address this.
-			printDiagnosticReport = term.IsTerminal(int(os.Stderr.Fd()))
 		}
 		if err := bufanalysis.PrintFileAnnotationSet(
 			writer,
 			fileAnnotationSet,
 			c.fileAnnotationErrorFormat,
-			bufanalysis.WithPrintDiagnosticReport(printDiagnosticReport),
-			bufanalysis.WithRenderColorizedDiagnosticReport(c.colorizedFileAnnotationSetDiagnosticReport),
 		); err != nil {
 			*retErrAddr = err
 			return