d3c03b2f34
A hardening + finalization pass over the agent-first CLI: correctness fixes,
richer machine-readable signals, flag/naming consistency, and a symmetric
config surface. Pre-1.0, so it includes breaking renames.
Correctness:
- agent update: resolve/validate --model/--rerank-model (was storing a bogus
name verbatim, corrupting config.model_id).
- doctor: honor WEKNORA_HOST / WEKNORA_API_KEY (headless path no longer reports
"no host configured").
- session ask / MCP session_ask: text answer was empty on non-TTY — the agent
stream sets Done=true on an intermediate agent_query frame before the answer,
and AgentAccumulator treated the first Done as terminal. Terminate on the
`complete` event (new sdk.AgentResponseTypeComplete), not a per-frame Done.
- batch exit codes: any per-item failure collapses to operation.failed (exit 1),
including `doc upload --recursive` partial failures — a permanent per-file
failure (e.g. a duplicate) no longer surfaces as a retryable exit 7 an agent
would loop on; per-item typed errors stay in the envelope.
Agent-first signals & discovery:
- error.exit_code in the envelope (type + exit_code disambiguate the
input.invalid_argument exit-2-vs-5 split in one JSON read).
- meta.hint on empty content search and on draft doc create; doc wait fails fast
on a never-parsing draft instead of hanging to --timeout.
- retrieval-readiness is visible in the natural flow: kb status / kb check emit
retrieval_ready, and kb create hints the fix when no embedding model is bound
— an unconfigured KB no longer looks silently healthy.
- schema contract completeness: every leaf declares output + >=1 example
(drift-guarded); output strings match the meta actually emitted; chunk list
and search docs now emit meta.total_count (both previously dropped it).
- schema tolerates a quoted multi-word command label; zero-state auth — and
`link` with no profile — point at profile setup / the headless WEKNORA_KB_ID
path instead of looping on `auth login`.
- id-addressed reads tolerate a redundant --kb (doc view/wait, chunk list/view
accept and ignore it, declared in schema) so a carried-over --kb doesn't
exit 2; streaming commands warn that --jq does not apply to an NDJSON stream.
- keep JSON-always as the default; --jq hints spell out the .data path.
Consistency & gating:
- doc create: drop the deprecated --name alias (--title only; pre-1.0 break).
- chunk list --limit aligned to 1..10000; model list --limit/-L with
has_more/total_count; api write-gates -X PUT/PATCH (exit 10); skills install
expands a leading ~.
- docs corrected: search docs / doc list --keyword help is case-insensitive
(server does LOWER LIKE); AGENTS.md risk-action list (no phantom kb.init; add
model.update / kb.config.set) and batch example (failed item carries `error`);
session resume --message id comes from `message list`, not the stream.
- auth/profile ergonomics: env credentials are now first-class — `auth token`
prints the active WEKNORA_API_KEY / WEKNORA_TOKEN, and auth login/logout/refresh
give an env-aware message instead of looping on "run auth login". `auth logout`
clears credentials but keeps the profile registered (host preserved for
re-login); deleting a profile is `profile remove`'s job (clean logout/remove
separation, matching gh / lark).
Config surface (symmetric read/write, in-place model edits):
- kb config now returns a secret-free KBModelConfigView (was {}); `kb config`
reads, new `kb config set` writes; `kb init` removed (misnomer).
- kb create --chat-model: retrieval-ready in one step.
- model update: edit a model in place (id preserved, references survive) —
rotate --api-key-stdin, change base-url / display-name / etc.
- session continue-stream renamed to session resume.
Docs: AGENTS.md is the single wire-contract source; CHANGELOG slimmed; stale
kb-init / continue-stream references removed; skill wire-vocab guard extended.
AGENTS.md / weknora-shared SKILL document retrieval_ready (a KB needs an
embedding model to be searchable), that --jq does not apply to NDJSON
streams, and the env-credential-first auth path; the KB quickstart example
now creates a retrieval-ready KB.
136 lines
5.7 KiB
Go
136 lines
5.7 KiB
Go
// Package output defines the symmetric envelope wire contract:
|
|
// success envelopes on stdout (Envelope) and error envelopes on
|
|
// stderr (ErrorEnvelope), plus NDJSON stream helpers.
|
|
package output
|
|
|
|
import (
|
|
"encoding/json"
|
|
"io"
|
|
)
|
|
|
|
// Envelope is the success-path stdout envelope. See AGENTS.md
|
|
// "Stdout (success path)" for the full wire contract.
|
|
type Envelope struct {
|
|
OK bool `json:"ok"`
|
|
// Status is the batch tri-state outcome: "success" (all items ok),
|
|
// "partial" (some ok, some failed), or "error" (all failed). Set only by
|
|
// batch commands; omitted on ordinary single-result envelopes. `ok` stays
|
|
// authoritative — Status is an additive convenience for agents triaging
|
|
// multi-target results.
|
|
Status string `json:"status,omitempty"`
|
|
Data any `json:"data,omitempty"`
|
|
Meta *Meta `json:"meta,omitempty"`
|
|
Profile string `json:"profile,omitempty"`
|
|
}
|
|
|
|
// ErrorEnvelope is the error-path stderr envelope. See AGENTS.md
|
|
// "Stderr (error path)" for the full wire contract.
|
|
type ErrorEnvelope struct {
|
|
OK bool `json:"ok"`
|
|
Error *ErrDetail `json:"error"`
|
|
}
|
|
|
|
// Meta carries optional metadata in success envelopes.
|
|
type Meta struct {
|
|
// Count and TotalCount are *int so zero is serialized when explicitly set
|
|
// by list commands (omitempty on *int omits only nil, not zero). This keeps
|
|
// the agent contract stable: an empty list still emits count/total_count as 0
|
|
// instead of dropping the key. Non-list / dry-run metas leave them nil so they
|
|
// are omitted. Mirrors the Successes/Failures pointer pattern below.
|
|
Count *int `json:"count,omitempty"`
|
|
HasMore bool `json:"has_more,omitempty"`
|
|
TotalCount *int `json:"total_count,omitempty"`
|
|
// Successes and Failures are *int so zero is serialized when explicitly set
|
|
// by the batch path (omitempty on *int omits only nil, not zero).
|
|
// Non-batch commands leave these nil so they are omitted from the envelope.
|
|
Successes *int `json:"successes,omitempty"` // batch ops
|
|
Failures *int `json:"failures,omitempty"` // batch ops
|
|
// Hint is an optional actionable note on a SUCCESS envelope — e.g. an
|
|
// empty search explaining the KB may be unindexed, or a freshly-created
|
|
// draft document pointing at `doc reparse`. Distinct from error.hint;
|
|
// omitted when empty so it never adds noise to normal results.
|
|
Hint string `json:"hint,omitempty"`
|
|
// Dry-run preview fields. Populated by EmitDryRun (cmdutil/dryrun.go)
|
|
// when --dry-run is set on a mutation command; omitted otherwise.
|
|
DryRun bool `json:"dry_run,omitempty"` // true when --dry-run; omitted otherwise
|
|
Plan map[string]any `json:"plan,omitempty"` // would-call shape; open map (action required, other fields command-specific)
|
|
}
|
|
|
|
// ErrDetail describes a structured error. Embedded in ErrorEnvelope.Error
|
|
// and also surfaced in batch envelope per-item failures.
|
|
type ErrDetail struct {
|
|
Type string `json:"type"`
|
|
Message string `json:"message"`
|
|
// ExitCode is the process exit code this error maps to, embedded so an
|
|
// agent can branch on a single JSON read without observing $?. Needed
|
|
// because one type (input.invalid_argument) spans exit 2 (parse) and
|
|
// exit 5 (typed value) — exit_code disambiguates them.
|
|
ExitCode int `json:"exit_code,omitempty"`
|
|
Hint string `json:"hint,omitempty"`
|
|
// RetryArgv is a directly-executable argv array (e.g.
|
|
// ["weknora","auth","login"]) so an agent can exec it without
|
|
// shell-splitting or quote-handling. Distinct from the prose Hint.
|
|
RetryArgv []string `json:"retry_argv,omitempty"`
|
|
RetryAfterSeconds int `json:"retry_after_seconds,omitempty"`
|
|
// Retryable indicates whether re-running the SAME command may succeed:
|
|
// true for transient failures (timeouts, rate limits, transport), false
|
|
// for deterministic ones (auth, bad input, not-found), omitted (nil) when
|
|
// genuinely unknown.
|
|
Retryable *bool `json:"retryable,omitempty"`
|
|
Risk *RiskDetail `json:"risk,omitempty"`
|
|
Detail any `json:"detail,omitempty"`
|
|
}
|
|
|
|
// RiskDetail tags high-risk writes for the agent protocol. Surfaces in
|
|
// error.risk on confirmation_required errors.
|
|
// Level: "write" (reversible mutations — update) or "destructive" (delete);
|
|
// the "read" slot is reserved.
|
|
type RiskDetail struct {
|
|
Level string `json:"level"`
|
|
Action string `json:"action"`
|
|
}
|
|
|
|
// NewEnvelope assembles a success Envelope with the given data + optional
|
|
// meta + profile. Single source of construction so callers that need the
|
|
// envelope value (e.g. jq filtering) stay in sync with WriteEnvelope when
|
|
// fields are added.
|
|
func NewEnvelope(data any, meta *Meta, profile string) Envelope {
|
|
return Envelope{
|
|
OK: true,
|
|
Data: data,
|
|
Meta: meta,
|
|
Profile: profile,
|
|
}
|
|
}
|
|
|
|
// WriteEnvelope writes a success envelope to w. Caller sets data + optional meta.
|
|
//
|
|
// When profile is non-empty, the envelope includes a "profile" field.
|
|
// indent: if true, output is multi-line (TTY mode); else compact (pipe mode).
|
|
func WriteEnvelope(w io.Writer, data any, meta *Meta, indent bool, profile string) error {
|
|
return writeJSON(w, NewEnvelope(data, meta, profile), indent)
|
|
}
|
|
|
|
// WriteErrorEnvelope writes an error envelope to w (typically stderr).
|
|
func WriteErrorEnvelope(w io.Writer, err *ErrDetail, indent bool) error {
|
|
env := ErrorEnvelope{
|
|
OK: false,
|
|
Error: err,
|
|
}
|
|
return writeJSON(w, env, indent)
|
|
}
|
|
|
|
// IntPtr returns a pointer to i. Used by list commands to set Meta.Count /
|
|
// Meta.TotalCount so that a zero count still serializes (omitempty on *int
|
|
// omits only nil). Mirrors the Successes/Failures pointer pattern.
|
|
func IntPtr(i int) *int { return &i }
|
|
|
|
func writeJSON(w io.Writer, v any, indent bool) error {
|
|
enc := json.NewEncoder(w)
|
|
enc.SetEscapeHTML(false)
|
|
if indent {
|
|
enc.SetIndent("", " ")
|
|
}
|
|
return enc.Encode(v)
|
|
}
|