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
179 lines
5.1 KiB
Go
179 lines
5.1 KiB
Go
package sessioncmd
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/cmdutil"
|
|
"github.com/Tencent/WeKnora/cli/internal/iostreams"
|
|
sdk "github.com/Tencent/WeKnora/client"
|
|
)
|
|
|
|
const (
|
|
defaultFullLimit = 50
|
|
maxFullLimit = 1000
|
|
)
|
|
|
|
// sessionViewFields enumerates the fields surfaced for `--format json` discovery on
|
|
// `session view`. Mirrors sdk.Session json tags; adds the synthesized
|
|
// `messages` projection surfaced by `--full`.
|
|
var sessionViewFields = []string{
|
|
"id", "tenant_id", "title", "description", "created_at", "updated_at",
|
|
"messages",
|
|
}
|
|
|
|
type ViewOptions struct {
|
|
// Full instructs runView to fetch chat history via LoadMessages and
|
|
// render it after the session metadata.
|
|
Full bool
|
|
// Limit caps the number of messages loaded when Full is true.
|
|
// Must be 1..maxFullLimit.
|
|
Limit int
|
|
// LimitSet records whether the caller explicitly set --limit, so we
|
|
// can reject `--limit` without `--full` (vs. silently ignoring the
|
|
// default).
|
|
LimitSet bool
|
|
}
|
|
|
|
// ViewService is the narrow SDK surface this command depends on. LoadMessages
|
|
// is only invoked under --full but lives on the same interface so the runView
|
|
// dependency surface stays minimal.
|
|
type ViewService interface {
|
|
GetSession(ctx context.Context, id string) (*sdk.Session, error)
|
|
LoadMessages(ctx context.Context, sessionID string, limit int, beforeTime *time.Time) ([]sdk.Message, error)
|
|
}
|
|
|
|
// NewCmdView builds `weknora session view <id>`. Renders session metadata
|
|
// only by default. With `--full`, also loads the chat history via
|
|
// `LoadMessages` and renders messages (or projects them into the JSON
|
|
// payload under `messages`).
|
|
func NewCmdView(f *cmdutil.Factory) *cobra.Command {
|
|
opts := &ViewOptions{Limit: defaultFullLimit}
|
|
cmd := &cobra.Command{
|
|
Use: "view <session-id>",
|
|
Short: "Show a chat session by ID",
|
|
Long: `Show a chat session.
|
|
|
|
By default renders the session metadata (id, title, description, timestamps).
|
|
|
|
Pass --full to also load the chat history (LoadMessages SDK call). Use
|
|
--limit to cap the number of messages loaded (1..1000, default 50).
|
|
--limit without --full is rejected as input.invalid_argument.`,
|
|
Args: cobra.ExactArgs(1),
|
|
RunE: func(c *cobra.Command, args []string) error {
|
|
opts.LimitSet = c.Flags().Changed("limit")
|
|
fopts, err := cmdutil.CheckFormatFlag(c)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
fopts.ResolveDefault(iostreams.IO.IsStdoutTTY())
|
|
cli, err := f.Client()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return runView(c.Context(), opts, fopts, cli, args[0])
|
|
},
|
|
}
|
|
cmd.Flags().BoolVar(&opts.Full, "full", false, "Also load chat history via LoadMessages")
|
|
cmd.Flags().IntVar(&opts.Limit, "limit", defaultFullLimit, "Max messages to load when --full is set (1..1000)")
|
|
cmdutil.AddFormatFlag(cmd, sessionViewFields...)
|
|
return cmd
|
|
}
|
|
|
|
func runView(ctx context.Context, opts *ViewOptions, fopts *cmdutil.FormatOptions, svc ViewService, id string) error {
|
|
if !opts.Full && opts.LimitSet {
|
|
return &cmdutil.Error{
|
|
Code: cmdutil.CodeInputInvalidArgument,
|
|
Message: "--limit requires --full",
|
|
}
|
|
}
|
|
if opts.Full {
|
|
if opts.Limit < 1 || opts.Limit > maxFullLimit {
|
|
return &cmdutil.Error{
|
|
Code: cmdutil.CodeInputInvalidArgument,
|
|
Message: fmt.Sprintf("--limit must be in 1..%d, got %d", maxFullLimit, opts.Limit),
|
|
}
|
|
}
|
|
}
|
|
|
|
s, err := svc.GetSession(ctx, id)
|
|
if err != nil {
|
|
return cmdutil.WrapHTTP(err, "get session %q", id)
|
|
}
|
|
|
|
var msgs []sdk.Message
|
|
if opts.Full {
|
|
msgs, err = svc.LoadMessages(ctx, id, opts.Limit, nil)
|
|
if err != nil {
|
|
return cmdutil.WrapHTTP(err, "load messages for session %q", id)
|
|
}
|
|
if msgs == nil {
|
|
msgs = []sdk.Message{}
|
|
}
|
|
}
|
|
|
|
if fopts.WantsJSON() {
|
|
if !opts.Full {
|
|
return fopts.Emit(iostreams.IO.Out, s, nil)
|
|
}
|
|
// Project session + messages into a single bare object. Use the
|
|
// SDK json tags via an embedded *Session so existing keys stay
|
|
// stable.
|
|
payload := struct {
|
|
*sdk.Session
|
|
Messages []sdk.Message `json:"messages"`
|
|
}{Session: s, Messages: msgs}
|
|
return fopts.Emit(iostreams.IO.Out, payload, nil)
|
|
}
|
|
|
|
w := iostreams.IO.Out
|
|
fmt.Fprintf(w, "ID: %s\n", s.ID)
|
|
if s.Title != "" {
|
|
fmt.Fprintf(w, "TITLE: %s\n", s.Title)
|
|
}
|
|
if s.Description != "" {
|
|
fmt.Fprintf(w, "DESC: %s\n", s.Description)
|
|
}
|
|
if t, ok := parseTS(s.CreatedAt); ok {
|
|
fmt.Fprintf(w, "CREATED: %s\n", t.Format("2006-01-02 15:04:05"))
|
|
} else if s.CreatedAt != "" {
|
|
fmt.Fprintf(w, "CREATED: %s\n", s.CreatedAt)
|
|
}
|
|
if t, ok := parseTS(s.UpdatedAt); ok {
|
|
fmt.Fprintf(w, "UPDATED: %s\n", t.Format("2006-01-02 15:04:05"))
|
|
} else if s.UpdatedAt != "" {
|
|
fmt.Fprintf(w, "UPDATED: %s\n", s.UpdatedAt)
|
|
}
|
|
|
|
if opts.Full {
|
|
fmt.Fprintln(w)
|
|
fmt.Fprintf(w, "Messages (%d):\n", len(msgs))
|
|
for _, m := range msgs {
|
|
fmt.Fprintln(w)
|
|
ts := ""
|
|
if !m.CreatedAt.IsZero() {
|
|
ts = " " + m.CreatedAt.Format("2006-01-02 15:04:05")
|
|
}
|
|
fmt.Fprintf(w, "[%s]%s\n", m.Role, ts)
|
|
if m.Content != "" {
|
|
fmt.Fprintln(w, m.Content)
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func parseTS(s string) (time.Time, bool) {
|
|
if s == "" {
|
|
return time.Time{}, false
|
|
}
|
|
t, err := time.Parse(time.RFC3339, s)
|
|
if err != nil {
|
|
return time.Time{}, false
|
|
}
|
|
return t, true
|
|
}
|