5adcedf170
Cross-cutting findings surfaced by the branch-completion review. Perf bug: - Factory.Client closure was not memoized. Factory.ResolveKB internally calls f.Client() to resolve --kb name → id, then the command's RunE calls f.Client() again. Two SDK clients, two keyring reads, two AuthRetryTransport allocations per name-resolved invocation, with *independent* token state (a refresh in one was invisible to the other). Switched to sync.Once like Secrets already does. Silent bug bait: - cmdutil.NormalizeHost docstring claimed CodeInputMissingFlag for the empty case; code returned CodeInputInvalidArgument. Aligned doc to code (present-but-empty is a bad value, not a missing flag). Agent contract gaps: - Five user-facing subcommands lacked SetAgentHelp: auth login / logout / list / status and chat. Added concise strings with error- code call-outs so agents can branch without parsing human strings. Helper extraction (≥3 callers): - text.KnowledgeDisplayName(fileName, title, id) — byte-identical formatter that was in both cmd/doc/list.go and cmd/search/docs.go. Takes fields directly so internal/text stays SDK-free. - cmdutil.WrapHTTP(cause, fmt, args...) *Error — replaces the `Wrapf(ClassifyHTTPError(err), err, ...)` pattern across 24 SDK call sites. Sed-driven migration; off-pattern shapes in chat.go (used streamErr) and cmdutil/kb.go (in-package) hand-edited. Contract test gains a comment update: post-migration the dominant pattern is WrapHTTP which the AST scanner skips entirely (only NewError/Wrapf selectors inspected); ClassifyHTTPErrorOutputs() bridge still covers the dynamic codes those paths can yield. UX consistency: - cmd/doc/list.go --page-size help now reads "Items per page (1..1000)" matching cmd/session/list.go. The bounds validation already enforced 1..1000; the help text was the last drift. Comment-discipline sweep: - Deleted the WHAT-only "*Options captures `weknora ...` flag state" docstring across 23 files (context, kb, auth, doc, session, search, chat, doctor, link). Where the line carried a real WHY clause (kb/delete, doc/delete, session/delete, kb/edit), kept the WHY and dropped only the leading WHAT phrase. - Stripped third-party project-name attribution from inline comments and one user-visible flag-help string across ~40 files in cli/cmd and cli/internal (plus 4 test-file comments). Removed phrases like "Mirrors `gh X`", "borrowed from lark-cli", "kubectl-style", "gcloud `--project`", "Stripe pattern", and the embedded GitHub URLs pointing at those projects. Behavioral descriptions and the WHY behind each comment are preserved; only the upstream-name attribution is gone. Inspiration / north-star references belong in cli/AGENTS.md (the design doc) and commit messages, not scattered through every file. Triggered by an audit round that surfaced several false / fragile parity claims (e.g. "Mirrors `gh repo edit`" — gh repo edit has no --name flag; "matches gcloud `--project` id-or-name" — gcloud's --project accepts ID only). Rather than fix them one by one, the whole category of in-comment external-project references was stripped uniformly.
84 lines
2.3 KiB
Go
84 lines
2.3 KiB
Go
package compat
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
// Level is the client-server version compat level.
|
|
type Level int
|
|
|
|
const (
|
|
OK Level = iota // 兼容
|
|
SoftWarn // 服务器旧, 部分新功能不可用
|
|
HardError // 不兼容, 需升级 CLI 或 server
|
|
)
|
|
|
|
func (l Level) String() string {
|
|
switch l {
|
|
case OK:
|
|
return "ok"
|
|
case SoftWarn:
|
|
return "soft_warn"
|
|
case HardError:
|
|
return "hard_error"
|
|
}
|
|
return "unknown"
|
|
}
|
|
|
|
// Compat compares client/server version. v0.x 阶段允许漂移:
|
|
//
|
|
// 同 major, client minor ≤ server minor → OK
|
|
// 同 major, client minor > server minor → SoftWarn (server 旧, 部分新功能不可用)
|
|
// 不同 major → HardError
|
|
// 字符串 unparseable → OK (容错, 不阻塞)
|
|
// "(unknown)" / "" → OK (dev build / server 字段缺失)
|
|
func Compat(serverVer, cliVer string) (Level, string) {
|
|
sMaj, sMin, ok := parseSemver(serverVer)
|
|
if !ok {
|
|
return OK, ""
|
|
}
|
|
cMaj, cMin, ok := parseSemver(cliVer)
|
|
if !ok {
|
|
return OK, ""
|
|
}
|
|
if sMaj != cMaj {
|
|
return HardError, fmt.Sprintf("incompatible: client %s vs server %s — upgrade required", cliVer, serverVer)
|
|
}
|
|
if cMin > sMin {
|
|
return SoftWarn, fmt.Sprintf("server is older (server %s, client %s); some new features may be unavailable", serverVer, cliVer)
|
|
}
|
|
return OK, ""
|
|
}
|
|
|
|
// parseSemver extracts (major, minor) from "X.Y.Z" or "X.Y.Z-suffix".
|
|
// Accepts the leading "v" common in `git describe` output and Tencent/WeKnora
|
|
// tag conventions ("v0.1.0"), since both server `/system/info.version` and
|
|
// the CLI's own ldflags-injected build.Version may carry it.
|
|
// Returns ok=false 当字符串无法识别 (空 / "(unknown)" / 非数字)。
|
|
func parseSemver(s string) (major, minor int, ok bool) {
|
|
if s == "" || s == "(unknown)" {
|
|
return 0, 0, false
|
|
}
|
|
// 接受 "v" 前缀:git describe + Tencent tag 都带 v
|
|
s = strings.TrimPrefix(s, "v")
|
|
// 去掉 prerelease/build metadata
|
|
if i := strings.IndexAny(s, "-+"); i >= 0 {
|
|
s = s[:i]
|
|
}
|
|
parts := strings.SplitN(s, ".", 3)
|
|
if len(parts) < 2 {
|
|
return 0, 0, false
|
|
}
|
|
maj, err := strconv.Atoi(parts[0])
|
|
if err != nil {
|
|
return 0, 0, false
|
|
}
|
|
min, err := strconv.Atoi(parts[1])
|
|
if err != nil {
|
|
return 0, 0, false
|
|
}
|
|
return maj, min, true
|
|
}
|