batches: drop ModelProviderRoutes from codingagent Agent contract

Sourcegraph now owns the wire-path/upstream-path mapping per agent type;
src-cli only needs to construct its base URL as
<modelProviderURL>/<agent-type> and let the agent CLI append its
protocol's wire path (codex CLI is hardcoded to POST <base>/responses
since wire_api=responses is now the only supported value, so the
explicit -c model_providers.sourcegraph.wire_api line is also dropped).

Author: taras-yemets

lib/batches/codex/codex.go

@@ -1,4 +1,4 @@
-// Package codex implements the codex coding agent run-command rewrite.
+// Package codex implements the codex coding agent.
 package codex
 
 import (
@@ -10,23 +10,16 @@ import (
 	"github.com/sourcegraph/sourcegraph/lib/batches/codingagent/types"
 )
 
-const model = "gpt-5.4"
-
-// pinnedVersion is the codex CLI release we test against. Bump in lockstep
-// with the model_providers.* config keys below; codex CLI is pre-v1.
-const pinnedVersion = "0.134.0"
-
-var routes = []types.ModelProviderRoute{
-	{WirePath: "/responses", UpstreamPath: "/v1/completions/openai-responses"},
-}
+const (
+	model         = "gpt-5.4"
+	pinnedVersion = "0.134.0"
+)
 
 type Agent struct{}
 
-func (Agent) Type() batcheslib.CodingAgentType                { return batcheslib.CodingAgentTypeCodex }
-func (Agent) ModelProviderRoutes() []types.ModelProviderRoute { return routes }
-func (Agent) ImageRequirements() []string                     { return []string{"curl", "tar"} }
+func (Agent) Type() batcheslib.CodingAgentType { return batcheslib.CodingAgentTypeCodex }
+func (Agent) ImageRequirements() []string      { return []string{"curl", "tar"} }
 
-// InstallScript installs codex at pinnedVersion into types.InstallDir.
 func (Agent) InstallScript() string {
 	return fmt.Sprintf(`_install_dir=%s
 _version=%s
@@ -69,7 +62,6 @@ func (Agent) RunCommand(prompt, modelProviderURL string) string {
 		"-c", fmt.Sprintf(`model_providers.sourcegraph.base_url=%q`, modelProviderURL),
 		"-c", fmt.Sprintf(`model_providers.sourcegraph.env_key=%q`, types.ModelProviderTokenEnvVar),
 		"-c", fmt.Sprintf(`model_providers.sourcegraph.env_http_headers={%q=%q}`, types.JobIDHeaderName, types.JobIDEnvVar),
-		"-c", `model_providers.sourcegraph.wire_api="responses"`,
 		prompt,
 	)
 }

lib/batches/codingagent/codingagent.go

@@ -1,5 +1,5 @@
-// Package codingagent rewrites v3 batch spec coding-agent steps into the
-// shell commands that drive them. Register new agents in the agents list.
+// Package codingagent rewrites v3 batch spec coding-agent steps into shell
+// commands. Register new agents in the agents list.
 package codingagent
 
 import (
@@ -16,13 +16,9 @@ import (
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 )
 
-// ErrUnknownType is returned when a codingAgent step references a type that
-// has no registered Agent.
 var ErrUnknownType = errors.New("unknown codingAgent type")
 
-// RenderRunCommand returns the shell-quoted command that runs agentStep. The
-// prompt is rendered before quoting; reversing would let templated values
-// break out of the shell quoting.
+// RenderRunCommand returns the shell command that runs agentStep.
 func RenderRunCommand(agentStep *batcheslib.CodingAgentStep, modelProviderURL string, stepCtx *template.StepContext) (string, error) {
 	a, ok := agents[agentStep.Type]
 	if !ok {
@@ -43,9 +39,6 @@ func RenderRunCommand(agentStep *batcheslib.CodingAgentStep, modelProviderURL st
 	return b.String(), nil
 }
 
-// failIfMissing returns a shell snippet that, when prepended to the step
-// script, writes a message to stderr and exits the container with status 1
-// if binary isn't on PATH.
 func failIfMissing(agentType batcheslib.CodingAgentType, binary string) string {
 	msg := fmt.Sprintf(
 		"codingAgent %q requires %q on PATH in the run container",
@@ -69,20 +62,3 @@ var agents = func() map[batcheslib.CodingAgentType]types.Agent {
 	}
 	return out
 }()
-
-// RegisteredModelProviderRoutes returns the model-provider proxy routes
-// contributed by every registered Agent, each WirePath prefixed with
-// its agent type.
-func RegisteredModelProviderRoutes() []types.ModelProviderRoute {
-	var out []types.ModelProviderRoute
-	for _, a := range agents {
-		prefix := "/" + string(a.Type())
-		for _, route := range a.ModelProviderRoutes() {
-			out = append(out, types.ModelProviderRoute{
-				WirePath:     prefix + route.WirePath,
-				UpstreamPath: route.UpstreamPath,
-			})
-		}
-	}
-	return out
-}

lib/batches/codingagent/types/types.go

@@ -1,48 +1,26 @@
-// Package types holds the contract shared between the codingagent registry
-// and individual coding-agent implementations, in a leaf package to avoid an
-// import cycle with the registry.
+// Package types holds the codingagent contract shared with individual
+// coding-agent implementations; split out to avoid an import cycle.
 package types
 
 import (
 	batcheslib "github.com/sourcegraph/sourcegraph/lib/batches"
 )
 
-const ModelProviderTokenEnvVar = "SRC_BATCHES_MODEL_PROVIDER_TOKEN"
-
-// JobIDEnvVar binds ModelProviderTokenEnvVar to its job; sent as JobIDHeaderName.
-const JobIDEnvVar = "SRC_BATCHES_JOB_ID"
-
-const JobIDHeaderName = "X-Sourcegraph-Job-ID"
-
-// InstallDir is where each Agent installs its pinned binary; invoked by
-// absolute path so we ignore any copy shipped by the image.
-const InstallDir = "/tmp/sg-codingagent/bin"
+const (
+	ModelProviderTokenEnvVar = "SRC_BATCHES_MODEL_PROVIDER_TOKEN"
+	JobIDEnvVar              = "SRC_BATCHES_JOB_ID"
+	JobIDHeaderName          = "X-Sourcegraph-Job-ID"
+	InstallDir               = "/tmp/sg-codingagent/bin"
+)
 
 type Agent interface {
 	Type() batcheslib.CodingAgentType
-	// RunCommand receives the already-templated prompt and MUST shell-quote it.
+	// RunCommand returns the shell command for the agent. The rendered
+	// prompt MUST be shell-quoted.
 	RunCommand(renderedPrompt, modelProviderURL string) string
-	// ModelProviderRoutes returns routes whose WirePath is relative to the
-	// agent type; the registry prefixes "/<agent-type>" before exposing them.
-	ModelProviderRoutes() []ModelProviderRoute
 	// ImageRequirements lists binaries that must be on PATH in the run
-	// container (e.g. "curl" so InstallScript can fetch the agent). The
-	// registry emits a `command -v` check for each before InstallScript.
+	// container before InstallScript runs.
 	ImageRequirements() []string
-	// InstallScript returns shell that installs the agent at a pinned
-	// version into a Sourcegraph-owned scratch dir and prepends it to PATH.
+	// InstallScript installs the agent at a pinned version into InstallDir.
 	InstallScript() string
 }
-
-// ModelProviderRoute is one wire→upstream mapping served by the Sourcegraph
-// model-provider proxy (mounted under /.executors/model-provider/batches).
-type ModelProviderRoute struct {
-	// WirePath is the proxy subpath the agent CLI POSTs to, relative to the
-	// agent type (e.g. "/responses"). The registry prefixes "/<agent-type>"
-	// before registering it on the router (e.g. "/codex/responses").
-	WirePath string
-	// UpstreamPath is the path on the Sourcegraph Model Provider upstream
-	// (e.g. Cody Gateway) that serves WirePath, such as
-	// "/v1/completions/openai-responses".
-	UpstreamPath string
-}