nullkey
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
89 lines
2.6 KiB
Go
89 lines
2.6 KiB
Go
package cmdutil_test
|
|
|
|
import (
|
|
"bytes"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/cmdutil"
|
|
"github.com/Tencent/WeKnora/cli/internal/output"
|
|
)
|
|
|
|
func TestEmit_WrapsInEnvelope(t *testing.T) {
|
|
var buf bytes.Buffer
|
|
fopts := &cmdutil.FormatOptions{Mode: cmdutil.FormatJSON}
|
|
data := []map[string]string{{"id": "kb_x"}, {"id": "kb_y"}}
|
|
if err := fopts.Emit(&buf, data, nil); err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
got := buf.String()
|
|
if !strings.Contains(got, `"ok":true`) {
|
|
t.Errorf("expected envelope ok:true; got %q", got)
|
|
}
|
|
if !strings.Contains(got, `"data":[`) {
|
|
t.Errorf("expected data array; got %q", got)
|
|
}
|
|
}
|
|
|
|
func TestEmit_WithMeta(t *testing.T) {
|
|
var buf bytes.Buffer
|
|
fopts := &cmdutil.FormatOptions{Mode: cmdutil.FormatJSON}
|
|
meta := &output.Meta{Count: 2, HasMore: true}
|
|
if err := fopts.Emit(&buf, []string{"a", "b"}, meta); err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
got := buf.String()
|
|
if !strings.Contains(got, `"count":2`) {
|
|
t.Errorf("expected meta.count; got %q", got)
|
|
}
|
|
if !strings.Contains(got, `"has_more":true`) {
|
|
t.Errorf("expected meta.has_more; got %q", got)
|
|
}
|
|
}
|
|
|
|
func TestEmit_NDJSON_NoEnvelope(t *testing.T) {
|
|
// NDJSON path is event-passthrough; no envelope wrapping per spec §5.
|
|
var buf bytes.Buffer
|
|
fopts := &cmdutil.FormatOptions{Mode: cmdutil.FormatNDJSON}
|
|
data := []map[string]string{{"id": "a"}, {"id": "b"}}
|
|
if err := fopts.Emit(&buf, data, nil); err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
got := buf.String()
|
|
if strings.Contains(got, `"ok":true`) {
|
|
t.Errorf("NDJSON path should not wrap in envelope; got %q", got)
|
|
}
|
|
// Expect 2 lines, one per item
|
|
lines := strings.Split(strings.TrimRight(got, "\n"), "\n")
|
|
if len(lines) != 2 {
|
|
t.Errorf("expected 2 NDJSON lines; got %d: %q", len(lines), got)
|
|
}
|
|
}
|
|
|
|
func TestEmit_TTYIndents(t *testing.T) {
|
|
var buf bytes.Buffer
|
|
fopts := &cmdutil.FormatOptions{Mode: cmdutil.FormatJSON, TTY: true}
|
|
if err := fopts.Emit(&buf, map[string]string{"id": "x"}, nil); err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
got := buf.String()
|
|
if !strings.Contains(got, "\n \"") {
|
|
t.Errorf("expected indented multi-line output (TTY=true); got %q", got)
|
|
}
|
|
}
|
|
|
|
func TestEmit_PopulatesProfile(t *testing.T) {
|
|
cmdutil.SetProfile("staging")
|
|
t.Cleanup(func() { cmdutil.SetProfile("") })
|
|
|
|
var buf bytes.Buffer
|
|
fopts := &cmdutil.FormatOptions{Mode: cmdutil.FormatJSON}
|
|
if err := fopts.Emit(&buf, map[string]string{"id": "x"}, nil); err != nil {
|
|
t.Fatalf("unexpected error: %v", err)
|
|
}
|
|
got := buf.String()
|
|
if !strings.Contains(got, `"profile":"staging"`) {
|
|
t.Errorf("expected profile:staging in envelope; got %q", got)
|
|
}
|
|
}
|