e623e8208f
Removes the entire envelope machinery now that every success path
emits bare JSON:
- cli/internal/format/envelope.go (Envelope, Success, Failure,
SuccessWithRisk, WriteEnvelope, Meta, Notice, UpdateNotice,
VersionSkewNotice, Risk, RiskLevel, ErrorBody) + tests.
- cli/internal/format/filter.go envelope-specific helpers
(WriteEnvelopeFiltered, marshalEnvelope, applyFieldFilter,
filterDataPayload, filterObjectData); the reusable
filterArrayItems / filterObjectKeys / writeJQ stay for bare.go.
- cli/internal/cmdutil/exporter.go + tests (envelope-only).
- cli/internal/cmdutil/PrintErrorEnvelope + ToErrorBody +
operationRiskOf + Error.OperationRisk field + OperationRisk struct.
Error path: all errors now go to stderr via cmdutil.PrintError in
`code: message\nhint: ...` form, regardless of --json. Stdout stays
empty (or holds the partial-success the command already wrote) so
downstream `--json | jq` pipelines never have to filter error shapes
out of the success stream. Typed exit codes (3 auth.* / 4
resource.not_found / 5 input.* / 6 server.rate_limited / 7 server.*
+ network.* / 10 input.confirmation_required) carry the failure
class for agents that branch on it.
Acceptance contract:
- envelope_test.go → wire_test.go (TestEnvelopeGolden → TestWireGolden).
- testdata/envelopes/ → testdata/wire/.
- Error-path cases assert the typed code substring on stderr.
- Orphan whoami.*.json goldens deleted.
AGENTS.md + README.md rewritten for the bare-data contract:
- Drop envelope schema section + dry-run rule.
- Document bare JSON on stdout + `code: msg\nhint: …` on stderr.
- ADR-3 reframed around bare data and why error separation matters
for `--json | jq` pipelines.
WriteJSONFiltered short-circuits to WriteJSON when both filters are
empty (skip the marshal-buffer round-trip for the common case).
Final review pass:
- Fix wire-contract bug: `--json id,name` (space form) is broken by
pflag's NoOptDefVal; AGENTS.md / README.md / SetAgentHelp + the
field-discovery help text all switched to `--json=id,name`.
- Fix `weknora api --jq` silently ignored: api.go now routes through
WriteJSONFiltered with jopts.JQ.
- AGENTS.md: drop the false claim that `auth logout` honors `-y`
(logout is local-only with no ConfirmDestructive guard); list the
actual destructive commands instead.
- Rewrite cli/acceptance/e2e/e2e_test.go for the bare-data wire shape
(was still parsing `out["data"]` / `env["ok"]`).
- Add `JSONOptions.Emit(w, v)` helper; collapse ~33 repeated
`format.WriteJSONFiltered(iostreams.IO.Out, X, jopts.Fields,
jopts.JQ)` sites to `jopts.Emit(iostreams.IO.Out, X)` — drops the
format import from 22 cmd/* files.
- Delete single-caller `cmdutil.MustRequireFlag`; inline as
`_ = cmd.MarkFlagRequired(...)` everywhere.
- Add `_ = cmd.MarkFlagRequired("name")` to `kb create`; it was the
only write command relying on runtime --name validation while
`context add` already used the cobra-level mark.
- `context use`: register `--json` / `--jq` (was always emitting JSON
unconditionally with no human path and no flag — diverged from
every other write command); human mode now prints
`✓ Switched context to X (was Y)`.
- Replace per-package `confirmPrompter` / `scriptedConfirm` /
`errPrompter` test doubles with `testutil.ConfirmPrompter`.
- Rename `chatService` → `ChatService` (export to match siblings
`ListService` / `ViewService`); rename `printUploadSuccess` →
`renderUploadSuccess` (siblings use `render*`).
- `defaultHint(CodeResourceNotFound)`: drop the hardcoded
"list available with `weknora kb list`" — misleading on agent /
doc / session 404. Replaced with "verify the resource ID and try
again".
- Strip stale `v0.2/v0.3` / "envelope" / "v0.0/v0.1 supports only"
historical tags from production comments and a few test
descriptions.
120 lines
4.0 KiB
Go
120 lines
4.0 KiB
Go
package cmdutil
|
|
|
|
import (
|
|
"errors"
|
|
"io"
|
|
"sort"
|
|
"strings"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/spf13/pflag"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/format"
|
|
)
|
|
|
|
// JSONOptions captures the resolved --json + --jq state after CheckJSONFlags.
|
|
// A non-nil value means the user requested JSON output; Fields restricts
|
|
// each top-level object (or each element of a top-level array) to the
|
|
// listed keys; JQ is a jq expression applied to the final JSON.
|
|
type JSONOptions struct {
|
|
Fields []string
|
|
JQ string
|
|
}
|
|
|
|
// Enabled reports whether the caller asked for JSON output. Convenience
|
|
// shorthand for `opts != nil`.
|
|
func (o *JSONOptions) Enabled() bool { return o != nil }
|
|
|
|
// Emit serializes v as bare JSON to w, honoring the resolved field-filter
|
|
// and jq expression. Equivalent to calling format.WriteJSONFiltered with
|
|
// o.Fields / o.JQ, but lets call sites stay free of the format import.
|
|
// Safe to call on a nil receiver in case the caller composes it with
|
|
// Enabled().
|
|
func (o *JSONOptions) Emit(w io.Writer, v any) error {
|
|
if o == nil {
|
|
return format.WriteJSON(w, v)
|
|
}
|
|
return format.WriteJSONFiltered(w, v, o.Fields, o.JQ)
|
|
}
|
|
|
|
// jsonNoOptSentinel marks a bare `--json` (no comma-separated values after
|
|
// it). pflag's NoOptDefVal mechanism stores this sentinel into the slice;
|
|
// CheckJSONFlags then maps it to "no field filter" (full payload).
|
|
//
|
|
// Field discovery moves to per-command `--help` "JSON fields available"
|
|
// sections rendered by AddJSONFlags.
|
|
const jsonNoOptSentinel = "\x00json-no-value"
|
|
|
|
// AddJSONFlags registers --json and --jq on cmd.
|
|
//
|
|
// - `--json` → bare JSON payload, no field filter
|
|
// - `--json=id,name` → each object restricted to the listed fields
|
|
// - `--jq <expr>` → apply a jq expression to the JSON; requires
|
|
// --json to be set explicitly
|
|
//
|
|
// `fields` is the set of available fields the user may pass; rendered in
|
|
// the command's help. Pass nil to skip the help annotation (uncommon).
|
|
func AddJSONFlags(cmd *cobra.Command, fields []string) {
|
|
f := cmd.Flags()
|
|
// Backticks reserved for pflag's UnquoteUsage to extract the varname;
|
|
// avoid them in the description so the help doesn't render the flag
|
|
// name twice.
|
|
f.StringSlice("json", nil, "Output bare JSON (--json=id,name to project `fields`)")
|
|
f.Lookup("json").NoOptDefVal = jsonNoOptSentinel
|
|
f.StringP("jq", "q", "", "Filter JSON output using a jq `expression` (requires --json)")
|
|
|
|
if len(fields) > 0 {
|
|
sorted := append([]string(nil), fields...)
|
|
sort.Strings(sorted)
|
|
// Append to Long without overwriting per-command prose.
|
|
hdr := "\n\nJSON fields available via `--json=id,name,...`:\n " +
|
|
strings.Join(sorted, "\n ")
|
|
if cmd.Long != "" {
|
|
cmd.Long += hdr
|
|
} else {
|
|
cmd.Long = strings.TrimSpace(cmd.Short) + hdr
|
|
}
|
|
}
|
|
}
|
|
|
|
// CheckJSONFlags resolves the --json + --jq state from cmd. Returns:
|
|
// - (nil, nil) neither flag set (human output mode)
|
|
// - (*JSONOptions, nil) --json set (possibly with --jq)
|
|
// - (nil, error) --jq without --json (plain error, exit 1)
|
|
//
|
|
// Bare `--json` yields Fields == nil (no field filter). Explicit field
|
|
// list yields Fields == []string{"id", "name", ...} (filter applied).
|
|
func CheckJSONFlags(cmd *cobra.Command) (*JSONOptions, error) {
|
|
f := cmd.Flags()
|
|
jsonFlag := f.Lookup("json")
|
|
jqFlag := f.Lookup("jq")
|
|
if jsonFlag == nil {
|
|
return nil, nil
|
|
}
|
|
if jsonFlag.Changed {
|
|
sv, ok := jsonFlag.Value.(pflag.SliceValue)
|
|
if !ok {
|
|
return nil, errors.New("internal: --json flag is not a StringSlice")
|
|
}
|
|
raw := sv.GetSlice()
|
|
opts := &JSONOptions{}
|
|
// Strip the bare-flag sentinel if present.
|
|
for _, v := range raw {
|
|
if v == jsonNoOptSentinel {
|
|
continue
|
|
}
|
|
opts.Fields = append(opts.Fields, v)
|
|
}
|
|
if jqFlag != nil {
|
|
opts.JQ = jqFlag.Value.String()
|
|
}
|
|
return opts, nil
|
|
}
|
|
if jqFlag != nil && jqFlag.Changed {
|
|
// Plain error, exit 1 (not FlagError → exit 2): the flag itself
|
|
// parsed fine, the combination is what's wrong.
|
|
return nil, errors.New("cannot use `--jq` without specifying `--json`")
|
|
}
|
|
return nil, nil
|
|
}
|