ad150c7126
Sweep every CLI output path through the v0.7 envelope contract.
FormatOptions.Emit signature changes to (w, data, meta *output.Meta)
so list commands surface meta.count / has_more in the wire envelope.
TTY indent decision plumbed via FormatOptions.TTY (set by
ResolveDefault). --format and --jq promoted to persistent root flags
so unknown-subcommand paths still reach the typed-envelope guard
(per-command registration would have rejected --format on unknown
commands as cobra-prose exit 2). WEKNORA_FORMAT env-var fallback
honored before TTY-resolved default. AddFormatFlag retained for the
per-command --jq field-hint Long-text addendum.
~55 production Emit call sites swept across cli/cmd/**: list paths
populate meta.count; mutation paths pass nil meta; envelope.profile
threaded via globalProfile. Existing JSON-shape tests migrated to
decode the envelope wrapper.
Multi-target batch operations get a unified shape via new helpers:
- output.BatchItem + output.WriteBatchEnvelope (§4.5 per-item ok
pattern; data:[{id, ok, result?|error?}], meta:{count, successes*,
failures*}; Successes/Failures *int so explicit zero survives
omitempty in all-fail case).
- cmdutil.RunBatch + cmdutil.EmitBatch + cmdutil.DeletedAtNow +
cmdutil.ClassifyContextErr collapse the three previously-duplicated
multi-delete pipelines (doc / chunk / session) into one call site
pattern. doc upload --recursive uses the same helpers with a per-
file resultFn. Summary error sets Silent:true so the stderr
envelope path doesn't duplicate the stdout batch detail (exit 1
preserved via Code → ExitCode).
ConfirmDestructive / ConfirmDestructiveBatch extended with action +
retryCmd parameters. Every destructive command (kb delete, kb edit,
doc delete, doc delete --all, agent delete, agent edit, session
delete, chunk delete, auth logout, api -X DELETE) now attaches
error.risk.{level:"destructive", action:"<noun.verb>"} +
error.retry_command on the exit-10 envelope. kb edit / agent edit
also gain the destructive guard wiring (CHANGELOG listed them as
gated but they were silently executing without -y).
MCP tool handlers' 31 error paths return CallToolResult with
IsError + Content text fallback + StructuredContent (envelope.error
shape via cmdutil.ErrorToDetail). Handler Out type changed from
typed *sdk.X to any so the go-sdk auto-marshal doesn't overwrite
StructuredContent with a zero-struct on error returns. Success path
manually populates CallToolResult.StructuredContent via successResult
helper.
weknora api cleanup:
- -d/--data flag removed; body via --input <file> or --input -
(stdin) only. Aligns with gh / curl convention.
- HTTP method whitelist removed; any non-empty method accepted.
- HTTP Retry-After header → cmdutil.Error.RetryAfterSeconds →
envelope.error.retry_after_seconds.
- runAPIPaginated raw-passthrough fallback now wraps response in
envelope so --paginate never emits bare JSON to stdout.
Test sweep: ~60 cmd/** tests migrated to decode envelope shape.
9 wire-contract goldens updated under cli/acceptance/testdata/wire/.
Spec: docs/superpowers/specs/2026-05-20-weknora-cli-v0.7-design.md §4 / §5
105 lines
3.6 KiB
Go
105 lines
3.6 KiB
Go
package mcp
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
|
|
mcpsdk "github.com/modelcontextprotocol/go-sdk/mcp"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/cmdutil"
|
|
"github.com/Tencent/WeKnora/cli/internal/output"
|
|
sdk "github.com/Tencent/WeKnora/client"
|
|
)
|
|
|
|
// TestToolErrorResult_TypedError_PopulatesStructuredContent verifies the
|
|
// helper maps a typed cmdutil.Error to MCP StructuredContent as *output.ErrDetail.
|
|
func TestToolErrorResult_TypedError_PopulatesStructuredContent(t *testing.T) {
|
|
err := cmdutil.NewError(cmdutil.CodeAuthUnauthenticated, "no creds")
|
|
res := toolErrorResult(err)
|
|
if !res.IsError {
|
|
t.Errorf("expected IsError true")
|
|
}
|
|
if res.StructuredContent == nil {
|
|
t.Fatal("expected StructuredContent populated")
|
|
}
|
|
sc, ok := res.StructuredContent.(*output.ErrDetail)
|
|
if !ok {
|
|
t.Fatalf("StructuredContent has unexpected type %T", res.StructuredContent)
|
|
}
|
|
if sc.Type != "auth.unauthenticated" {
|
|
t.Errorf("type: got %v want auth.unauthenticated", sc.Type)
|
|
}
|
|
// retry_command should fall back to "weknora auth login" via cmdutil default
|
|
if sc.RetryCommand != "weknora auth login" {
|
|
t.Errorf("retry_command: got %v", sc.RetryCommand)
|
|
}
|
|
}
|
|
|
|
// TestToolErrorResult_TextFallback verifies the human-readable Content[0]
|
|
// contains code + message + (hint? + retry?) lines.
|
|
func TestToolErrorResult_TextFallback(t *testing.T) {
|
|
err := cmdutil.NewError(cmdutil.CodeKBIDRequired, "kb_id is required")
|
|
res := toolErrorResult(err)
|
|
if len(res.Content) == 0 {
|
|
t.Fatal("expected Content[0]")
|
|
}
|
|
// Assertion is best-effort on the text shape; exact prose may vary
|
|
// with hint/retry defaults. Lock the type code prefix.
|
|
text := contentText(t, res.Content[0])
|
|
if !strings.Contains(text, "local.kb_id_required: kb_id is required") {
|
|
t.Errorf("text fallback missing code:message; got %q", text)
|
|
}
|
|
}
|
|
|
|
// contentText extracts the Text field from an mcpsdk.Content value.
|
|
// Lives in the test file to avoid leaking helpers into production.
|
|
func contentText(t *testing.T, c any) string {
|
|
t.Helper()
|
|
// Direct assertion to the concrete type used by toolErrorResult.
|
|
if tc, ok := c.(*mcpsdk.TextContent); ok {
|
|
return tc.Text
|
|
}
|
|
// Fallback: some go-sdk versions may expose a GetText() method.
|
|
if tc, ok := c.(interface{ GetText() string }); ok {
|
|
return tc.GetText()
|
|
}
|
|
t.Fatalf("cannot extract text from Content of type %T", c)
|
|
return ""
|
|
}
|
|
|
|
// TestToolErrorResult_IsErrorFlagSet verifies IsError is always true.
|
|
func TestToolErrorResult_IsErrorFlagSet(t *testing.T) {
|
|
res := toolErrorResult(cmdutil.NewError(cmdutil.CodeInputMissingFlag, "doc_id is required"))
|
|
if !res.IsError {
|
|
t.Error("expected IsError=true")
|
|
}
|
|
}
|
|
|
|
// TestToolErrorResult_ContentPresent verifies Content slice is non-empty.
|
|
func TestToolErrorResult_ContentPresent(t *testing.T) {
|
|
res := toolErrorResult(cmdutil.NewError(cmdutil.CodeInputInvalidArgument, "page_size must be in 1..1000"))
|
|
if len(res.Content) == 0 {
|
|
t.Error("expected at least one Content item")
|
|
}
|
|
}
|
|
|
|
// TestToolErrorResult_NetworkError verifies a network error code round-trips
|
|
// through toolErrorResult with the correct type in StructuredContent.
|
|
func TestToolErrorResult_NetworkError(t *testing.T) {
|
|
err := cmdutil.NewError(cmdutil.CodeNetworkError, "dial failed")
|
|
res := toolErrorResult(err)
|
|
if !res.IsError {
|
|
t.Error("expected IsError=true")
|
|
}
|
|
sc, ok := res.StructuredContent.(*output.ErrDetail)
|
|
if !ok {
|
|
t.Fatalf("StructuredContent has unexpected type %T", res.StructuredContent)
|
|
}
|
|
if sc.Type != "network.error" {
|
|
t.Errorf("type: got %v want network.error", sc.Type)
|
|
}
|
|
}
|
|
|
|
// Suppress unused-import warning if sdk isn't used in this file.
|
|
var _ = sdk.KnowledgeBase{}
|