2ce348d020
D1 — --format default flipped to json regardless of TTY: - v0.6: smart default (text on TTY, json on pipe). - v0.7: always json; TTY only affects indent (compact in pipe). Enum values unchanged (text | json | ndjson). - Typed FormatMode enum replaces untyped string consts. - --format / --jq promoted to persistent root flags so unknown- subcommand paths still reach the typed-envelope guard (per-command registration in v0.6 would have rejected --format on unknown commands as cobra-prose exit 2). - WEKNORA_FORMAT env var added; precedence --format > env > default. Invalid env values silently ignored. D2 — chat / session ask default to NDJSON event-stream: - New cli/internal/output/ndjson_stream.go: InitEvent struct + EmitInit / EmitSDKEvent / WriteNDJSONLine helpers. EmitInit doc encodes the must-be-first-line invariant agents key on. - chat / session ask: --format json AND --format ndjson both emit one JSON event per line (no envelope wrapping). CLI injects exactly one `init` event at stream head carrying session_id + optional kb_id / agent_id / profile. Subsequent events pass through verbatim from the SDK (passthrough discipline per spec §5.1). - --format text keeps the SSE-style live renderer. context → profile full cascade: - Command group: cli/cmd/context/ → cli/cmd/profile/ (git mv; package contextcmd → profilecmd). - Global flag --context → --profile. Factory.ContextOverride → ProfileOverride. WEKNORA_PROFILE env var honored (--profile flag > env > config.CurrentContext). When --profile or WEKNORA_PROFILE references a missing profile, the error is input.invalid_argument with hint "weknora profile list" — not the destructive local.config_corrupt path (which would have told users to delete their config file). - Binding file .weknora/project.yaml field context: → profile: (no backwards-compat alias; re-run weknora link). - profile use JSON fields current_context / previous_context → current_profile / previous_profile. - weknora link JSON field context → profile. - CodeLocalContextNotFound → CodeLocalProfileNotFound (typed code rename). - Envelope top-level profile field populated via globalProfile (set by root PersistentPreRunE from Factory.ActiveProfile). chat / session ask NDJSON init event carries the same profile. - Rationale: "context" collided with LLM context window / RAG context / Go context.Context; mainstream multi-credential CLIs (AWS / Stripe / OpenAI / Anthropic / lark) all use "profile". H2/C1' help calibration: - AgentHelp gains Warnings []string; single SetAgentHelp helper routes on WEKNORA_AGENT_HELP=1 (emits JSON blob including warnings) vs human help (appends "AI agents:" block from same source). Warnings surface as both a structured JSON field and visible help-text addendum without drift. - 9 destructive commands carry warnings: kb / doc / agent / session / chunk delete; profile remove; kb / agent edit; auth logout. - weknora doc wait dedups ids at entry; SIGINT mid-wait returns silently (root signal handler maps to exit 130) instead of being miscategorised as operation.timeout / operation.failed. A4 — docs: - cli/AGENTS.md gains four agent-facing sections: Wire contract for AI agents (stdout / stderr / NDJSON / _notice evolution / SDK contract boundary); Deliberate deviations + mainstream alignments; Pre-1.0 breaking policy; Exit-10 anti-patterns. ERROR_REFERENCE table extended. - cli/README.md adds Agent quick start under Wire contract. - cli/CHANGELOG.md v0.7 section: BREAKING entries with migration notes, Added (WEKNORA_FORMAT / WEKNORA_PROFILE / retry_command / retry_after_seconds / risk / _notice reserved infra / meta.count / meta.has_more / doc fetch / doc create / session ask / doc delete --all / NDJSON init), Changed (docs additions), Deprecated (none — pre-release one-shot breaking). Spec: docs/superpowers/specs/2026-05-20-weknora-cli-v0.7-design.md §3 / §4 / §5 / §6 / §11
157 lines
5.1 KiB
Go
157 lines
5.1 KiB
Go
package cmdutil
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"sort"
|
|
"strings"
|
|
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/format"
|
|
"github.com/Tencent/WeKnora/cli/internal/output"
|
|
)
|
|
|
|
// FormatMode is the resolved --format value (typed enum).
|
|
type FormatMode string
|
|
|
|
const (
|
|
FormatText FormatMode = "text"
|
|
FormatJSON FormatMode = "json"
|
|
FormatNDJSON FormatMode = "ndjson"
|
|
)
|
|
|
|
// FormatOptions captures the resolved --format + --jq state for a command.
|
|
// Mode is one of FormatText / FormatJSON / FormatNDJSON, or "" before
|
|
// ResolveDefault has been called.
|
|
type FormatOptions struct {
|
|
Mode FormatMode
|
|
JQ string
|
|
TTY bool // ResolveDefault populates; Emit reads for indent decision
|
|
}
|
|
|
|
// AddFormatFlag attaches the --jq projection field hints (in cmd.Long) for
|
|
// commands that honor --format. The flags themselves are registered as
|
|
// persistent globals at the root, so this helper no longer re-registers
|
|
// them — it only appends documentation. Callers that don't need field
|
|
// hints can skip this call entirely.
|
|
func AddFormatFlag(cmd *cobra.Command, fieldHints ...string) {
|
|
if len(fieldHints) > 0 {
|
|
sorted := append([]string(nil), fieldHints...)
|
|
sort.Strings(sorted)
|
|
hdr := "\n\nJSON fields available (for --jq projection):\n " +
|
|
strings.Join(sorted, "\n ")
|
|
if cmd.Long != "" {
|
|
cmd.Long += hdr
|
|
} else {
|
|
cmd.Long = strings.TrimSpace(cmd.Short) + hdr
|
|
}
|
|
}
|
|
}
|
|
|
|
// CheckFormatFlag resolves --format + --jq from cmd. Returns:
|
|
// - (*FormatOptions{Mode:""}, nil) flag not set; caller should call ResolveDefault
|
|
// - (*FormatOptions{Mode:v,JQ:q}, nil) valid values
|
|
// - (nil, *FlagError) invalid --format, or --jq with explicit --format text
|
|
//
|
|
// --jq with --format unset is accepted: ResolveDefault below will promote
|
|
// the mode to FormatJSON so the filter has somewhere to apply.
|
|
func CheckFormatFlag(cmd *cobra.Command) (*FormatOptions, error) {
|
|
fopts := &FormatOptions{}
|
|
if f := cmd.Flags().Lookup("format"); f != nil {
|
|
v := f.Value.String()
|
|
switch v {
|
|
case "":
|
|
// unset; caller calls ResolveDefault
|
|
case "text", "json", "ndjson":
|
|
fopts.Mode = FormatMode(v)
|
|
default:
|
|
return nil, NewFlagError(fmt.Errorf("invalid --format %q: must be text | json | ndjson", v))
|
|
}
|
|
}
|
|
if f := cmd.Flags().Lookup("jq"); f != nil {
|
|
fopts.JQ = f.Value.String()
|
|
}
|
|
// --jq only meaningful for JSON-shaped output. Reject the explicit
|
|
// `--format text --jq ...` combination; the `--jq` with --format unset
|
|
// case is handled by ResolveDefault.
|
|
if fopts.JQ != "" && fopts.Mode == FormatText {
|
|
return nil, NewFlagError(errors.New("--jq requires --format json|ndjson"))
|
|
}
|
|
return fopts, nil
|
|
}
|
|
|
|
// WantsJSON reports whether the resolved mode is JSON or NDJSON. Used by
|
|
// callers to choose between the JSON emit path and text rendering.
|
|
func (o *FormatOptions) WantsJSON() bool {
|
|
return o.Mode == FormatJSON || o.Mode == FormatNDJSON
|
|
}
|
|
|
|
// Emit serializes data wrapped in the success envelope (FormatJSON
|
|
// path) or as bare NDJSON lines (FormatNDJSON path). meta is optional
|
|
// (pass nil for mutation commands without batch counts).
|
|
//
|
|
// FormatJSON path: envelope is {ok:true, data:..., meta?:..., _notice?:...}.
|
|
// Indent is determined by o.TTY (populated by ResolveDefault).
|
|
// When o.JQ is set, jq evaluates against the full envelope JSON, so users
|
|
// project with ".data[]", ".meta.count", etc.
|
|
//
|
|
// FormatNDJSON path: emits one bare JSON object per line (no envelope).
|
|
// Matches spec §5 NDJSON event-passthrough semantics.
|
|
//
|
|
// FormatText path returns an error so a missed dispatch surfaces loudly.
|
|
func (o *FormatOptions) Emit(w io.Writer, data any, meta *output.Meta) error {
|
|
switch o.Mode {
|
|
case FormatJSON:
|
|
if o.JQ != "" {
|
|
env := output.Envelope{
|
|
OK: true,
|
|
Data: data,
|
|
Meta: meta,
|
|
Notice: output.GetNotice(),
|
|
Profile: globalProfile,
|
|
}
|
|
return format.WriteJSONFiltered(w, env, nil, o.JQ)
|
|
}
|
|
return output.WriteEnvelope(w, data, meta, o.TTY, globalProfile)
|
|
case FormatNDJSON:
|
|
if o.JQ != "" {
|
|
return format.WriteJSONFiltered(w, data, nil, o.JQ)
|
|
}
|
|
return format.WriteNDJSON(w, data)
|
|
case FormatText:
|
|
return fmt.Errorf("FormatOptions.Emit: cannot emit text mode as JSON; caller must render human-readable separately")
|
|
default:
|
|
return fmt.Errorf("FormatOptions.Emit: unknown mode %q", o.Mode)
|
|
}
|
|
}
|
|
|
|
// ResolveDefault fills in Mode when the caller has not explicitly set it:
|
|
// - Mode defaults to FormatJSON
|
|
// - TTY only affects the indent decision (auto-indent in TTY; compact in pipe)
|
|
// - For human-readable rendering, pass --format text explicitly
|
|
func (o *FormatOptions) ResolveDefault(tty bool) {
|
|
o.TTY = tty
|
|
if o.Mode == "" {
|
|
o.Mode = FormatJSON
|
|
}
|
|
}
|
|
|
|
// FromEnv reads WEKNORA_FORMAT and applies it when Mode hasn't been set
|
|
// by --format. Call between CheckFormatFlag and ResolveDefault.
|
|
//
|
|
// Invalid env values are silently ignored (the user's --format on a
|
|
// later invocation will still take precedence).
|
|
func (o *FormatOptions) FromEnv() {
|
|
if o.Mode != "" {
|
|
return
|
|
}
|
|
v := os.Getenv("WEKNORA_FORMAT")
|
|
switch v {
|
|
case "text", "json", "ndjson":
|
|
o.Mode = FormatMode(v)
|
|
}
|
|
}
|