audanye-sudoandClaude Opus 4.6
7fda120d5a
Improve CLI error output and local logging to enable offline issue diagnosis: - Add ServerDiagnostics struct to extract and propagate trace_id, server_error_code, technical_detail, and server_retryable from MCP server responses - Extract diagnostics from JSON-RPC error.data, tool call result content, and HTTP response headers (X-Trace-Id, X-Request-Id, x-dingtalk-trace-id) - Redesign PrintHuman with three verbosity levels (Normal/Verbose/Debug): Normal shows trace ID + server code; Verbose adds technical detail; Debug adds internal diagnostics (RPC code, operation, reason) - Add PrintHumanAt for explicit verbosity control, PrintHuman defaults to Normal - Enhance local logging with request body (sanitized), response body (on error), retry attempts, and error classification events - Add TruncateBody, SanitizeArguments, RedactHeaders logging utilities with sensitive key detection via substring matching - Fix respRetryAfter called before nil guard in doWithRetry retry loop - Use GetBool instead of string comparison for flag resolution Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
105 lines
3.2 KiB
Go
105 lines
3.2 KiB
Go
// Copyright 2026 Alibaba Group
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package transport
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
|
|
apperrors "github.com/DingTalk-Real-AI/dingtalk-workspace-cli/internal/errors"
|
|
)
|
|
|
|
// serverDiagFields maps the various JSON field names the server may use
|
|
// for diagnostic information. Both snake_case and camelCase are supported.
|
|
type serverDiagFields struct {
|
|
TraceID string `json:"trace_id"`
|
|
TraceIDCamel string `json:"traceId"`
|
|
Code string `json:"code"`
|
|
ErrorCode string `json:"errorCode"`
|
|
TechnicalDetail string `json:"technical_detail"`
|
|
Retryable *bool `json:"retryable"`
|
|
}
|
|
|
|
// ExtractServerDiagnostics parses server diagnostic fields from a JSON
|
|
// payload (typically from RPCError.Data). Returns an empty struct if
|
|
// the payload is empty or unparseable.
|
|
func ExtractServerDiagnostics(data json.RawMessage) apperrors.ServerDiagnostics {
|
|
if len(data) == 0 {
|
|
return apperrors.ServerDiagnostics{}
|
|
}
|
|
var fields serverDiagFields
|
|
if json.Unmarshal(data, &fields) != nil {
|
|
return apperrors.ServerDiagnostics{}
|
|
}
|
|
return apperrors.ServerDiagnostics{
|
|
TraceID: coalesceStr(fields.TraceID, fields.TraceIDCamel),
|
|
ServerErrorCode: coalesceStr(fields.Code, fields.ErrorCode),
|
|
TechnicalDetail: fields.TechnicalDetail,
|
|
ServerRetryable: fields.Retryable,
|
|
}
|
|
}
|
|
|
|
// ExtractServerDiagnosticsFromMap parses server diagnostic fields from a
|
|
// map[string]any (typically from ToolCallResult.Content for business errors).
|
|
func ExtractServerDiagnosticsFromMap(content map[string]any) apperrors.ServerDiagnostics {
|
|
if len(content) == 0 {
|
|
return apperrors.ServerDiagnostics{}
|
|
}
|
|
diag := apperrors.ServerDiagnostics{
|
|
TraceID: stringFromMap(content, "trace_id", "traceId"),
|
|
ServerErrorCode: stringFromMap(content, "code", "errorCode"),
|
|
TechnicalDetail: stringFromMap(content, "technical_detail"),
|
|
}
|
|
if v, ok := content["retryable"].(bool); ok {
|
|
diag.ServerRetryable = &v
|
|
}
|
|
return diag
|
|
}
|
|
|
|
// ExtractTraceIDFromHeaders reads a trace ID from standard HTTP response
|
|
// headers. Returns empty string if none found.
|
|
func ExtractTraceIDFromHeaders(headers http.Header) string {
|
|
for _, key := range []string{
|
|
"X-Trace-Id",
|
|
"X-Request-Id",
|
|
"x-dingtalk-trace-id",
|
|
} {
|
|
if v := headers.Get(key); v != "" {
|
|
return v
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// coalesceStr returns the first non-empty string.
|
|
func coalesceStr(values ...string) string {
|
|
for _, v := range values {
|
|
if v != "" {
|
|
return v
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// stringFromMap returns the first non-empty string value found for any of
|
|
// the given keys in the map.
|
|
func stringFromMap(m map[string]any, keys ...string) string {
|
|
for _, key := range keys {
|
|
if v, ok := m[key].(string); ok && v != "" {
|
|
return v
|
|
}
|
|
}
|
|
return ""
|
|
}
|