2ee9741fa1
Post-review polish on the v0.7 wire / surface contract. Bundles five
follow-ups that landed after the main BREAKING feat commit:
1. Complete context→profile cascade (internal API + YAML schema)
The prior commit renamed only the user-visible surface (commands /
flags / env / project link / envelope field). The internal Go API
and on-disk config schema were still half-renamed — an L-25
self-consistency violation flagged by post-merge review. Closed here:
Internal Go API:
- config.Context → config.Profile
- config.Config.CurrentContext → CurrentProfile
- config.Config.Contexts → Profiles
- LoginOptions.Context → LoginOptions.Profile
- clearContextSecrets() → clearProfileSecrets()
- saveContextRef() → saveProfileRef()
- secrets.Store: param name `context` → `profile` (interface +
FileStore + KeyringStore + MemStore)
- cmdutil.LoadSecret(store, context, key) → LoadSecret(store, profile, key)
- cmdutil.RefreshAndPersist's ctxName → profileName
- Local var `ctx := &config.Profile{...}` → `prof := &config.Profile{...}`
in auth/login.go to eliminate the visual collision with Go stdlib
context.Context that motivated the whole rename in the first place.
On-disk config.yaml schema:
- current_context: → current_profile:
- contexts: → profiles:
- Pre-1.0 break, no compat alias. Users on v0.6 dogfooded configs
must delete ~/.config/weknora/config.yaml or hand-rename the two
keys (CHANGELOG migration note added).
Tests / fixtures / golden files:
- factory_test.go YAML fixture + assertion updated.
- acceptance/e2e/e2e_test.go writeContextYAML → writeProfileYAML,
fixture YAML keys updated.
- acceptance/testdata/wire/doctor.error_network.json golden updated
("active context" → "active profile" in hint string).
User-visible prose sweep:
- cmd/mcp/serve.go --help Long: "active context (or --context)" →
"active profile (or --profile)" — most-visible miss.
- cmd/{kb/list, search/kb, session/list, api/api} Short/Long help.
- cmd/auth/login.go stdout: `(context=%s)` → `(profile=%s)`.
- cmd/auth/logout.go error: `"no current context"` → `"no current profile"`.
- cmd/doctor/doctor.go hint string (also the wire golden above).
- cmd/auth/refresh.go error: `"refresh token missing for context"` →
`"refresh token missing for profile"`.
- README.md: `## Multi-context` H2 → `## Multi-profile`; code-block
comment `# current context` → `# current profile`.
Code-comment / docstring sweep across cli/cmd/auth/ and
cli/internal/cmdutil/. Comments referencing Go stdlib context.Context,
the RAG / LLM "context window" concept, and historical CHANGELOG
entries for v0.4 / v0.5 were left alone.
CHANGELOG v0.7 BREAKING entry gains the on-disk-schema bullet under
the existing "context → profile" item.
2. Profile name validation (shell-injection guard)
`envelope.error.retry_command` is a single shell-string field. An
AI agent that exec()s it via `sh -c <retry_command>` was injectable
through a maliciously-named profile:
weknora auth logout --name 'x; rm -rf ~'
# would produce: retry_command = "weknora auth logout --name x; rm -rf ~ -y"
`cmd/profile/add.go` already enforced an alphanumeric + `-_.`
allowlist via `validateName`. The `auth login` and `auth logout`
paths bypassed it.
- Moved validation from `cmd/profile/add.go` to
`cli/internal/cmdutil/profilename.go` as exported
`ValidateProfileName` (cmdutil is the import-cycle-safe home;
internal/config can't depend on cmdutil).
- `auth login` runs the validator before any persist call.
- `auth logout` runs the validator on `opts.Name` before
constructing `retry_command`.
- Unit tests (`profilename_test.go`) cover the allowlist, empty
rejection, path-traversal, shell metacharacters (`;`, `&`, `|`,
`$()`, backticks, quotes, whitespace, glob, redirects), and the
user-facing hint text. The shell-metachar test exists as a
regression guard.
Wire shape (`retry_command` string → `retry_command_argv []string`)
remains a v0.8 additive change per ROADMAP — this fix removes the
practical exploit path without touching the wire contract.
3. AI-agent terminology disambiguation
"agent" has three referents in this codebase: (a) WeKnora's
server-side Custom Agent resource, (b) the removed `agent invoke`
verb, (c) external LLM/automation consumers. Per project memory
feedback_no_meta_disambiguation_in_docs, the fix is full-term
naming, not "X has N meanings" prose. Surgical changes at section
headers + ambiguous prose:
- AGENTS.md: "Agent decision shortcuts" → "AI agent decision
shortcuts"; "agent-callable surface" → "AI-agent-callable
surface".
- README.md: "Designed to be agent-first" → "AI-agent-first";
"Other agent ergonomics" → "Other AI-agent ergonomics"; "in
agent contexts" → "in AI-agent contexts"; "for CI / agents" →
"for CI / AI agents".
Anaphoric "agents" inside paragraphs that already established
"AI agents" was left alone — full substitution everywhere would
have been prose noise without clarity gain.
4. Wire-contract review follow-ups
Real findings from a second-pass review of the v0.7 envelope /
streaming / surface design. Per project memory
feedback_check_in_domain_anchor_first, candidate findings were
first verified against the in-domain peer CLI explicitly cited as
the envelope anchor; two earlier-flagged issues turned out to be
in-pattern and were withdrawn.
Surviving fixes:
- AGENTS.md success-envelope example rewritten. The prior example
showed `has_more: false` / `_notice: {}` as if they were always
present, but both fields are `omitempty` and never serialize
when zero / nil. Replaced with three realistic shapes (list /
single resource / mutation with no payload) and added a note
that optional fields are omitted when empty.
- cmd/chat/chat.go Args: MinimumNArgs(1) → ExactArgs(1).
v0.6 silently joined `weknora chat hello world` into
`"hello world"`. v0.7 now rejects multi-arg with exit 2,
matching `weknora session ask`. BREAKING; CHANGELOG entry
added under v0.7 BREAKING.
- internal/output/envelope.go extracts NewEnvelope(data, meta,
profile) constructor. The jq-filter path in
cmdutil.FormatOptions.Emit was manually rebuilding the
envelope literal alongside the canonical WriteEnvelope path —
drift risk when fields are added. Single construction point now.
- internal/cmdutil/factory.go adds AddKBFlag(cmd) helper.
Five files (chat, doc/list, doc/upload, doc/create, doc/fetch)
had verbatim-identical `cmd.Flags().String("kb", ...)`
declarations. Centralised so flag name + help text stay
in sync with Factory.ResolveKB. Docstring reordering + gofmt
fixup landed in the same edit to keep ResolveKB's own godoc
attached to its function.
5. OSS-readiness comment / doc sweep
Pre-publication scrub of code, comments, and shipped Markdown to
remove references that only make sense in the development repo:
- AGENTS.md "Deliberate deviations + mainstream alignments"
section: removed peer-project name-drops from the comparison
table; rewrote as five flagged design decisions with rationale
but no specific competitor named. The four rows that previously
contrasted against a named peer CLI now state WeKnora's choice
+ rationale directly. Section header renamed to "Design
decisions worth flagging" since it is no longer a
deviation/alignment matrix.
- CHANGELOG v0.7 BREAKING rationales: three references to a
named peer CLI removed; the context→profile rationale now
cites only mainstream multi-credential CLIs by category (AWS /
Stripe / OpenAI / Anthropic), and the `api -d/--data` removal
rationale cites only `gh api` / `curl`. `chat` BREAKING entry
rationale similarly simplified.
- 35 cross-references to design-spec section numbers (§4.1 /
§4.5 / §5.3 etc.) removed from Go doc comments and test
comments across 13 files. The referenced spec lives outside
the shipped tree; readers of the public repo cannot resolve
them. Each reference replaced with a self-contained semantic
description (e.g. "the batch envelope" / "AGENTS.md section
on the success path").
- Mixed-language strings translated to English:
- Four Go comments: internal/cmdutil/exit.go:213,215,
internal/cmdutil/errors.go:156,
internal/output/batch_test.go:90,
internal/output/envelope_test.go:27.
- One CHANGELOG section title:
`v0.7 — Agent-first wire contract + 命令面集中清理` →
`... + command-surface cleanup`.
- CJK test fixtures (internal/text/truncate_test.go CJK
truncation cases, cmd/session/list_test.go Chinese session
title, acceptance/e2e/e2e_test.go Chinese RAG corpus)
retained — they are intentional test inputs, not stray prose.
- Makefile help comment: `golangci-lint added in PR-9` →
`golangci-lint planned`. Internal PR numbering should not
surface in shipped Makefile prose.
Build green, 28/28 packages, +5 new ValidateProfileName tests.
go vet / gofmt / go mod verify / go mod tidy all clean.
Rationale for the cascade: pre-1.0 is the cheapest moment to close
L-25 self-consistency (L-26). The half-finished internal rename
would have perpetuated the very `context` vs `context.Context`
ambiguity that motivated v0.7's user-visible rename in the first
place.
228 lines
8.1 KiB
Go
228 lines
8.1 KiB
Go
package cmdutil
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/output"
|
|
)
|
|
|
|
// globalFormatMode tracks the resolved --format value for the current invocation.
|
|
// Set by cmd/root.go in PersistentPreRunE; used by PrintError to choose text vs envelope.
|
|
var globalFormatMode string
|
|
|
|
// SetFormatMode records the resolved --format mode for the current invocation.
|
|
// Called by cmd/root.go PersistentPreRunE after FormatOptions.ResolveDefault.
|
|
func SetFormatMode(mode string) {
|
|
globalFormatMode = mode
|
|
}
|
|
|
|
// globalProfile tracks the resolved profile name for the current invocation.
|
|
// Set by cmd/root.go in PersistentPreRunE via SetProfile; read by Emit and
|
|
// init events to populate envelope.profile / NDJSON init.profile.
|
|
var globalProfile string
|
|
|
|
// SetProfile records the resolved profile name for the current invocation.
|
|
// Called by cmd/root.go PersistentPreRunE after SetFormatMode.
|
|
func SetProfile(name string) { globalProfile = name }
|
|
|
|
// GetProfile returns the profile name recorded for the current invocation.
|
|
// Empty string when nothing is configured (omitempty fields suppress the field).
|
|
func GetProfile() string { return globalProfile }
|
|
|
|
// ExitCode maps an error to the documented CLI exit code.
|
|
// - 0 success
|
|
// - 1 generic / unknown typed error - fallback bucket: resource.already_exists,
|
|
// resource.locked, local.*, mcp.*, operation.failed, server.session_create_failed
|
|
// (workflow-level, see special case below), and any code outside the named
|
|
// buckets below
|
|
// - 2 cobra-parse problem (unrecognised flag, arg-count violation) —
|
|
// typed input.unknown_subcommand from the guard maps to exit 5
|
|
// (input.* bucket); only ungated cobra prose lands here
|
|
// - 3 auth.*
|
|
// - 4 resource.not_found
|
|
// - 5 input.* (other than confirmation_required)
|
|
// - 6 server.rate_limited
|
|
// - 7 server.* (other than rate_limited/session_create_failed) / network.*
|
|
// - 10 input.confirmation_required - high-risk write needs explicit -y
|
|
// (see cli/README.md)
|
|
// - 124 operation.timeout - CLI-level wait/poll exhausted its --timeout window
|
|
// (matches the convention from GNU `timeout`)
|
|
// - 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
|
|
}
|
|
// server.session_create_failed is a workflow-level failure (the hint
|
|
// asks the caller to pass --session, not to retry with backoff), so it
|
|
// falls through to exit 1 rather than the server.* transient bucket.
|
|
if matchCode(err, CodeSessionCreateFailed) {
|
|
return 1
|
|
}
|
|
if matchPrefix(err, "server.") || matchPrefix(err, "network.") {
|
|
return 7
|
|
}
|
|
if matchCode(err, CodeOperationTimeout) {
|
|
return 124
|
|
}
|
|
return 1
|
|
}
|
|
|
|
// PrintError writes err to w (typically stderr) in dual mode:
|
|
// - text: code: msg\nhint: ...\nretry: ...
|
|
// - json/ndjson: {ok:false, error:{...}, _notice?:...}
|
|
//
|
|
// Mode is read from globalFormatMode (set by root PersistentPreRunE).
|
|
func PrintError(w io.Writer, err error) {
|
|
if err == nil || errors.Is(err, SilentError) {
|
|
return
|
|
}
|
|
// Typed *Error with Silent=true suppresses stderr emit while preserving
|
|
// the Code for ExitCode. Used by batch paths that already wrote per-item
|
|
// detail to stdout (cmdutil.RunBatch) — emitting a summary envelope on
|
|
// stderr would duplicate the failure signal.
|
|
if typed := AsError(err); typed != nil && typed.Silent {
|
|
return
|
|
}
|
|
|
|
if globalFormatMode == "json" || globalFormatMode == "ndjson" {
|
|
printErrorEnvelope(w, err)
|
|
return
|
|
}
|
|
printErrorProse(w, err)
|
|
}
|
|
|
|
func printErrorProse(w io.Writer, err error) {
|
|
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)
|
|
}
|
|
retry := typed.RetryCommand
|
|
if retry == "" {
|
|
retry = defaultRetryCommand(typed.Code)
|
|
}
|
|
if retry != "" {
|
|
fmt.Fprintf(w, "retry: %s\n", retry)
|
|
}
|
|
}
|
|
}
|
|
|
|
func printErrorEnvelope(w io.Writer, err error) {
|
|
_ = output.WriteErrorEnvelope(w, ErrorToDetail(err), false)
|
|
}
|
|
|
|
// defaultHint returns a canonical actionable hint for known error codes
|
|
// when the call site didn't set one. `auth.unauthenticated` always points
|
|
// at `weknora auth login` - covers the broad surface (auth status / kb
|
|
// list / kb view / 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 profile lacks permission for this resource"
|
|
case CodeAuthCrossTenantBlocked, CodeAuthTenantMismatch:
|
|
return "verify tenant profile 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 and try again"
|
|
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 --format json to buffer the full response"
|
|
case CodeSessionCreateFailed:
|
|
return "could not create a chat session; pass --session to reuse an existing session"
|
|
case CodeOperationTimeout:
|
|
return "wait timed out; raise --timeout or check the underlying job"
|
|
case CodeOperationCancelled:
|
|
return "operation cancelled by signal (Ctrl-C / SIGTERM)"
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// defaultRetryCommand returns canonical retry argv for known codes.
|
|
// Empty string for codes without a stable canonical retry.
|
|
// Symmetric counterpart to defaultHint.
|
|
func defaultRetryCommand(code ErrorCode) string {
|
|
switch code {
|
|
case CodeAuthUnauthenticated, CodeAuthBadCredential, CodeAuthTokenExpired:
|
|
return "weknora auth login"
|
|
case CodeKBIDRequired:
|
|
return "weknora link"
|
|
case CodeNetworkError, CodeServerTimeout:
|
|
return "weknora doctor"
|
|
case CodeProjectLinkCorrupt:
|
|
return "weknora link" // re-bind the project to a KB
|
|
case CodeLocalConfigCorrupt:
|
|
// Recovery is two steps (delete config + re-login); the prose hint
|
|
// already spells it out, so the retry argv stays empty.
|
|
return ""
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// DefaultHint and DefaultRetryCommand are exported wrappers so that
|
|
// cross-package callers (MCP handlers, batch envelope helpers) can
|
|
// resolve hint/retry without duplicating the typed-code → string table.
|
|
// Avoids drift between cmdutil and copies elsewhere.
|
|
func DefaultHint(code ErrorCode) string { return defaultHint(code) }
|
|
func DefaultRetryCommand(code ErrorCode) string { return defaultRetryCommand(code) }
|