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
62 lines
2.1 KiB
Go
62 lines
2.1 KiB
Go
package cmdutil
|
|
|
|
import (
|
|
"io"
|
|
"os"
|
|
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
// validLogLevels is the canonical set of accepted log levels
|
|
// (debug|info|warn|error). Map gives O(1) validation.
|
|
var validLogLevels = map[string]bool{
|
|
"error": true,
|
|
"warn": true,
|
|
"info": true,
|
|
"debug": true,
|
|
}
|
|
|
|
// IsValidLogLevel reports whether v is one of the accepted log levels.
|
|
// Exported so factory-level validation can give a strict error on an
|
|
// explicit --log-level invalid value (env values stay silent-fallthrough).
|
|
func IsValidLogLevel(v string) bool { return validLogLevels[v] }
|
|
|
|
// LogLevelDefault is the resolved level when nothing is configured: only
|
|
// emit error-level logs (minimal noise for non-debug usage).
|
|
const LogLevelDefault = "error"
|
|
|
|
// AddLogLevelFlag registers --log-level as a persistent flag on cmd
|
|
// (typically the root command). Unlike --format (per-command, Method D),
|
|
// --log-level is uniformly applied across all SDK calls so it lives on root.
|
|
func AddLogLevelFlag(cmd *cobra.Command) {
|
|
cmd.PersistentFlags().String("log-level", "", "Log verbosity: error | warn | info | debug (env: WEKNORA_LOG_LEVEL)")
|
|
}
|
|
|
|
// ResolveLogLevel resolves the effective log level using priority (high → low):
|
|
// 1. --log-level flag (if explicitly set, even from a parent command's persistent flagset)
|
|
// 2. WEKNORA_LOG_LEVEL env (if set to a valid value)
|
|
// 3. Default "error"
|
|
//
|
|
// Invalid env values fall through to the next priority (no error — env is
|
|
// best-effort). The stderr writer is retained in the signature for symmetry
|
|
// with ApplyLogLevel callers but is unused at the OS level.
|
|
func ResolveLogLevel(cmd *cobra.Command, _ io.Writer) (string, bool) {
|
|
// Priority 1: explicit --log-level flag.
|
|
if cmd != nil {
|
|
if f := cmd.Flags().Lookup("log-level"); f != nil && f.Changed {
|
|
v := f.Value.String()
|
|
if validLogLevels[v] {
|
|
return v, false
|
|
}
|
|
}
|
|
}
|
|
|
|
// Priority 2: WEKNORA_LOG_LEVEL env (silently skip invalid values).
|
|
if v := os.Getenv("WEKNORA_LOG_LEVEL"); v != "" && validLogLevels[v] {
|
|
return v, false
|
|
}
|
|
|
|
// Priority 3: default.
|
|
return LogLevelDefault, false
|
|
}
|