8bcbf5a154
Empirical mainstream-CLI surveys (gh / kubectl / aws / gcloud / stripe /
flyctl / terraform / vercel / netlify / lark) drove five alignment
fixes — each replaces a weknora-only design choice that mainstream CLIs
do not share. No backwards-compat shims; the CLI has no v0.1 users yet.
1. Single --kb flag (was --kb-id + --kb mutually exclusive)
Survey: 0/7 mainstream CLIs use two parallel flags for "by id" vs
"by name". Single flag (gh -R, gcloud --project) or positional
(kubectl, stripe, terraform). Closest analog — gcloud --project —
collapses identifier types onto one flag.
Now: every command exposes one --kb flag; client-side prefix
detection (cmdutil.IsKBID looks for "kb_") routes id-form values
through directly and name-form values through ListKnowledgeBases.
Mirrors gcloud --project's id-or-name auto-detection.
Touched: search, chat, doc list / upload / delete, link.
Factory.ResolveKB chain trimmed from 5 levels to 4.
2. link supersedes init
Survey: only vercel and netlify ship both `init` AND `link` as
siblings, and they keep them semantically distinct. weknora's pair
wrote the same .weknora/project.yaml file with the same meaning,
differentiated only by interactivity — that's a flag concern, not
a command concern.
Now: cmd/init/ deleted. cmd/link absorbs the interactive flow:
- link --kb <id-or-name> → non-interactive write
- link on a TTY → interactive prompt (lists KBs)
- link non-TTY without --kb → CodeKBIDRequired
Always overwrites silently (matches vercel link / netlify link /
kubectl apply rather than git init's refuse-if-exists).
Dead code purged: --force flag, CodeProjectAlreadyLinked error code.
3. whoami dropped
Survey: 7/7 mainstream CLIs ship exactly one identity command —
never both a status and a whoami. gh / gcloud / stripe pick status
(config + live API); aws / kubectl / flyctl pick whoami (live API).
weknora's auth status was already a superset of whoami (host +
context + user + email + tenant_id + tenant_name vs user_id +
tenant_id), so dropping whoami preserves all functionality and
aligns with the gh / gcloud / stripe form.
4. kb get alias dropped
`view` was already primary (gh repo view / gh pr view convention);
`get` was kept as a cobra alias for v0.0/v0.1 callers. With no
v0.0/v0.1 users to break, the alias is just noise on the command
surface. Acceptance contract envelope cases renamed kb_get.* →
kb_view.*; goldens renamed in lockstep.
5. api refactored to gh shape (-X/--method, default GET, auto-POST)
gh CLI's signature is `gh api <endpoint> [--method M]` — single
positional path, method as a flag, default GET, auto-promoted to
POST when a body is supplied. weknora's previous `api <method>
<path>` inverted this and forced the method to be passed even for
GET — a needless deviation from our declared north star.
Now: `api <path> [-X METHOD] [--data ...]`. Exit-10 protocol
on the DELETE escape-hatch is preserved; -X DELETE still hits
ConfirmDestructive when -y absent.
Plus: AGENTS.md gains an explicit note that `doctor` is a deliberate
divergence from gh / lark — borrowed from `flutter doctor` / `brew
doctor` because RAG deployments routinely break on misconfigured
embeddings / storage / credentials and a 4-status structured envelope
is the cleanest surface for it.
Tests: 24 cli packages green (was 26 in PR-14; init + whoami packages
removed). Acceptance contract envelope cases for whoami removed,
kb_get → kb_view renamed, search args / mock path updated for the
kb_<id> form. e2e harness flag args updated. Factory.ResolveKB tests
rewritten for the single-flag shape. api_test driver updated for the
positional-path / -X-method shape.
195 lines
6.4 KiB
Go
195 lines
6.4 KiB
Go
package cmdutil
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/format"
|
|
)
|
|
|
|
// ExitCode maps an error to the documented CLI exit code (spec §2.4 + ADR-3).
|
|
// Mirrors gh / Stripe / lark-cli convention:
|
|
// - 0 success
|
|
// - 1 generic / unknown typed error
|
|
// - 2 flag / argument problem
|
|
// - 3 auth.*
|
|
// - 4 resource.not_found
|
|
// - 5 input.* (other than confirmation_required)
|
|
// - 6 server.rate_limited
|
|
// - 7 server.* (other) / network.*
|
|
// - 10 input.confirmation_required — high-risk write needs explicit -y
|
|
// (lark-cli skill protocol; see cli/AGENTS.md)
|
|
// - 130 SIGINT (handled by Go runtime, not this function)
|
|
func ExitCode(err error) int {
|
|
if err == nil {
|
|
return 0
|
|
}
|
|
var fe *FlagError
|
|
if errors.As(err, &fe) {
|
|
return 2
|
|
}
|
|
if errors.Is(err, SilentError) {
|
|
return 1
|
|
}
|
|
if matchCode(err, CodeInputConfirmationRequired) {
|
|
return 10
|
|
}
|
|
if IsAuthError(err) {
|
|
return 3
|
|
}
|
|
if IsNotFound(err) {
|
|
return 4
|
|
}
|
|
if matchPrefix(err, "input.") {
|
|
return 5
|
|
}
|
|
if matchCode(err, CodeServerRateLimited) {
|
|
return 6
|
|
}
|
|
if matchPrefix(err, "server.") || matchPrefix(err, "network.") {
|
|
return 7
|
|
}
|
|
return 1
|
|
}
|
|
|
|
// PrintError writes err to w in human-readable form. The envelope-aware
|
|
// JSON formatter is in `internal/format`; this helper is the human path used
|
|
// when no command produced its own output.
|
|
//
|
|
// Typed *Error values surface their Hint as a second line so users see the
|
|
// actionable next-step (matches envelope.error.hint visibility in --json).
|
|
// Falls through to defaultHint when caller didn't set one.
|
|
func PrintError(w io.Writer, err error) {
|
|
if err == nil || errors.Is(err, SilentError) {
|
|
return
|
|
}
|
|
fmt.Fprintln(w, err.Error())
|
|
var typed *Error
|
|
if errors.As(err, &typed) {
|
|
hint := typed.Hint
|
|
if hint == "" {
|
|
hint = defaultHint(typed.Code)
|
|
}
|
|
if hint != "" {
|
|
fmt.Fprintf(w, "hint: %s\n", hint)
|
|
}
|
|
}
|
|
}
|
|
|
|
// PrintErrorEnvelope writes err as a JSON envelope on w. Used in agent mode /
|
|
// --json / --format=json output so failures stay machine-parseable. When the
|
|
// error carries an OperationRisk (destructive write paths), it's surfaced as
|
|
// the envelope-level Risk field so agents can decide whether to surface the
|
|
// failure differently to the user.
|
|
func PrintErrorEnvelope(w io.Writer, err error) {
|
|
if err == nil || errors.Is(err, SilentError) {
|
|
return
|
|
}
|
|
env := format.Failure(ToErrorBody(err))
|
|
if r := operationRiskOf(err); r != nil {
|
|
env.Risk = &format.Risk{Level: format.RiskLevel(r.Level), Action: r.Action}
|
|
}
|
|
_ = format.WriteEnvelope(w, env)
|
|
}
|
|
|
|
// operationRiskOf extracts an OperationRisk from a typed *Error chain, or nil.
|
|
func operationRiskOf(err error) *OperationRisk {
|
|
var typed *Error
|
|
if errors.As(err, &typed) {
|
|
return typed.OperationRisk
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ToErrorBody projects err into the canonical envelope ErrorBody. Exposed so
|
|
// other emit paths (planned: MCP) reuse the same projection rather than
|
|
// reimplementing the typed-error → wire-shape mapping.
|
|
func ToErrorBody(err error) *format.ErrorBody {
|
|
if err == nil {
|
|
return nil
|
|
}
|
|
body := &format.ErrorBody{Message: err.Error()}
|
|
var typed *Error
|
|
if errors.As(err, &typed) {
|
|
body.Code = string(typed.Code)
|
|
body.Message = typed.Message
|
|
body.Hint = typed.Hint
|
|
if body.Hint == "" {
|
|
body.Hint = defaultHint(typed.Code)
|
|
}
|
|
body.Retryable = typed.Retryable
|
|
// Surface the wrapped cause so agents see the actual server / SDK
|
|
// error string, not just the wrap message ("hybrid search"). Stripe's
|
|
// envelope does the same — the human's printed line and the JSON
|
|
// envelope both end with the underlying problem.
|
|
if typed.Cause != nil {
|
|
body.Message = typed.Message + ": " + typed.Cause.Error()
|
|
}
|
|
return body
|
|
}
|
|
var fe *FlagError
|
|
if errors.As(err, &fe) {
|
|
body.Code = string(CodeInputInvalidArgument)
|
|
return body
|
|
}
|
|
// Unclassified error; consumers see the message but no stable code.
|
|
body.Code = string(CodeServerError)
|
|
return body
|
|
}
|
|
|
|
// defaultHint returns a canonical actionable hint for known error codes when
|
|
// the call site didn't set one. Spec §1.4 zero-config matrix mandates
|
|
// `auth.unauthenticated` envelopes carry "run weknora auth login" — this
|
|
// fallback covers the broad surface (auth status / kb list / kb get / search)
|
|
// without per-command hint plumbing.
|
|
//
|
|
// Empty string for codes without a stable canonical hint.
|
|
func defaultHint(code ErrorCode) string {
|
|
switch code {
|
|
case CodeAuthUnauthenticated, CodeAuthBadCredential:
|
|
return "run `weknora auth login`"
|
|
case CodeAuthTokenExpired:
|
|
return "your session expired; run `weknora auth login` to re-authenticate"
|
|
case CodeAuthForbidden:
|
|
return "active context lacks permission for this resource"
|
|
case CodeAuthCrossTenantBlocked, CodeAuthTenantMismatch:
|
|
return "verify tenant context with `weknora auth status`"
|
|
case CodeNetworkError:
|
|
return "check base URL reachability with `weknora doctor`"
|
|
case CodeServerIncompatibleVersion:
|
|
return "run `weknora doctor` to see version skew details"
|
|
case CodeServerRateLimited:
|
|
return "rate-limited; retry after a few seconds"
|
|
case CodeServerTimeout:
|
|
return "request timed out; retry, or run `weknora doctor` to check connectivity"
|
|
case CodeResourceNotFound:
|
|
return "verify the resource ID; list available with `weknora kb list`"
|
|
case CodeInputInvalidArgument, CodeInputMissingFlag:
|
|
return "see `weknora <command> --help` for valid usage"
|
|
case CodeInputConfirmationRequired:
|
|
return "high-risk write — re-run with -y/--yes after the user explicitly approves"
|
|
case CodeLocalKeychainDenied:
|
|
return "verify keyring access; falls back to file storage"
|
|
case CodeLocalConfigCorrupt:
|
|
return "remove ~/.config/weknora/config.yaml and re-run `weknora auth login`"
|
|
case CodeLocalFileIO:
|
|
return "check file permissions under $XDG_CONFIG_HOME/weknora/"
|
|
case CodeKBIDRequired:
|
|
return "run `weknora link` to bind this directory to a knowledge base, or pass --kb"
|
|
case CodeKBNotFound:
|
|
return "list available with `weknora kb list`"
|
|
case CodeProjectLinkCorrupt:
|
|
return "remove .weknora/project.yaml and run `weknora link` again"
|
|
case CodeUserAborted:
|
|
return "no action taken; pass -y/--yes to skip the confirmation prompt"
|
|
case CodeUploadFileNotFound:
|
|
return "verify the path is correct and readable"
|
|
case CodeSSEStreamAborted:
|
|
return "the streaming answer was cut off mid-flight; retry, or pass --no-stream to buffer the full response"
|
|
case CodeSessionCreateFailed:
|
|
return "could not create a chat session; pass --session-id to reuse an existing session"
|
|
}
|
|
return ""
|
|
}
|