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.
252 lines
8.4 KiB
Go
252 lines
8.4 KiB
Go
//go:build acceptance_e2e
|
|
|
|
// Package e2e_test drives the WeKnora CLI binary against a real running
|
|
// server to validate the RAG closing loop end-to-end.
|
|
//
|
|
// Build tag isolation: //go:build acceptance_e2e excludes this file from
|
|
// the default `go test ./...` so the e2e suite only runs when explicitly
|
|
// requested. To run:
|
|
//
|
|
// cd cli
|
|
// WEKNORA_E2E_HOST=https://kb.example.com \
|
|
// WEKNORA_E2E_TOKEN=eyJhbGc... \
|
|
// go test -tags=acceptance_e2e -v ./acceptance/e2e/...
|
|
//
|
|
// Optional WEKNORA_E2E_KB_NAME_PREFIX customizes the throwaway KB name (default
|
|
// "cli-e2e-"). Cleanup runs even on test failure via t.Cleanup so the server
|
|
// doesn't accumulate test debris.
|
|
package e2e_test
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
// TestRAGFullLoop walks the demo MVP path: link a profile, create a KB,
|
|
// upload a doc, wait for indexing, search it, then chat against it. Each
|
|
// step parses the CLI's bare JSON to extract IDs for the next step -
|
|
// validating both functional behavior and wire-contract stability.
|
|
func TestRAGFullLoop(t *testing.T) {
|
|
host := mustEnv(t, "WEKNORA_E2E_HOST")
|
|
token := mustEnv(t, "WEKNORA_E2E_TOKEN")
|
|
prefix := envOr("WEKNORA_E2E_KB_NAME_PREFIX", "cli-e2e-")
|
|
|
|
bin := buildBinary(t)
|
|
xdg := t.TempDir()
|
|
writeProfileYAML(t, xdg, host, token)
|
|
|
|
env := append(os.Environ(),
|
|
"XDG_CONFIG_HOME="+xdg,
|
|
"XDG_CACHE_HOME="+filepath.Join(xdg, "cache"),
|
|
// SDK debug off - explicit so the CI run isn't noisy.
|
|
"WEKNORA_LOG_LEVEL=error",
|
|
)
|
|
|
|
// 1. kb create → bare KnowledgeBase object
|
|
kbName := prefix + fmt.Sprintf("%d", time.Now().UnixNano())
|
|
var created struct {
|
|
ID string `json:"id"`
|
|
Name string `json:"name"`
|
|
}
|
|
runJSONInto(t, bin, env, &created, "kb", "create", kbName, "--format", "json")
|
|
if created.ID == "" {
|
|
t.Fatalf("kb create returned no id")
|
|
}
|
|
t.Logf("created KB: %s (%s)", created.ID, kbName)
|
|
|
|
t.Cleanup(func() {
|
|
// Best-effort cleanup; a 404 means the KB was already gone.
|
|
out, err := run(bin, env, "kb", "delete", created.ID, "-y", "--format", "json")
|
|
if err != nil {
|
|
t.Logf("cleanup kb delete: %v\n%s", err, out)
|
|
}
|
|
})
|
|
|
|
// 2. doc upload → bare Knowledge object
|
|
docPath := writeSampleDoc(t)
|
|
var uploaded struct {
|
|
ID string `json:"id"`
|
|
}
|
|
runJSONInto(t, bin, env, &uploaded, "doc", "upload", docPath, "--kb", created.ID, "--format", "json")
|
|
if uploaded.ID == "" {
|
|
t.Fatalf("doc upload returned no id")
|
|
}
|
|
t.Logf("uploaded doc: %s", uploaded.ID)
|
|
|
|
// 3. poll until indexing finishes (status changes from "pending" / "processing" to "ready" / similar)
|
|
waitDocReady(t, bin, env, created.ID, uploaded.ID, 90*time.Second)
|
|
|
|
// 4. search chunks → bare []SearchResult
|
|
var results []map[string]any
|
|
runJSONInto(t, bin, env, &results, "search", "chunks", "sample", "--kb", created.ID, "--limit", "5", "--format", "json")
|
|
if len(results) == 0 {
|
|
t.Fatalf("search returned no results")
|
|
}
|
|
t.Logf("search returned %d results", len(results))
|
|
|
|
// 5. chat --format json → bare {answer, references, ...} object
|
|
var chat struct {
|
|
Answer string `json:"answer"`
|
|
References []map[string]any `json:"references"`
|
|
}
|
|
runJSONInto(t, bin, env, &chat, "chat", "summarize the document briefly", "--kb", created.ID, "--format", "json")
|
|
if strings.TrimSpace(chat.Answer) == "" {
|
|
t.Fatalf("chat returned empty answer")
|
|
}
|
|
t.Logf("chat answer (%d chars), %d references", len(chat.Answer), len(chat.References))
|
|
if len(chat.References) == 0 {
|
|
// Soft warning - some servers may not surface references for every
|
|
// question, but the demo flow is supposed to.
|
|
t.Logf("warning: chat returned 0 references (server may have a different config)")
|
|
}
|
|
}
|
|
|
|
func mustEnv(t *testing.T, key string) string {
|
|
t.Helper()
|
|
v := os.Getenv(key)
|
|
if v == "" {
|
|
t.Skipf("e2e: %s not set; skipping (set the env var or run `gh workflow run cli-e2e.yml`)", key)
|
|
}
|
|
return v
|
|
}
|
|
|
|
func envOr(key, fallback string) string {
|
|
if v := os.Getenv(key); v != "" {
|
|
return v
|
|
}
|
|
return fallback
|
|
}
|
|
|
|
// buildBinary compiles the CLI to a temp dir once per test run. Re-using a
|
|
// single binary across sub-cases avoids the multi-second linker cost on each
|
|
// step and matches gh acceptance/ build behavior.
|
|
func buildBinary(t *testing.T) string {
|
|
t.Helper()
|
|
dir := t.TempDir()
|
|
out := filepath.Join(dir, "weknora")
|
|
// Repo layout: this test sits at cli/acceptance/e2e/, so cli/ is two levels up.
|
|
cmd := exec.Command("go", "build", "-o", out, ".")
|
|
cmd.Dir = filepath.Join("..", "..")
|
|
cmd.Stdout = os.Stderr
|
|
cmd.Stderr = os.Stderr
|
|
if err := cmd.Run(); err != nil {
|
|
t.Fatalf("build cli: %v", err)
|
|
}
|
|
return out
|
|
}
|
|
|
|
// writeProfileYAML drops a minimal config.yaml into XDG_CONFIG_HOME so the
|
|
// CLI finds a profile without needing `weknora profile add` (which prompts
|
|
// in interactive scenarios). Tests using `auth login` belong to a different
|
|
// suite; here we go straight to authenticated calls.
|
|
func writeProfileYAML(t *testing.T, xdg, host, token string) {
|
|
t.Helper()
|
|
dir := filepath.Join(xdg, "weknora")
|
|
if err := os.MkdirAll(dir, 0o700); err != nil {
|
|
t.Fatalf("mkdir xdg: %v", err)
|
|
}
|
|
yaml := fmt.Sprintf(`current_profile: e2e
|
|
profiles:
|
|
- name: e2e
|
|
host: %s
|
|
token: %s
|
|
`, host, token)
|
|
if err := os.WriteFile(filepath.Join(dir, "config.yaml"), []byte(yaml), 0o600); err != nil {
|
|
t.Fatalf("write config: %v", err)
|
|
}
|
|
}
|
|
|
|
// writeSampleDoc emits a small bilingual doc that gives the embedder enough
|
|
// signal for retrieval but stays tiny so indexing finishes within the poll
|
|
// window.
|
|
func writeSampleDoc(t *testing.T) string {
|
|
t.Helper()
|
|
content := `WeKnora E2E Sample Document
|
|
|
|
This sample document is used by the WeKnora CLI acceptance test suite to
|
|
validate the end-to-end retrieval-augmented generation pipeline.
|
|
|
|
向量检索的核心思想是把文本通过 embedding 模型映射到高维向量空间,然后通过余弦相似度
|
|
等度量找出语义最接近的内容片段。WeKnora 支持 vector + keyword 的混合检索模式。
|
|
|
|
The hybrid search mode combines vector similarity (semantic) with keyword
|
|
matching (lexical) to balance recall and precision.
|
|
`
|
|
dir := t.TempDir()
|
|
p := filepath.Join(dir, "sample.txt")
|
|
if err := os.WriteFile(p, []byte(content), 0o600); err != nil {
|
|
t.Fatalf("write sample: %v", err)
|
|
}
|
|
return p
|
|
}
|
|
|
|
// waitDocReady polls `doc list` until the uploaded document's status indicates
|
|
// indexing is complete. WeKnora server uses a few status values across versions
|
|
// ("ready", "completed", "ok") - accept any non-pending/non-processing/non-failed
|
|
// state so we don't break on a server-side rename. Failed status fails the test
|
|
// fast.
|
|
func waitDocReady(t *testing.T, bin string, env []string, kbID, docID string, timeout time.Duration) {
|
|
t.Helper()
|
|
deadline := time.Now().Add(timeout)
|
|
tick := 2 * time.Second
|
|
for time.Now().Before(deadline) {
|
|
var docs []struct {
|
|
ID string `json:"id"`
|
|
ParseStatus string `json:"parse_status"`
|
|
}
|
|
runJSONInto(t, bin, env, &docs, "doc", "list", "--kb", kbID, "--page-size", "100", "--format", "json")
|
|
for _, d := range docs {
|
|
if d.ID != docID {
|
|
continue
|
|
}
|
|
low := strings.ToLower(d.ParseStatus)
|
|
switch {
|
|
case low == "failed", low == "error":
|
|
t.Fatalf("doc %s indexing failed: status=%q", docID, d.ParseStatus)
|
|
case low == "pending", low == "processing", low == "":
|
|
// keep waiting
|
|
default:
|
|
t.Logf("doc %s ready (status=%q)", docID, d.ParseStatus)
|
|
return
|
|
}
|
|
}
|
|
time.Sleep(tick)
|
|
}
|
|
t.Fatalf("doc %s did not reach ready within %s", docID, timeout)
|
|
}
|
|
|
|
// run executes the CLI and returns combined stdout. Errors include stderr +
|
|
// exit code so failures are debuggable without re-running.
|
|
func run(bin string, env []string, args ...string) ([]byte, error) {
|
|
cmd := exec.Command(bin, args...)
|
|
cmd.Env = env
|
|
var stdout, stderr bytes.Buffer
|
|
cmd.Stdout = &stdout
|
|
cmd.Stderr = &stderr
|
|
if err := cmd.Run(); err != nil {
|
|
return stdout.Bytes(), fmt.Errorf("%s %s: %v\nstderr:\n%s", filepath.Base(bin), strings.Join(args, " "), err, stderr.String())
|
|
}
|
|
return stdout.Bytes(), nil
|
|
}
|
|
|
|
// runJSONInto runs the CLI expecting bare JSON output and decodes stdout
|
|
// into out (a struct, slice, or map pointer). Test fails on non-zero exit
|
|
// or unparseable JSON.
|
|
func runJSONInto(t *testing.T, bin string, env []string, out any, args ...string) {
|
|
t.Helper()
|
|
stdout, err := run(bin, env, args...)
|
|
if err != nil {
|
|
t.Fatalf("%v", err)
|
|
}
|
|
if err := json.Unmarshal(stdout, out); err != nil {
|
|
t.Fatalf("parse JSON from %v: %v\nstdout:\n%s", args, err, string(stdout))
|
|
}
|
|
}
|