mirror of
https://github.com/Tencent/WeKnora.git
synced 2026-08-29 02:04:30 +08:00
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.
203 lines
7.5 KiB
Go
203 lines
7.5 KiB
Go
// Package cmd holds the cobra command tree. main.go calls Execute().
|
|
package cmd
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/spf13/cobra"
|
|
|
|
agentcmd "github.com/Tencent/WeKnora/cli/cmd/agent"
|
|
apicmd "github.com/Tencent/WeKnora/cli/cmd/api"
|
|
"github.com/Tencent/WeKnora/cli/cmd/auth"
|
|
chatcmd "github.com/Tencent/WeKnora/cli/cmd/chat"
|
|
contextcmd "github.com/Tencent/WeKnora/cli/cmd/context"
|
|
"github.com/Tencent/WeKnora/cli/cmd/doc"
|
|
"github.com/Tencent/WeKnora/cli/cmd/doctor"
|
|
"github.com/Tencent/WeKnora/cli/cmd/kb"
|
|
linkcmd "github.com/Tencent/WeKnora/cli/cmd/link"
|
|
mcpcmd "github.com/Tencent/WeKnora/cli/cmd/mcp"
|
|
"github.com/Tencent/WeKnora/cli/cmd/search"
|
|
sessioncmd "github.com/Tencent/WeKnora/cli/cmd/session"
|
|
"github.com/Tencent/WeKnora/cli/internal/aiclient"
|
|
"github.com/Tencent/WeKnora/cli/internal/build"
|
|
"github.com/Tencent/WeKnora/cli/internal/cmdutil"
|
|
"github.com/Tencent/WeKnora/cli/internal/format"
|
|
"github.com/Tencent/WeKnora/cli/internal/iostreams"
|
|
)
|
|
|
|
// Execute is the entry point invoked by main(). Returns the process exit code.
|
|
func Execute() int {
|
|
root := NewRootCmd(cmdutil.New())
|
|
if err := root.Execute(); err != nil {
|
|
// Errors go to stderr (matches gh/aws/stripe). Stdout stays
|
|
// empty (or holds partial success the command produced) so
|
|
// downstream `--json | jq` pipelines never filter error shapes
|
|
// out of the success stream. The typed exit code (3/4/5/6/7/10)
|
|
// carries the error class.
|
|
cmdutil.PrintError(iostreams.IO.Err, MapCobraError(err))
|
|
return cmdutil.ExitCode(MapCobraError(err))
|
|
}
|
|
return 0
|
|
}
|
|
|
|
// MapCobraError tags the textually-emitted cobra errors as cmdutil.FlagError
|
|
// so they exit 2 like other user invocation mistakes. SetFlagErrorFunc handles
|
|
// flag parse errors at parse time; this catches positional/Args validation
|
|
// errors and unknown subcommands that propagate as plain errors.
|
|
//
|
|
// Pinned to cobra v1.10 message formats (cobra/args.go: ExactArgs / NoArgs;
|
|
// cobra/command.go: required-flag / unknown-command). TestMapCobraError_PinnedPrefixes
|
|
// guards against a silent break on cobra bumps.
|
|
//
|
|
// Exported so the acceptance/contract test helper can reuse the mapping
|
|
// when replicating Execute()'s stderr error-path in-process.
|
|
func MapCobraError(err error) error {
|
|
if err == nil {
|
|
return nil
|
|
}
|
|
msg := err.Error()
|
|
for _, prefix := range cobraFlagErrorPrefixes {
|
|
if strings.HasPrefix(msg, prefix) {
|
|
return cmdutil.NewFlagError(err)
|
|
}
|
|
}
|
|
return err
|
|
}
|
|
|
|
// cobraFlagErrorPrefixes lists the text prefixes cobra uses for invocation
|
|
// problems we want to surface as exit 2. Pinned per cobra v1.10.
|
|
var cobraFlagErrorPrefixes = []string{
|
|
"unknown command ",
|
|
"required flag(s)",
|
|
"accepts ", // ExactArgs / RangeArgs / etc. — `accepts N arg(s), received M`
|
|
"requires at least", // MinimumNArgs
|
|
"requires at most", // MaximumNArgs
|
|
"unknown flag",
|
|
"invalid argument", // pflag type-coercion failure (e.g. --limit=foo)
|
|
}
|
|
|
|
// NewRootCmd builds the cobra tree. Splitting it from Execute() lets tests
|
|
// drive the tree directly with their own factory. Exported so the
|
|
// acceptance/contract suite can construct the tree in-process.
|
|
func NewRootCmd(f *cmdutil.Factory) *cobra.Command {
|
|
v, commit, date := build.Info()
|
|
cmd := &cobra.Command{
|
|
Use: "weknora",
|
|
Short: "WeKnora CLI — RAG knowledge base from your terminal",
|
|
Long: `WeKnora CLI lets you authenticate, browse knowledge bases, and run
|
|
hybrid searches against a WeKnora server from your shell or an AI agent.`,
|
|
Example: ` weknora auth login --host=https://kb.example.com # one-time setup
|
|
weknora kb list # list knowledge bases
|
|
weknora kb view <id> # show one
|
|
weknora search chunks "your question" --kb=<id> # hybrid retrieval
|
|
weknora doctor --json # health check (agent-readable)`,
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
// Version makes cobra auto-register a `--version` global flag that
|
|
// prints this string. We accept both `--version` and a `version`
|
|
// subcommand; the subcommand still owns the richer `--json` output
|
|
// (build commit + date).
|
|
Version: fmt.Sprintf("%s (commit %s, built %s)", v, commit, date),
|
|
PersistentPreRun: func(c *cobra.Command, args []string) {
|
|
// Propagate the global --context flag into the Factory for this
|
|
// invocation only. Spec §1.2: single-shot override, no disk write.
|
|
if v, _ := c.Flags().GetString("context"); v != "" {
|
|
f.ContextOverride = v
|
|
}
|
|
},
|
|
}
|
|
// Match `weknora version` line format so both forms output the same.
|
|
cmd.SetVersionTemplate("weknora {{.Version}}\n")
|
|
addGlobalFlags(cmd)
|
|
cmd.SetHelpFunc(agentAwareHelpFunc(cmd.HelpFunc()))
|
|
// Wrap cobra's flag-parsing errors as FlagError so cmdutil.ExitCode maps
|
|
// them to exit 2. "unknown command" errors are detected by message prefix
|
|
// in Execute() since cobra emits them as plain errors.
|
|
cmd.SetFlagErrorFunc(func(c *cobra.Command, err error) error {
|
|
return cmdutil.NewFlagError(err)
|
|
})
|
|
|
|
cmd.AddCommand(newVersionCmd(f))
|
|
cmd.AddCommand(auth.NewCmdAuth(f))
|
|
cmd.AddCommand(search.NewCmdSearch(f))
|
|
cmd.AddCommand(doctor.NewCmd(f))
|
|
cmd.AddCommand(kb.NewCmd(f))
|
|
cmd.AddCommand(contextcmd.NewCmd(f))
|
|
cmd.AddCommand(linkcmd.NewCmd(f))
|
|
cmd.AddCommand(linkcmd.NewCmdUnlink())
|
|
cmd.AddCommand(doc.NewCmd(f))
|
|
cmd.AddCommand(apicmd.NewCmd(f))
|
|
cmd.AddCommand(chatcmd.NewCmd(f))
|
|
cmd.AddCommand(sessioncmd.NewCmd(f))
|
|
cmd.AddCommand(agentcmd.NewCmd(f))
|
|
cmd.AddCommand(mcpcmd.NewCmd(f))
|
|
return cmd
|
|
}
|
|
|
|
// addGlobalFlags registers persistent flags available on every subcommand.
|
|
// Only flags whose behavior is actually wired are listed — a flag that
|
|
// accepts values but does nothing is a worse contract than no flag.
|
|
func addGlobalFlags(cmd *cobra.Command) {
|
|
pf := cmd.PersistentFlags()
|
|
pf.BoolP("yes", "y", false, "Skip confirmation prompts on destructive operations")
|
|
pf.String("context", "", "Override the active context for this invocation (no disk write)")
|
|
}
|
|
|
|
// agentAwareHelpFunc wraps cobra's default help to append the AI agent
|
|
// guidance (Annotations[aiclient.AIAgentHelpKey]) only when an AI coding
|
|
// agent env var is detected (CLAUDECODE / CURSOR_AGENT). Help-only
|
|
// render — no behavior switch.
|
|
func agentAwareHelpFunc(orig func(*cobra.Command, []string)) func(*cobra.Command, []string) {
|
|
return func(c *cobra.Command, args []string) {
|
|
orig(c, args)
|
|
if aiclient.DetectAIAgent() == "" {
|
|
return
|
|
}
|
|
extra := aiclient.FormatAgentGuidance(c)
|
|
if extra == "" {
|
|
return
|
|
}
|
|
w := c.OutOrStdout()
|
|
fmt.Fprintln(w)
|
|
fmt.Fprintln(w, "AI Agent guidance:")
|
|
fmt.Fprintln(w, " "+extra)
|
|
}
|
|
}
|
|
|
|
// versionFields enumerates the fields surfaced for `--json` discovery on
|
|
// `version`. Mirrors the version object payload.
|
|
var versionFields = []string{"version", "commit", "date"}
|
|
|
|
// newVersionCmd is the only leaf command shipped in the foundation PR. It
|
|
// doubles as the smoke test that proves Factory + iostreams + cobra wiring works.
|
|
func newVersionCmd(f *cmdutil.Factory) *cobra.Command {
|
|
cmd := &cobra.Command{
|
|
Use: "version",
|
|
Short: "Show CLI build metadata",
|
|
Args: cobra.NoArgs,
|
|
RunE: func(c *cobra.Command, args []string) error {
|
|
jopts, err := cmdutil.CheckJSONFlags(c)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
v, commit, date := build.Info()
|
|
if jopts.Enabled() {
|
|
return format.WriteJSONFiltered(
|
|
c.OutOrStdout(),
|
|
map[string]string{
|
|
"version": v,
|
|
"commit": commit,
|
|
"date": date,
|
|
},
|
|
jopts.Fields, jopts.JQ,
|
|
)
|
|
}
|
|
fmt.Fprintf(c.OutOrStdout(), "weknora %s (commit %s, built %s)\n", v, commit, date)
|
|
return nil
|
|
},
|
|
}
|
|
cmdutil.AddJSONFlags(cmd, versionFields)
|
|
return cmd
|
|
}
|