e623e8208f
Removes the entire envelope machinery now that every success path
emits bare JSON:
- cli/internal/format/envelope.go (Envelope, Success, Failure,
SuccessWithRisk, WriteEnvelope, Meta, Notice, UpdateNotice,
VersionSkewNotice, Risk, RiskLevel, ErrorBody) + tests.
- cli/internal/format/filter.go envelope-specific helpers
(WriteEnvelopeFiltered, marshalEnvelope, applyFieldFilter,
filterDataPayload, filterObjectData); the reusable
filterArrayItems / filterObjectKeys / writeJQ stay for bare.go.
- cli/internal/cmdutil/exporter.go + tests (envelope-only).
- cli/internal/cmdutil/PrintErrorEnvelope + ToErrorBody +
operationRiskOf + Error.OperationRisk field + OperationRisk struct.
Error path: all errors now go to stderr via cmdutil.PrintError in
`code: message\nhint: ...` form, regardless of --json. Stdout stays
empty (or holds the partial-success the command already wrote) so
downstream `--json | jq` pipelines never have to filter error shapes
out of the success stream. Typed exit codes (3 auth.* / 4
resource.not_found / 5 input.* / 6 server.rate_limited / 7 server.*
+ network.* / 10 input.confirmation_required) carry the failure
class for agents that branch on it.
Acceptance contract:
- envelope_test.go → wire_test.go (TestEnvelopeGolden → TestWireGolden).
- testdata/envelopes/ → testdata/wire/.
- Error-path cases assert the typed code substring on stderr.
- Orphan whoami.*.json goldens deleted.
AGENTS.md + README.md rewritten for the bare-data contract:
- Drop envelope schema section + dry-run rule.
- Document bare JSON on stdout + `code: msg\nhint: …` on stderr.
- ADR-3 reframed around bare data and why error separation matters
for `--json | jq` pipelines.
WriteJSONFiltered short-circuits to WriteJSON when both filters are
empty (skip the marshal-buffer round-trip for the common case).
Final review pass:
- Fix wire-contract bug: `--json id,name` (space form) is broken by
pflag's NoOptDefVal; AGENTS.md / README.md / SetAgentHelp + the
field-discovery help text all switched to `--json=id,name`.
- Fix `weknora api --jq` silently ignored: api.go now routes through
WriteJSONFiltered with jopts.JQ.
- AGENTS.md: drop the false claim that `auth logout` honors `-y`
(logout is local-only with no ConfirmDestructive guard); list the
actual destructive commands instead.
- Rewrite cli/acceptance/e2e/e2e_test.go for the bare-data wire shape
(was still parsing `out["data"]` / `env["ok"]`).
- Add `JSONOptions.Emit(w, v)` helper; collapse ~33 repeated
`format.WriteJSONFiltered(iostreams.IO.Out, X, jopts.Fields,
jopts.JQ)` sites to `jopts.Emit(iostreams.IO.Out, X)` — drops the
format import from 22 cmd/* files.
- Delete single-caller `cmdutil.MustRequireFlag`; inline as
`_ = cmd.MarkFlagRequired(...)` everywhere.
- Add `_ = cmd.MarkFlagRequired("name")` to `kb create`; it was the
only write command relying on runtime --name validation while
`context add` already used the cobra-level mark.
- `context use`: register `--json` / `--jq` (was always emitting JSON
unconditionally with no human path and no flag — diverged from
every other write command); human mode now prints
`✓ Switched context to X (was Y)`.
- Replace per-package `confirmPrompter` / `scriptedConfirm` /
`errPrompter` test doubles with `testutil.ConfirmPrompter`.
- Rename `chatService` → `ChatService` (export to match siblings
`ListService` / `ViewService`); rename `printUploadSuccess` →
`renderUploadSuccess` (siblings use `render*`).
- `defaultHint(CodeResourceNotFound)`: drop the hardcoded
"list available with `weknora kb list`" — misleading on agent /
doc / session 404. Replaced with "verify the resource ID and try
again".
- Strip stale `v0.2/v0.3` / "envelope" / "v0.0/v0.1 supports only"
historical tags from production comments and a few test
descriptions.
82 lines
2.8 KiB
Go
82 lines
2.8 KiB
Go
// Package xdg consolidates the XDG-rooted file path lookup and atomic-write
|
|
// idioms used by config / compat / secrets / projectlink. Centralizing means
|
|
// a single place to fix behavior (mode bits, fallback dirs, mkdir order,
|
|
// error wrapping) instead of copy-pasting across stores.
|
|
package xdg
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"gopkg.in/yaml.v3"
|
|
)
|
|
|
|
// Path resolves an XDG-rooted file. envVar is one of "XDG_CONFIG_HOME" /
|
|
// "XDG_CACHE_HOME" / "XDG_DATA_HOME". fallbackDir is the dot-prefixed dir
|
|
// under $HOME used when the env var is unset (".config" / ".cache" / etc.).
|
|
// parts join under "weknora/" inside the chosen root.
|
|
//
|
|
// Honors the XDG vars on every OS, even macOS — where os.UserConfigDir
|
|
// would otherwise return ~/Library/Application Support.
|
|
func Path(envVar, fallbackDir string, parts ...string) (string, error) {
|
|
if x := os.Getenv(envVar); x != "" {
|
|
return filepath.Join(append([]string{x, "weknora"}, parts...)...), nil
|
|
}
|
|
home, err := os.UserHomeDir()
|
|
if err != nil {
|
|
return "", fmt.Errorf("locate home dir: %w", err)
|
|
}
|
|
return filepath.Join(append([]string{home, fallbackDir, "weknora"}, parts...)...), nil
|
|
}
|
|
|
|
// WriteAtomicYAML marshals v to YAML and writes it atomically at p with mode
|
|
// 0600 (user-only). Creates parent dirs with mode 0700. Atomicity via
|
|
// CreateTemp + chmod + rename so partial writes never expose a half-baked
|
|
// file and concurrent writers never trample each other's tmp.
|
|
//
|
|
// 0600 is the appropriate floor even for non-secret stores (cache, project
|
|
// link) since they may sit alongside secrets in the same dir tree.
|
|
//
|
|
// On any failure after the tmp is created, the tmp is cleaned up so we don't
|
|
// litter the dir with `*.tmp.NNNN` artifacts on crash / cross-device errors.
|
|
func WriteAtomicYAML(p string, v any) error {
|
|
dir := filepath.Dir(p)
|
|
if err := os.MkdirAll(dir, 0o700); err != nil {
|
|
return fmt.Errorf("mkdir %s: %w", dir, err)
|
|
}
|
|
data, err := yaml.Marshal(v)
|
|
if err != nil {
|
|
return fmt.Errorf("marshal: %w", err)
|
|
}
|
|
// CreateTemp picks a unique name in dir so concurrent calls never collide
|
|
// on a shared `<p>.tmp`. Pattern reserves the suffix slot.
|
|
tmp, err := os.CreateTemp(dir, filepath.Base(p)+".tmp.*")
|
|
if err != nil {
|
|
return fmt.Errorf("create tmp in %s: %w", dir, err)
|
|
}
|
|
tmpName := tmp.Name()
|
|
// Best-effort cleanup on any failure path; no-op once Rename succeeds.
|
|
committed := false
|
|
defer func() {
|
|
if !committed {
|
|
_ = os.Remove(tmpName)
|
|
}
|
|
}()
|
|
if _, err := tmp.Write(data); err != nil {
|
|
_ = tmp.Close()
|
|
return fmt.Errorf("write %s: %w", tmpName, err)
|
|
}
|
|
if err := tmp.Close(); err != nil {
|
|
return fmt.Errorf("close %s: %w", tmpName, err)
|
|
}
|
|
if err := os.Chmod(tmpName, 0o600); err != nil {
|
|
return fmt.Errorf("chmod %s: %w", tmpName, err)
|
|
}
|
|
if err := os.Rename(tmpName, p); err != nil {
|
|
return fmt.Errorf("rename %s -> %s: %w", tmpName, p, err)
|
|
}
|
|
committed = true
|
|
return nil
|
|
}
|