1b20b06f5e
Output ergonomics:
- `--json` accepts a comma-separated field list (gh-parity); selects
named keys from the per-command payload. Bare `--json` keeps the
full shape.
- `--jq <expr>` evaluates a gojq expression over the JSON; pairs with
`--json field-list` so projection runs before jq.
- `--version` is a global cobra flag in addition to the `version`
subcommand; both render the same line.
- Per-command `--help` now renders the available JSON field list under
"JSON fields available via `--json id,name,...`" (field-discovery
parity with gh / kubectl `-o jsonpath`).
New commands:
- `auth token` — print the active context's credential to stdout for
shell command substitution (`WEKNORA_TOKEN=$(weknora auth token)`).
Default: raw secret, no trailing newline. `--json` emits
`{token, mode, context}`.
- `doc upload --from-url <URL>` — ingest a remote URL via the SDK
`CreateKnowledgeFromURL`. `--name` forwarded as `FileName` so the
server's known-extension heuristic upgrades crawl-mode to
file-download-mode where appropriate.
Includes the simplify post-review polish pass (field-filter unit
tests, --json/--jq compose check, agent_help copy fixes).
155 lines
5.5 KiB
Go
155 lines
5.5 KiB
Go
package contextcmd
|
|
|
|
import (
|
|
"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/config"
|
|
"github.com/Tencent/WeKnora/cli/internal/format"
|
|
"github.com/Tencent/WeKnora/cli/internal/iostreams"
|
|
"github.com/Tencent/WeKnora/cli/internal/prompt"
|
|
"github.com/Tencent/WeKnora/cli/internal/secrets"
|
|
)
|
|
|
|
type RemoveOptions struct {
|
|
Yes bool // sourced from the global -y/--yes persistent flag (matches `kb delete`)
|
|
DryRun bool
|
|
}
|
|
|
|
// contextRemoveFields enumerates the fields surfaced for `--json` discovery on
|
|
// `context remove`. The result reports the disposition of the removed entry.
|
|
var contextRemoveFields = []string{
|
|
"name", "removed", "was_current",
|
|
}
|
|
|
|
// removeResult is the typed payload emitted under data on success.
|
|
type removeResult struct {
|
|
Name string `json:"name"`
|
|
Removed bool `json:"removed"`
|
|
WasCurrent bool `json:"was_current"`
|
|
}
|
|
|
|
// NewCmdRemove builds `weknora context remove`. Drops the entry from
|
|
// config.yaml and best-effort clears keyring references. Removing a
|
|
// non-current context is low-friction (no prompt). Removing the *current*
|
|
// context triggers the destructive-write confirmation protocol (exit 10),
|
|
// because subsequent commands will have no default connection target.
|
|
func NewCmdRemove(f *cmdutil.Factory) *cobra.Command {
|
|
opts := &RemoveOptions{}
|
|
cmd := &cobra.Command{
|
|
Use: "remove <name>",
|
|
Short: "Remove a context (drops entry, clears keyring refs)",
|
|
Long: `Deletes the named context from config.yaml and best-effort clears any
|
|
keyring references it owned (matches ` + "`weknora auth logout`" + `).
|
|
|
|
Removing the current context also clears CurrentContext — subsequent commands
|
|
will error until you select another with ` + "`weknora context use <name>`" + ` or pick
|
|
one up via the global ` + "`--context`" + ` flag. Because that change is observable in
|
|
every later command, removing the current context requires explicit -y/--yes
|
|
in scripted / --json invocations (exit code 10; see cli/AGENTS.md).`,
|
|
Example: ` weknora context remove staging # remove non-current → no prompt
|
|
weknora context remove production -y # remove current → confirm`,
|
|
Args: cobra.ExactArgs(1),
|
|
RunE: func(c *cobra.Command, args []string) error {
|
|
jopts, err := cmdutil.CheckJSONFlags(c)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
opts.Yes, _ = c.Flags().GetBool("yes")
|
|
opts.DryRun = cmdutil.IsDryRun(c)
|
|
store, err := f.Secrets()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return runRemove(opts, jopts, args[0], store, f.Prompter())
|
|
},
|
|
}
|
|
cmdutil.AddJSONFlags(cmd, contextRemoveFields)
|
|
agent.SetAgentHelp(cmd, "Removes a context entry. Removing the current context requires -y in non-TTY/--json (exit-10). Always best-effort clears keyring refs.")
|
|
return cmd
|
|
}
|
|
|
|
func runRemove(opts *RemoveOptions, jopts *cmdutil.JSONOptions, name string, store secrets.Store, p prompt.Prompter) error {
|
|
cfg, err := config.Load()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
ctx, exists := cfg.Contexts[name]
|
|
if !exists {
|
|
return notFoundError(name, cfg)
|
|
}
|
|
wasCurrent := name == cfg.CurrentContext
|
|
risk := riskForRemove(name, wasCurrent)
|
|
|
|
jsonOut := jopts.Enabled()
|
|
if opts.DryRun {
|
|
return cmdutil.EmitDryRun(jsonOut,
|
|
removeResult{Name: name, Removed: false, WasCurrent: wasCurrent},
|
|
&format.Meta{Context: cfg.CurrentContext},
|
|
risk)
|
|
}
|
|
// Confirmation only fires for removing the current context — non-current
|
|
// remove uses the same low-friction policy as `auth logout`.
|
|
if wasCurrent {
|
|
if err := cmdutil.ConfirmDestructive(p, opts.Yes, jsonOut, "current context", name); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
// Config first, secrets after: a crash in between leaves an orphan
|
|
// keyring entry but no dangling config ref (same ordering as auth logout).
|
|
delete(cfg.Contexts, name)
|
|
if wasCurrent {
|
|
cfg.CurrentContext = ""
|
|
}
|
|
if err := config.Save(cfg); err != nil {
|
|
return cmdutil.Wrapf(cmdutil.CodeLocalFileIO, err, "save config")
|
|
}
|
|
clearContextSecrets(store, ctx, name)
|
|
|
|
result := removeResult{Name: name, Removed: true, WasCurrent: wasCurrent}
|
|
if jsonOut {
|
|
return format.WriteEnvelopeFiltered(iostreams.IO.Out,
|
|
format.SuccessWithRisk(result, &format.Meta{Context: cfg.CurrentContext}, risk),
|
|
jopts.Fields, jopts.JQ)
|
|
}
|
|
if wasCurrent {
|
|
fmt.Fprintf(iostreams.IO.Out, "✓ Removed context %s (current context cleared — run `weknora context use <name>` to pick another)\n", name)
|
|
} else {
|
|
fmt.Fprintf(iostreams.IO.Out, "✓ Removed context %s\n", name)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// riskForRemove returns the operation risk: high-risk-write only when the
|
|
// target is the currently-active context (subsequent commands will have no
|
|
// default --context until the user picks one).
|
|
func riskForRemove(name string, wasCurrent bool) *format.Risk {
|
|
if wasCurrent {
|
|
return &format.Risk{
|
|
Level: format.RiskHighRiskWrite,
|
|
Action: fmt.Sprintf("remove context %s (the current context — subsequent commands will need a new --context)", name),
|
|
}
|
|
}
|
|
return &format.Risk{Level: format.RiskWrite, Action: fmt.Sprintf("remove context %s", name)}
|
|
}
|
|
|
|
// clearContextSecrets mirrors auth/logout.go: best-effort delete every secret
|
|
// slot the context references. Errors are swallowed so a missing keyring
|
|
// entry doesn't block remove (logout has had the same policy since v0.2).
|
|
func clearContextSecrets(store secrets.Store, c config.Context, name string) {
|
|
if c.TokenRef != "" {
|
|
_ = store.Delete(name, "access")
|
|
}
|
|
if c.RefreshRef != "" {
|
|
_ = store.Delete(name, "refresh")
|
|
}
|
|
if c.APIKeyRef != "" {
|
|
_ = store.Delete(name, "api_key")
|
|
}
|
|
}
|
|
|