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
112 lines
4.2 KiB
Go
112 lines
4.2 KiB
Go
package auth
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/cmdutil"
|
|
"github.com/Tencent/WeKnora/cli/internal/config"
|
|
"github.com/Tencent/WeKnora/cli/internal/iostreams"
|
|
"github.com/Tencent/WeKnora/cli/internal/prompt"
|
|
"github.com/Tencent/WeKnora/cli/internal/testutil"
|
|
sdk "github.com/Tencent/WeKnora/client"
|
|
)
|
|
|
|
type fakeStatusService struct {
|
|
resp *sdk.CurrentUserResponse
|
|
err error
|
|
}
|
|
|
|
func (f *fakeStatusService) GetCurrentUser(_ context.Context) (*sdk.CurrentUserResponse, error) {
|
|
return f.resp, f.err
|
|
}
|
|
|
|
func newCurrentUserResponse(user *sdk.AuthUser, tenant *sdk.AuthTenant) *sdk.CurrentUserResponse {
|
|
r := &sdk.CurrentUserResponse{Success: true}
|
|
r.Data.User = user
|
|
r.Data.Tenant = tenant
|
|
return r
|
|
}
|
|
|
|
func TestRunStatus_HumanOutput(t *testing.T) {
|
|
out, _ := iostreams.SetForTest(t)
|
|
testutil.XDGTempDir(t)
|
|
require.NoError(t, config.Save(&config.Config{
|
|
CurrentContext: "prod",
|
|
Contexts: map[string]config.Context{
|
|
"prod": {Host: "https://kb.example.com", TenantID: 7},
|
|
},
|
|
}))
|
|
f := &cmdutil.Factory{
|
|
Config: func() (*config.Config, error) { return config.Load() },
|
|
Prompter: func() prompt.Prompter { return prompt.AgentPrompter{} },
|
|
}
|
|
svc := &fakeStatusService{
|
|
resp: newCurrentUserResponse(
|
|
&sdk.AuthUser{ID: "u1", Email: "alice@example.com", TenantID: 7},
|
|
&sdk.AuthTenant{ID: 7, Name: "Acme"},
|
|
),
|
|
}
|
|
require.NoError(t, runStatus(context.Background(), &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, f, svc))
|
|
got := out.String()
|
|
assert.Contains(t, got, "profile: prod")
|
|
assert.Contains(t, got, "host: https://kb.example.com")
|
|
assert.Contains(t, got, "alice@example.com")
|
|
assert.Contains(t, got, "Acme")
|
|
}
|
|
|
|
func TestRunStatus_JSONOutput(t *testing.T) {
|
|
out, _ := iostreams.SetForTest(t)
|
|
testutil.XDGTempDir(t)
|
|
require.NoError(t, config.Save(&config.Config{
|
|
CurrentContext: "prod",
|
|
Contexts: map[string]config.Context{"prod": {Host: "https://x"}},
|
|
}))
|
|
f := &cmdutil.Factory{Config: func() (*config.Config, error) { return config.Load() }}
|
|
svc := &fakeStatusService{resp: newCurrentUserResponse(&sdk.AuthUser{ID: "u1", Email: "a@b.c", TenantID: 7}, nil)}
|
|
require.NoError(t, runStatus(context.Background(), &cmdutil.FormatOptions{Mode: cmdutil.FormatJSON}, f, svc))
|
|
got := out.String()
|
|
var env struct {
|
|
OK bool `json:"ok"`
|
|
Data map[string]any `json:"data"`
|
|
}
|
|
require.NoError(t, json.Unmarshal([]byte(got), &env), "expected valid JSON envelope, got: %q", got)
|
|
assert.True(t, env.OK, "envelope.ok must be true")
|
|
assert.Equal(t, "prod", env.Data["profile"], "profile field should be prod")
|
|
assert.Contains(t, got, `"email":"a@b.c"`)
|
|
}
|
|
|
|
func TestRunStatus_NoSDKClient(t *testing.T) {
|
|
iostreams.SetForTest(t)
|
|
err := runStatus(context.Background(), &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, &cmdutil.Factory{}, nil)
|
|
require.Error(t, err)
|
|
assert.True(t, cmdutil.IsAuthError(err))
|
|
}
|
|
|
|
func TestRunStatus_SDKError_Transport(t *testing.T) {
|
|
iostreams.SetForTest(t)
|
|
testutil.XDGTempDir(t)
|
|
require.NoError(t, config.Save(&config.Config{CurrentContext: "p", Contexts: map[string]config.Context{"p": {Host: "https://x"}}}))
|
|
f := &cmdutil.Factory{Config: func() (*config.Config, error) { return config.Load() }}
|
|
err := runStatus(context.Background(), &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, f, &fakeStatusService{err: assert.AnError})
|
|
require.Error(t, err)
|
|
// Non-HTTP errors (DNS / TCP) are transport problems, not auth problems -
|
|
// classify network.error so retry logic / exit code 7 / IsTransient apply.
|
|
assert.True(t, cmdutil.IsTransient(err), "expected transient/network classification, got %v", err)
|
|
}
|
|
|
|
func TestRunStatus_SDKError_HTTP401(t *testing.T) {
|
|
iostreams.SetForTest(t)
|
|
testutil.XDGTempDir(t)
|
|
require.NoError(t, config.Save(&config.Config{CurrentContext: "p", Contexts: map[string]config.Context{"p": {Host: "https://x"}}}))
|
|
f := &cmdutil.Factory{Config: func() (*config.Config, error) { return config.Load() }}
|
|
err := runStatus(context.Background(), &cmdutil.FormatOptions{Mode: cmdutil.FormatHuman}, f, &fakeStatusService{err: errors.New("HTTP error 401: invalid token")})
|
|
require.Error(t, err)
|
|
assert.True(t, cmdutil.IsAuthError(err))
|
|
}
|