feat/batch-changes: polish error message and tests in codingAgent port

- Replace internal-type-leaking error message with user-facing wording
  in run_steps.go (codingAgent ModelProviderURL check).
- Align temp-file error wording in writeRunScriptFile with the rest of
  the file ('writing to temporary file').
- Trim redundant assertions in TestRedactSensitiveEnv and
  TestRedactSensitiveArgs.
- Tighten TestParseBatchSpec_v3_codingAgentRequiresImage to assert only
  the actual error path.
- Extract v3SpecWith helper to deduplicate YAML scaffold across
  batch_spec_test.go cases.

Author: taras-yemets

internal/batches/executor/run_steps.go

@@ -281,7 +281,7 @@ func executeSingleStep(
 	)
 	if step.CodingAgent != nil {
 		if opts.Task.ModelProviderURL == "" {
-			err = errors.New("codingAgent step requires WorkspacesExecutionInput.ModelProviderURL to be set")
+			err = errors.New("codingAgent step requires a model-provider URL")
 			opts.UI.StepPreparingFailed(stepIdx+1, err)
 			return bytes.Buffer{}, bytes.Buffer{}, err
 		}
@@ -670,7 +670,7 @@ func writeRunScriptFile(tempDir, script string) (string, func(), error) {
 
 	if _, err := runScriptFile.WriteString(script); err != nil {
 		cleanup()
-		return "", nil, errors.Wrap(err, "writing temporary file")
+		return "", nil, errors.Wrap(err, "writing to temporary file")
 	}
 	if err := runScriptFile.Close(); err != nil {
 		cleanup()

internal/batches/executor/run_steps_test.go

@@ -2,7 +2,6 @@ package executor
 
 import (
 	"slices"
-	"strings"
 	"testing"
 
 	codingagenttypes "github.com/sourcegraph/sourcegraph/lib/batches/codingagent/types"
@@ -11,16 +10,12 @@ import (
 func TestRedactSensitiveEnv(t *testing.T) {
 	in := map[string]string{
 		codingagenttypes.ModelProviderTokenEnvVar: "tok-abc",
-		codingagenttypes.JobIDEnvVar:              "job-123",
 		"PATH":                                    "/bin",
 	}
 	out := redactSensitiveEnv(in)
 	if got := out[codingagenttypes.ModelProviderTokenEnvVar]; got != redactedPlaceholder {
 		t.Errorf("token: got %q want %q", got, redactedPlaceholder)
 	}
-	if got := out[codingagenttypes.JobIDEnvVar]; got != "job-123" {
-		t.Errorf("job id should not be redacted: got %q", got)
-	}
 	if got := out["PATH"]; got != "/bin" {
 		t.Errorf("PATH should not be redacted: got %q", got)
 	}
@@ -47,9 +42,6 @@ func TestRedactSensitiveArgs(t *testing.T) {
 	if !slices.Contains(out, codingagenttypes.JobIDEnvVar+"=job-123") {
 		t.Errorf("job id should pass through: %v", out)
 	}
-	if strings.Contains(strings.Join(out, " "), "tok-abc") {
-		t.Errorf("token leaked anywhere in joined args: %v", out)
-	}
 }
 
 func TestForwardCodingAgentEnv(t *testing.T) {

lib/batches/batch_spec_test.go

@@ -2,10 +2,31 @@ package batches
 
 import (
 	"encoding/json"
+	"fmt"
 	"strings"
 	"testing"
 )
 
+// v3SpecWith wraps stepsYAML in the minimum scaffold needed for ParseBatchSpec
+// to accept a v3 spec.
+func v3SpecWith(stepsYAML string) []byte {
+	return []byte(fmt.Sprintf(`
+version: 3
+name: test
+description: test
+on:
+  - repository: github.com/sourcegraph/sourcegraph
+steps:
+%s
+changesetTemplate:
+  title: test
+  body: test
+  branch: test
+  commit:
+    message: test
+`, stepsYAML))
+}
+
 func TestStep_MarshalJSON_canonicalizesImageToContainer(t *testing.T) {
 	v3FromImage, err := json.Marshal(Step{Image: "alpine:3", Run: "echo hi"})
 	if err != nil {
@@ -31,23 +52,7 @@ func TestStep_MarshalJSON_canonicalizesImageToContainer(t *testing.T) {
 }
 
 func TestParseBatchSpec_v3_imageMirroredToContainer(t *testing.T) {
-	spec := []byte(`
-version: 3
-name: test
-description: test
-on:
-  - repository: github.com/sourcegraph/sourcegraph
-steps:
-  - run: echo hi
-    image: alpine:3
-changesetTemplate:
-  title: test
-  body: test
-  branch: test
-  commit:
-    message: test
-`)
-	got, err := ParseBatchSpec(spec)
+	got, err := ParseBatchSpec(v3SpecWith("  - run: echo hi\n    image: alpine:3"))
 	if err != nil {
 		t.Fatalf("ParseBatchSpec failed: %v", err)
 	}
@@ -63,53 +68,17 @@ changesetTemplate:
 }
 
 func TestParseBatchSpec_v3_codingAgentRequiresImage(t *testing.T) {
-	spec := []byte(`
-version: 3
-name: test
-description: test
-on:
-  - repository: github.com/sourcegraph/sourcegraph
-steps:
-  - codingAgent:
-      type: codex
-      prompt: do the thing
-changesetTemplate:
-  title: test
-  body: test
-  branch: test
-  commit:
-    message: test
-`)
-	_, err := ParseBatchSpec(spec)
+	_, err := ParseBatchSpec(v3SpecWith("  - codingAgent:\n      type: codex\n      prompt: do the thing"))
 	if err == nil {
 		t.Fatal("expected validation error, got nil")
 	}
-	if !strings.Contains(err.Error(), "requires an image") &&
-		!strings.Contains(err.Error(), "Must validate") {
+	if !strings.Contains(err.Error(), "requires an image") {
 		t.Errorf("error should mention missing image, got: %v", err)
 	}
 }
 
 func TestParseBatchSpec_v3_codingAgentStep(t *testing.T) {
-	spec := []byte(`
-version: 3
-name: test
-description: test
-on:
-  - repository: github.com/sourcegraph/sourcegraph
-steps:
-  - codingAgent:
-      type: codex
-      prompt: do the thing
-    image: alpine:3
-changesetTemplate:
-  title: test
-  body: test
-  branch: test
-  commit:
-    message: test
-`)
-	got, err := ParseBatchSpec(spec)
+	got, err := ParseBatchSpec(v3SpecWith("  - codingAgent:\n      type: codex\n      prompt: do the thing\n    image: alpine:3"))
 	if err != nil {
 		t.Fatalf("ParseBatchSpec failed: %v", err)
 	}