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
45 lines
1.2 KiB
Go
45 lines
1.2 KiB
Go
package output
|
|
|
|
import "io"
|
|
|
|
// BatchItem is one per-id outcome in a batch operation envelope (§4.5).
|
|
type BatchItem struct {
|
|
ID string `json:"id"`
|
|
OK bool `json:"ok"`
|
|
Result any `json:"result,omitempty"`
|
|
Error *ErrDetail `json:"error,omitempty"`
|
|
}
|
|
|
|
// WriteBatchEnvelope writes a batch operation envelope per §4.5.
|
|
//
|
|
// Wire shape: {ok, data:[BatchItem...], meta:{count, successes, failures}, profile?}.
|
|
// Top-level ok = (failures == 0). Per-id ok reflects each item's outcome.
|
|
// Even when all items fail, the response stays in success-envelope shape
|
|
// (data array, not error envelope) so agents can iterate detail per id.
|
|
// profile is the resolved profile name for the invocation; empty string omits the field.
|
|
func WriteBatchEnvelope(w io.Writer, items []BatchItem, indent bool, profile string) error {
|
|
if items == nil {
|
|
items = []BatchItem{}
|
|
}
|
|
successes, failures := 0, 0
|
|
for _, it := range items {
|
|
if it.OK {
|
|
successes++
|
|
} else {
|
|
failures++
|
|
}
|
|
}
|
|
env := Envelope{
|
|
OK: failures == 0,
|
|
Data: items,
|
|
Meta: &Meta{
|
|
Count: len(items),
|
|
Successes: &successes,
|
|
Failures: &failures,
|
|
},
|
|
Notice: GetNotice(),
|
|
Profile: profile,
|
|
}
|
|
return writeJSON(w, env, indent)
|
|
}
|