4a5449233d
Seven bugs surfaced via two audit rounds — parallel reviewer agents
plus a real-server end-to-end demo. Each fix arrives with a
regression test.
1. doc upload --recursive --json corrupted the envelope stream.
Per-file FAIL/OK plain lines printed unconditionally to stdout,
then a Success envelope, then on partial failure a typed error
that the root handler turned into a SECOND Failure envelope —
three outputs where one was expected. Fix: gate the plain lines
behind !opts.JSONOut, and add cmdutil.Error.Silent so the JSON-
path partial-failure preserves its typed exit code without
triggering PrintErrorEnvelope's default Failure-envelope write.
2. auth refresh / AuthRetryTransport misclassified HTTP failures as
network.error. RefreshAndPersist wrapped every refresher error
with CodeNetworkError, but the SDK emits "HTTP error 401: ..."
for a rejected refresh token — which should surface as
auth.token_expired. Switched to WrapHTTP for proper status-
derived classification. Affects both `auth refresh` and the
transport's refresh closure.
3. doc download accepted ".." as a server-suggested filename. The
rejection list covered "" / "." / filepath.Separator but not
bare ".." — filepath.Base("..") is "..", which slipped through
to os.Create and produced a confusing local.file_io wrap. Added
to the rejection set.
4. search chunks / docs / kb / sessions had no lower bound on
--limit. `-L 0` / `-L -1` was forwarded to the server with
undefined behavior. Added a 1..1000 bound at the RunE boundary
across all four (matching doc list / session list page-size
bounds). Internal callers in tests can still pass Limit==0 for
the "no client-side cap" runChunks path — the bound only applies
at the user-input layer.
5. cli/AGENTS.md ADR-3 verb-canon summary listed only v0.2 verbs as
"gh-canonical" and missed v0.3 additions (edit, pin, unpin,
download — all gh-canonical) plus locally-introduced ones
(empty, refresh, add, remove, link). Rewritten as an explicit
gh-canonical / locally-introduced split.
6. kb pin returned 404. Server registers /knowledge-bases/{id}/pin
as PUT (router.go:292); SDK was using POST. gin's router silently
404s on method-mismatch (treats it as path-not-found, not 405),
so the CLI classified the response as resource.not_found and
masked the real failure mode. Switched the SDK to http.MethodPut.
The asymmetry that hid this past round 1: kb unpin on a freshly-
created KB hits the no-op branch in cmd/kb/pin.go that skips the
SDK call entirely, so unpin "worked" without ever exercising the
broken path. Only the real-server demo, where kb pin actually
fires, surfaced it.
7. kb edit clobbered current Name when only --description was
passed. EditOptions used *string to distinguish "unset" from
"set to empty", but sdk.UpdateKnowledgeBaseRequest declares both
fields as plain string (no omitempty), so the JSON body always
carried `"name": ""`. Server requires Name → 400. Fix: runEdit
does fetch-then-update — GetKnowledgeBase first, build the PUT
body with current values, then overlay user-set fields. Same
TOCTOU window as kb pin / unpin.
Audit-flagged items intentionally NOT changed:
- kb pin / unpin check-then-toggle TOCTOU: documented; the clean
fix would be a server-side setter and belongs in a separate API
change.
- AuthRetryTransport singleflight test gap for one concurrency
scenario; v0.4 polish.
- cli/README.md:50 "once v0.2 ships" and CHANGELOG.md:8
"10 top-level commands": v0.2-PR artifacts, not v0.3-introduced.
- kb edit / kb pin are v0.3-new commands, so neither bug needs a
cli/CHANGELOG.md Fixed entry — the v0.3 release ships them
working as the Added bullets advertise.
123 lines
4.3 KiB
Go
123 lines
4.3 KiB
Go
package kb
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/Tencent/WeKnora/cli/internal/agent"
|
|
"github.com/Tencent/WeKnora/cli/internal/cmdutil"
|
|
"github.com/Tencent/WeKnora/cli/internal/format"
|
|
"github.com/Tencent/WeKnora/cli/internal/iostreams"
|
|
sdk "github.com/Tencent/WeKnora/client"
|
|
)
|
|
|
|
type EditOptions struct {
|
|
// Name/Description are *string so we can distinguish "unset" from "set to
|
|
// empty". An unset field is omitted from the SDK request — only fields the
|
|
// user passed are sent. Server PUT semantics are "replace everything in the
|
|
// request"; if we always sent both, an `--name` invocation would silently
|
|
// clear the description.
|
|
Name *string
|
|
Description *string
|
|
JSONOut bool
|
|
DryRun bool
|
|
}
|
|
|
|
// EditService is the narrow SDK surface this command depends on. GetKnowledgeBase
|
|
// is needed for the fetch-then-update flow: the server's UpdateKnowledgeBase
|
|
// endpoint requires Name on the PUT body (UpdateKnowledgeBaseRequest.Name is
|
|
// `string`, not `*string`, and the server validates `required`), so passing
|
|
// only --description without fetching the current Name would 400.
|
|
type EditService interface {
|
|
GetKnowledgeBase(ctx context.Context, id string) (*sdk.KnowledgeBase, error)
|
|
UpdateKnowledgeBase(ctx context.Context, id string, req *sdk.UpdateKnowledgeBaseRequest) (*sdk.KnowledgeBase, error)
|
|
}
|
|
|
|
// NewCmdEdit builds `weknora kb edit <id>`. At least one of --name /
|
|
// --description must be provided.
|
|
func NewCmdEdit(f *cmdutil.Factory) *cobra.Command {
|
|
opts := &EditOptions{}
|
|
var name, desc string
|
|
cmd := &cobra.Command{
|
|
Use: "edit <id>",
|
|
Short: "Edit a knowledge base's name or description",
|
|
Args: cobra.ExactArgs(1),
|
|
RunE: func(c *cobra.Command, args []string) error {
|
|
if c.Flag("name").Changed {
|
|
opts.Name = &name
|
|
}
|
|
if c.Flag("description").Changed {
|
|
opts.Description = &desc
|
|
}
|
|
opts.DryRun = cmdutil.IsDryRun(c)
|
|
if opts.DryRun {
|
|
return runEdit(c.Context(), opts, nil, args[0])
|
|
}
|
|
cli, err := f.Client()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return runEdit(c.Context(), opts, cli, args[0])
|
|
},
|
|
}
|
|
cmd.Flags().StringVar(&name, "name", "", "New name (omit to leave unchanged)")
|
|
cmd.Flags().StringVar(&desc, "description", "", "New description (omit to leave unchanged)")
|
|
cmd.Flags().BoolVar(&opts.JSONOut, "json", false, "Output JSON envelope")
|
|
agent.SetAgentHelp(cmd, "Edits a knowledge base. At least one of --name/--description is required. Fields not passed are preserved server-side. Returns the updated KnowledgeBase.")
|
|
return cmd
|
|
}
|
|
|
|
func runEdit(ctx context.Context, opts *EditOptions, svc EditService, id string) error {
|
|
if opts.Name == nil && opts.Description == nil {
|
|
return &cmdutil.Error{
|
|
Code: cmdutil.CodeInputMissingFlag,
|
|
Message: "kb edit requires at least one of --name or --description",
|
|
Hint: "pass --name <name> and/or --description <desc>",
|
|
}
|
|
}
|
|
|
|
risk := &format.Risk{Level: format.RiskWrite, Action: fmt.Sprintf("edit knowledge base %s", id)}
|
|
if opts.DryRun {
|
|
// Dry-run renders only the user-set fields so the preview reflects
|
|
// intent; the real-run fetch path fills in the rest from the server.
|
|
preview := &sdk.UpdateKnowledgeBaseRequest{}
|
|
if opts.Name != nil {
|
|
preview.Name = *opts.Name
|
|
}
|
|
if opts.Description != nil {
|
|
preview.Description = *opts.Description
|
|
}
|
|
return cmdutil.EmitDryRun(opts.JSONOut, preview, &format.Meta{KBID: id}, risk)
|
|
}
|
|
|
|
// Fetch current state so we can fill in fields the user didn't touch.
|
|
// TOCTOU note: another writer could change Name/Description between
|
|
// our Get and Put; matches the same race window kb pin / unpin have.
|
|
current, err := svc.GetKnowledgeBase(ctx, id)
|
|
if err != nil {
|
|
return cmdutil.WrapHTTP(err, "fetch knowledge base %s", id)
|
|
}
|
|
req := &sdk.UpdateKnowledgeBaseRequest{
|
|
Name: current.Name,
|
|
Description: current.Description,
|
|
}
|
|
if opts.Name != nil {
|
|
req.Name = *opts.Name
|
|
}
|
|
if opts.Description != nil {
|
|
req.Description = *opts.Description
|
|
}
|
|
|
|
updated, err := svc.UpdateKnowledgeBase(ctx, id, req)
|
|
if err != nil {
|
|
return cmdutil.WrapHTTP(err, "edit knowledge base %s", id)
|
|
}
|
|
if opts.JSONOut {
|
|
return format.WriteEnvelope(iostreams.IO.Out, format.SuccessWithRisk(updated, &format.Meta{KBID: id}, risk))
|
|
}
|
|
fmt.Fprintf(iostreams.IO.Out, "✓ Updated knowledge base %s\n", id)
|
|
return nil
|
|
}
|