fix(a2a): redact structured error metadata

agent/a2aagent/a2a_agent.go

@@ -33,6 +33,7 @@ import (
 	itrace "trpc.group/trpc-go/trpc-agent-go/internal/trace"
 	"trpc.group/trpc-go/trpc-agent-go/log"
 	"trpc.group/trpc-go/trpc-agent-go/model"
+	"trpc.group/trpc-go/trpc-agent-go/platform"
 	semconvtrace "trpc.group/trpc-go/trpc-agent-go/telemetry/semconv/trace"
 	"trpc.group/trpc-go/trpc-agent-go/tool"
 )
@@ -155,6 +156,7 @@ func (r *A2AAgent) sendErrorEvent(
 	err error,
 ) *model.ResponseError {
 	respErr := model.ResponseErrorFromError(err, model.ErrorTypeRunError)
+	redactAgentResponseError(respErr)
 	agent.EmitEvent(ctx, invocation, eventChan, event.New(
 		invocation.InvocationID,
 		r.name,
@@ -166,6 +168,17 @@ func (r *A2AAgent) sendErrorEvent(
 	return respErr
 }
 
+func redactAgentResponseError(respErr *model.ResponseError) {
+	if respErr == nil {
+		return
+	}
+	redactor, err := platform.NewRedactor()
+	if err != nil {
+		return
+	}
+	respErr.Message = redactor.Redact(respErr.Message)
+}
+
 // validateA2ARequestOptions validates that all A2A request options are of the correct type
 func (r *A2AAgent) validateA2ARequestOptions(invocation *agent.Invocation) error {
 	if invocation.RunOptions.A2ARequestOptions == nil {

agent/a2aagent/a2a_agent_test.go

@@ -2914,6 +2914,33 @@ func TestA2AAgent_sendErrorEvent_UsesRunErrorType(t *testing.T) {
 	require.Equal(t, evt.Response.Error, respErr)
 }
 
+func TestA2AAgent_sendErrorEvent_RedactsSensitiveMessage(t *testing.T) {
+	a := &A2AAgent{name: "remote-agent"}
+	eventCh := make(chan *event.Event, 1)
+	invocation := &agent.Invocation{InvocationID: "inv-test"}
+
+	respErr := a.sendErrorEvent(
+		context.Background(),
+		eventCh,
+		invocation,
+		fmt.Errorf("request failed Authorization: Bearer raw-token\napi_key=sk-1234567890abcdef\nCookie: session=abc; sid=def"),
+	)
+
+	require.NotNil(t, respErr)
+	require.Equal(t, model.ErrorTypeRunError, respErr.Type)
+	for _, secret := range []string{"raw-token", "sk-1234567890abcdef", "session=abc", "sid=def"} {
+		require.NotContains(t, respErr.Message, secret)
+	}
+	for _, redacted := range []string{"Authorization: ****", "api_key=****", "Cookie: ****"} {
+		require.Contains(t, respErr.Message, redacted)
+	}
+
+	evt := <-eventCh
+	require.NotNil(t, evt)
+	require.NotNil(t, evt.Response)
+	require.Equal(t, respErr, evt.Response.Error)
+}
+
 func TestA2AAgent_aggregateEventContent_IgnoresErrorResponses(t *testing.T) {
 	a := &A2AAgent{name: "remote-agent"}
 	builder := &strings.Builder{}

agent/claudecode/claude_agent.go

@@ -21,6 +21,7 @@ import (
 	"trpc.group/trpc-go/trpc-agent-go/event"
 	"trpc.group/trpc-go/trpc-agent-go/log"
 	"trpc.group/trpc-go/trpc-agent-go/model"
+	"trpc.group/trpc-go/trpc-agent-go/platform"
 	"trpc.group/trpc-go/trpc-agent-go/session"
 	"trpc.group/trpc-go/trpc-agent-go/tool"
 )
@@ -115,6 +116,7 @@ func (a *claudeCodeAgent) runInvocation(ctx context.Context, invocation *agent.I
 		if len(combined) == 0 {
 			msg = runErr.Error()
 		}
+		msg = redactAgentErrorMessage(msg)
 		rsp := &model.Response{
 			Object: model.ObjectTypeError,
 			Done:   true,
@@ -187,11 +189,52 @@ func (a *claudeCodeAgent) handleRawOutputHook(
 		CLISessionID: cliSessionID,
 		Prompt:       invocation.Message.Content,
 		Stdout:       stdout,
-		Stderr:       stderr,
+		Stderr:       sanitizeRawOutputHookStderr(stderr),
 		Error:        runErr,
 	})
 }
 
+func sanitizeRawOutputHookStderr(stderr []byte) []byte {
+	lines := bytes.SplitAfter(stderr, []byte("\n"))
+	filtered := make([]byte, 0, len(stderr))
+	for _, line := range lines {
+		sensitiveAt := sensitiveCLIOutputIndex(line)
+		if sensitiveAt == 0 {
+			continue
+		}
+		if sensitiveAt > 0 {
+			line = bytes.TrimRight(line[:sensitiveAt], " \t\r\n")
+			if len(line) == 0 {
+				continue
+			}
+			line = append(line, '\n')
+		}
+		filtered = append(filtered, line...)
+	}
+	return filtered
+}
+
+func sensitiveCLIOutputIndex(line []byte) int {
+	lower := bytes.ToLower(line)
+	sensitiveMarkers := [][]byte{
+		[]byte("authorization:"),
+		[]byte("authorization="),
+		[]byte("api_key"),
+		[]byte("apikey"),
+		[]byte("api-key"),
+		[]byte("cookie:"),
+		[]byte("cookie="),
+	}
+	first := -1
+	for _, marker := range sensitiveMarkers {
+		idx := bytes.Index(lower, marker)
+		if idx >= 0 && (first < 0 || idx < first) {
+			first = idx
+		}
+	}
+	return first
+}
+
 // emitFlowError emits an error response event and stops further invocation processing.
 func (a *claudeCodeAgent) emitFlowError(
 	ctx context.Context,
@@ -200,6 +243,8 @@ func (a *claudeCodeAgent) emitFlowError(
 	combined []byte,
 	flowErr error,
 ) {
+	content := redactAgentErrorMessage(string(combined))
+	message := redactAgentErrorMessage(flowErr.Error())
 	rsp := &model.Response{
 		Object: model.ObjectTypeError,
 		Done:   true,
@@ -208,18 +253,26 @@ func (a *claudeCodeAgent) emitFlowError(
 				Index: 0,
 				Message: model.Message{
 					Role:    model.RoleAssistant,
-					Content: string(combined),
+					Content: content,
 				},
 			},
 		},
 		Error: &model.ResponseError{
 			Type:    model.ErrorTypeFlowError,
-			Message: flowErr.Error(),
+			Message: message,
 		},
 	}
 	a.emitEvent(ctx, invocation, out, event.NewResponseEvent(invocation.InvocationID, a.name, rsp))
 }
 
+func redactAgentErrorMessage(message string) string {
+	redactor, err := platform.NewRedactor()
+	if err != nil {
+		return message
+	}
+	return redactor.Redact(message)
+}
+
 // runWithSession executes the CLI with resume-first semantics and returns stdout/stderr.
 func (a *claudeCodeAgent) runWithSession(ctx context.Context, sessionID, prompt string) ([]byte, []byte, error) {
 	// Copy base args to avoid mutating shared backing arrays across concurrent invocations.

agent/claudecode/claude_agent_test.go

@@ -198,7 +198,7 @@ func TestClaudeCodeAgent_Run_CommandError(t *testing.T) {
 
 	runner := &scriptedRunner{
 		run: func(cmd command) ([]byte, []byte, error) {
-			return nil, []byte("boom\n"), errors.New("exit 2")
+			return nil, []byte("boom Authorization: Bearer raw-token\napi_key=sk-1234567890abcdef\nCookie: session=abc; sid=def"), errors.New("exit 2")
 		},
 	}
 
@@ -214,8 +214,10 @@ func TestClaudeCodeAgent_Run_CommandError(t *testing.T) {
 	require.Len(t, events, 1)
 	require.True(t, events[0].IsFinalResponse())
 	require.NotNil(t, events[0].Error)
-	require.Equal(t, "boom", events[0].Error.Message)
-	require.Equal(t, "boom", events[0].Choices[0].Message.Content)
+	require.Contains(t, events[0].Error.Message, "boom")
+	require.Contains(t, events[0].Choices[0].Message.Content, "boom")
+	assertRedactedAgentErrorMessage(t, events[0].Error.Message)
+	assertRedactedAgentErrorMessage(t, events[0].Choices[0].Message.Content)
 }
 
 func TestClaudeCodeAgent_Run_RawOutputHook(t *testing.T) {
@@ -233,7 +235,7 @@ func TestClaudeCodeAgent_Run_RawOutputHook(t *testing.T) {
 	transcript := `[{"type":"result","result":"hello"}]`
 	runner := &scriptedRunner{
 		run: func(cmd command) ([]byte, []byte, error) {
-			return []byte(transcript), []byte("warn\n"), nil
+			return []byte(transcript), []byte("warn Authorization: Bearer raw-token\napi_key=sk-1234567890abcdef\nX-Api-Key: header-secret\nCookie: session=abc; sid=def"), nil
 		},
 	}
 
@@ -262,7 +264,7 @@ func TestClaudeCodeAgent_Run_RawOutputHook(t *testing.T) {
 	require.Equal(t, cliSessionID(sess), got.CLISessionID)
 	require.Equal(t, "Hi.", got.Prompt)
 	require.Equal(t, transcript, string(got.Stdout))
-	require.Equal(t, "warn\n", string(got.Stderr))
+	require.Equal(t, "warn\nX-\n", string(got.Stderr))
 	require.NoError(t, got.Error)
 }
 
@@ -285,7 +287,7 @@ func TestClaudeCodeAgent_Run_RawOutputHookError(t *testing.T) {
 		},
 	}
 
-	hookErr := errors.New("hook failed")
+	hookErr := errors.New("hook failed Authorization: Bearer raw-token\napi_key=sk-1234567890abcdef\nCookie: session=abc; sid=def")
 	var called bool
 	ag, err := New(
 		WithBin("claude"),
@@ -309,8 +311,22 @@ func TestClaudeCodeAgent_Run_RawOutputHookError(t *testing.T) {
 	require.Equal(t, model.ErrorTypeFlowError, events[0].Error.Type)
 	require.Contains(t, events[0].Error.Message, "raw output hook")
 	require.Contains(t, events[0].Error.Message, "hook failed")
+	assertRedactedAgentErrorMessage(t, events[0].Error.Message)
 	require.Contains(t, events[0].Choices[0].Message.Content, transcript)
 	require.Contains(t, events[0].Choices[0].Message.Content, "warn")
+	for _, secret := range []string{"raw-token", "sk-1234567890abcdef", "session=abc", "sid=def"} {
+		require.NotContains(t, events[0].Choices[0].Message.Content, secret)
+	}
+}
+
+func assertRedactedAgentErrorMessage(t *testing.T, message string) {
+	t.Helper()
+	for _, secret := range []string{"raw-token", "sk-1234567890abcdef", "session=abc", "sid=def"} {
+		require.NotContains(t, message, secret)
+	}
+	for _, redacted := range []string{"Authorization: ****", "api_key=****", "Cookie: ****"} {
+		require.Contains(t, message, redacted)
+	}
 }
 
 func TestClaudeCodeAgent_InfoAndRunnerArgs(t *testing.T) {

agent/codex/codex_agent.go

@@ -20,6 +20,7 @@ import (
 	"trpc.group/trpc-go/trpc-agent-go/event"
 	"trpc.group/trpc-go/trpc-agent-go/log"
 	"trpc.group/trpc-go/trpc-agent-go/model"
+	"trpc.group/trpc-go/trpc-agent-go/platform"
 	"trpc.group/trpc-go/trpc-agent-go/session"
 	"trpc.group/trpc-go/trpc-agent-go/tool"
 )
@@ -189,6 +190,7 @@ func (a *codexAgent) emitRunError(ctx context.Context, invocation *agent.Invocat
 	if len(combined) == 0 {
 		msg = runErr.Error()
 	}
+	msg = redactAgentErrorMessage(msg)
 	rsp := &model.Response{
 		Object: model.ObjectTypeError,
 		Done:   true,
@@ -211,6 +213,8 @@ func (a *codexAgent) emitRunError(ctx context.Context, invocation *agent.Invocat
 
 // emitFlowError emits an error response event and stops further invocation processing.
 func (a *codexAgent) emitFlowError(ctx context.Context, invocation *agent.Invocation, out chan<- *event.Event, combined []byte, flowErr error) {
+	content := redactAgentErrorMessage(string(combined))
+	message := redactAgentErrorMessage(flowErr.Error())
 	rsp := &model.Response{
 		Object: model.ObjectTypeError,
 		Done:   true,
@@ -219,18 +223,26 @@ func (a *codexAgent) emitFlowError(ctx context.Context, invocation *agent.Invoca
 				Index: 0,
 				Message: model.Message{
 					Role:    model.RoleAssistant,
-					Content: string(combined),
+					Content: content,
 				},
 			},
 		},
 		Error: &model.ResponseError{
 			Type:    model.ErrorTypeFlowError,
-			Message: flowErr.Error(),
+			Message: message,
 		},
 	}
 	a.emitEvent(ctx, invocation, out, event.NewResponseEvent(invocation.InvocationID, a.name, rsp))
 }
 
+func redactAgentErrorMessage(message string) string {
+	redactor, err := platform.NewRedactor()
+	if err != nil {
+		return message
+	}
+	return redactor.Redact(message)
+}
+
 // runWithSession executes the CLI with resume-first semantics and returns stdout/stderr.
 func (a *codexAgent) runWithSession(ctx context.Context, threadID, prompt string) ([]byte, []byte, error) {
 	if strings.TrimSpace(threadID) != "" {

agent/codex/codex_agent_test.go

@@ -185,7 +185,7 @@ func TestCodexAgent_Run_ResumeAndCreateErrorsReturnRunError(t *testing.T) {
 			if len(cmd.args) > 1 && cmd.args[1] == "resume" {
 				return nil, []byte("resume unavailable"), errors.New("resume exit 1")
 			}
-			return nil, []byte("create unavailable"), errors.New("create exit 1")
+			return nil, []byte("create failed Authorization: Bearer raw-token\napi_key=sk-1234567890abcdef\nCookie: session=abc; sid=def"), errors.New("create exit 1")
 		},
 	}
 	ag, err := New(withCommandRunner(runner))
@@ -196,7 +196,10 @@ func TestCodexAgent_Run_ResumeAndCreateErrorsReturnRunError(t *testing.T) {
 	require.Len(t, events, 1)
 	require.NotNil(t, events[0].Error)
 	require.Equal(t, model.ErrorTypeRunError, events[0].Error.Type)
-	require.Equal(t, "create unavailable", events[0].Error.Message)
+	require.Contains(t, events[0].Error.Message, "create failed")
+	require.Contains(t, events[0].Choices[0].Message.Content, "create failed")
+	assertRedactedAgentErrorMessage(t, events[0].Error.Message)
+	assertRedactedAgentErrorMessage(t, events[0].Choices[0].Message.Content)
 	calls := runner.Calls()
 	require.Len(t, calls, 2)
 	require.Equal(t, []string{"exec", "resume", "--json", "thread-1"}, calls[0].args)
@@ -250,7 +253,7 @@ func TestCodexAgent_Run_RawOutputHookReceivesCommandError(t *testing.T) {
 	runErr := errors.New("exit 1")
 	runner := &scriptedRunner{
 		run: func(cmd command) ([]byte, []byte, error) {
-			return []byte("stdout text"), []byte("stderr text"), runErr
+			return []byte("stdout text"), []byte("stderr Authorization: Bearer raw-token\napi_key=sk-1234567890abcdef\nCookie: session=abc; sid=def"), runErr
 		},
 	}
 	var got RawOutputHookArgs
@@ -269,11 +272,15 @@ func TestCodexAgent_Run_RawOutputHookReceivesCommandError(t *testing.T) {
 	require.ErrorIs(t, got.Error, runErr)
 	require.Equal(t, "--help", got.Prompt)
 	require.Equal(t, "stdout text", string(got.Stdout))
-	require.Equal(t, "stderr text", string(got.Stderr))
+	require.Equal(t, "stderr Authorization: Bearer raw-token\napi_key=sk-1234567890abcdef\nCookie: session=abc; sid=def", string(got.Stderr))
 	require.NotNil(t, events[0].Error)
 	require.Equal(t, model.ErrorTypeRunError, events[0].Error.Type)
-	require.Equal(t, "stdout text\nstderr text", events[0].Error.Message)
-	require.Equal(t, "stdout text\nstderr text", events[0].Choices[0].Message.Content)
+	require.Contains(t, events[0].Error.Message, "stdout text")
+	require.Contains(t, events[0].Error.Message, "stderr")
+	require.Contains(t, events[0].Choices[0].Message.Content, "stdout text")
+	require.Contains(t, events[0].Choices[0].Message.Content, "stderr")
+	assertRedactedAgentErrorMessage(t, events[0].Error.Message)
+	assertRedactedAgentErrorMessage(t, events[0].Choices[0].Message.Content)
 	calls := runner.Calls()
 	require.Len(t, calls, 1)
 	require.Equal(t, []string{"exec", "--json"}, calls[0].args)
@@ -284,10 +291,10 @@ func TestCodexAgent_Run_RawOutputHookError(t *testing.T) {
 	ctx := context.Background()
 	sess := session.NewSession("app", "user", "sess-hook-2")
 	inv := newTestInvocation("inv-hook-2", sess, "Hi.")
-	hookErr := errors.New("hook failed")
+	hookErr := errors.New("hook failed Authorization: Bearer raw-token\napi_key=sk-1234567890abcdef\nCookie: session=abc; sid=def")
 	runner := &scriptedRunner{
 		run: func(cmd command) ([]byte, []byte, error) {
-			return []byte(codexTranscript("thread-hook-2", "hello")), []byte("warn\n"), nil
+			return []byte(codexTranscript("thread-hook-2", "hello")), []byte("warn\napi_key=sk-1234567890abcdef\nCookie: session=abc; sid=def"), nil
 		},
 	}
 	ag, err := New(
@@ -307,8 +314,24 @@ func TestCodexAgent_Run_RawOutputHookError(t *testing.T) {
 	require.Equal(t, model.ErrorTypeFlowError, events[0].Error.Type)
 	require.Contains(t, events[0].Error.Message, "raw output hook")
 	require.Contains(t, events[0].Error.Message, "hook failed")
+	assertRedactedAgentErrorMessage(t, events[0].Error.Message)
 	require.Contains(t, events[0].Choices[0].Message.Content, "thread-hook-2")
 	require.Contains(t, events[0].Choices[0].Message.Content, "warn")
+	require.NotContains(t, events[0].Choices[0].Message.Content, "sk-1234567890abcdef")
+	require.NotContains(t, events[0].Choices[0].Message.Content, "session=abc")
+	require.NotContains(t, events[0].Choices[0].Message.Content, "sid=def")
+	require.Contains(t, events[0].Choices[0].Message.Content, "api_key=****")
+	require.Contains(t, events[0].Choices[0].Message.Content, "Cookie: ****")
+}
+
+func assertRedactedAgentErrorMessage(t *testing.T, message string) {
+	t.Helper()
+	for _, secret := range []string{"raw-token", "sk-1234567890abcdef", "session=abc", "sid=def"} {
+		require.NotContains(t, message, secret)
+	}
+	for _, redacted := range []string{"Authorization: ****", "api_key=****", "Cookie: ****"} {
+		require.Contains(t, message, redacted)
+	}
 }
 
 func TestCodexAgent_InfoAndRunnerArgs(t *testing.T) {