Files
oikos/internal/httpapi/skills.go
dtoro 64f7d54011
Some checks failed
ci / build-test (push) Has been cancelled
ci / docker-build (push) Has been cancelled
feat: Phase 2 — ports package, secrets port move, postgres adapter move
Problem: the hexagon's Phase 2 (plans/2026-08-15-hexagonal-architecture.md)
must give the use-cases-to-be their contract surface: driven-port
interfaces, test fakes, the secrets interface moved into core, and the
postgres package inside the adapters tree — before the first vertical
slice (Phase 3) can wire a composition root.

Change:
- internal/core/ports: full driven-port catalog per plan §3.3 —
  repositories as transaction-scoped aggregates whose inputs carry
  derived checks, audit, and events (§3.6), plus CommandExecutor,
  TargetResolver, Checker, Secrets, EventPublisher, Provisioner.
  Port-local payload types (Event, AuditEntry, CheckDef, KnowledgeEntry,
  ExecResult) keep signatures off infrastructure; TypeTree aliases
  internal/ontology (pure over domain) until checkdefaults is absorbed.
  ReadModels intentionally not declared yet — it materializes with the
  Phase 3 slice and grows as report handlers rewire.
- secrets.Backend is now an alias of ports.Secrets; implementations
  (Infisical, SOPS, Manager) unchanged. mcp's local secretBackend
  subset is deleted; tool constructors take ports.Secrets.
- internal/db → internal/adapters/postgres (mechanical import rewrite;
  package identifier stays db until the Phase 3 repository split).
  sqlc.yaml, Makefile, golangci exclusions, and docs follow the move;
  make generate-check verified.
- internal/adapters/ssh: Executor implements ports.CommandExecutor over
  the actuator dial pool + RunStreaming (10-min default timeout carried
  over from the httpapi path).
- internal/adapters/remote: Resolver implements ports.TargetResolver
  delegating to internal/remote (still pool-based; drops onto
  ports.EntityRepository when repositories land in Phase 3 — documented
  transitional import).
- internal/core/ports/portstest: importable fakes — in-memory
  EntityRepo (with check-then-act SetState, side-effect recording),
  RecordingExecutor, FakeChecker, SpyPublisher; port-satisfaction
  guards; tests.

Risk: ports are declared ahead of implementations — signatures firm up
per phase as slices land (documented in the package doc); the
remote→postgres transitional import is explicit and dissolves in
Phase 3.

Verification: go vet, make test (race, 19 packages), generate-check,
golangci on core+adapters — 0 issues; full-repo baseline down
365→344.
2026-08-15 22:56:56 +02:00

198 lines
5.8 KiB
Go

package httpapi
import (
"context"
"encoding/json"
"fmt"
"log/slog"
"github.com/dtoro/oikos/internal/adapters/postgres/sqlcgen"
"github.com/dtoro/oikos/internal/core/domain"
"github.com/dtoro/oikos/internal/httpapi/gen"
"github.com/dtoro/oikos/internal/observability"
"github.com/google/uuid"
"github.com/jackc/pgx/v5"
)
// ─── Skills ────────────────────────────────────────────────────────────
func (s *Server) ListSkills(ctx context.Context, req gen.ListSkillsRequestObject) (gen.ListSkillsResponseObject, error) {
limit := clampLimit(req.Params.Limit)
rows, err := s.pool.Query(ctx, `
SELECT s.entity_id, s.version, s.name, s.procedure, s.applies_type,
s.action, s.pattern_ids, s.status, s.success_rate,
s.changed_by::text, s.change_reason, s.last_used_at
FROM skills s
WHERE ($1::text IS NULL OR s.status = $1)
AND ($2::text IS NULL OR s.applies_type = $2)
AND ($3::text IS NULL OR s.action = $3)
ORDER BY s.name, s.version DESC`,
req.Params.Status, req.Params.AppliesTo, req.Params.Action)
if err != nil {
return nil, err
}
defer rows.Close()
// Deduplicate to latest version per skill (the ORDER BY name, version DESC
// means the first row per name is the latest).
seen := map[string]bool{}
items := []gen.Skill{}
for rows.Next() {
var s gen.Skill
var procBytes []byte
var patternIDs []uuid.UUID
if err := rows.Scan(&s.Id, &s.Version, &s.Name, &procBytes, &s.AppliesType,
&s.Action, &patternIDs, &s.Status, &s.SuccessRate,
&s.ChangedBy, &s.ChangeReason, &s.LastUsedAt); err != nil {
return nil, err
}
if seen[s.Id.String()] {
continue
}
seen[s.Id.String()] = true
if err := json.Unmarshal(procBytes, &s.Procedure); err != nil {
slog.Warn("phase3: unmarshal skill procedure", "skill", s.Name, "error", err)
}
if len(patternIDs) > 0 {
pids := make([]string, len(patternIDs))
for i, pid := range patternIDs {
pids[i] = pid.String()
}
s.PatternIds = &pids
}
items = append(items, s)
if len(items) > limit {
break
}
}
if rows.Err() != nil {
return nil, rows.Err()
}
if items == nil {
items = []gen.Skill{}
}
return gen.ListSkills200JSONResponse{Items: items}, nil
}
func (s *Server) PatchSkill(ctx context.Context, req gen.PatchSkillRequestObject) (gen.PatchSkillResponseObject, error) {
if req.Body == nil {
return nil, fmt.Errorf("%w: request body is required", domain.ErrInvalidInput)
}
id, err := s.resolveEntityID(ctx, req.Id)
if err != nil {
return nil, err
}
tx, err := s.pool.Begin(ctx)
if err != nil {
return nil, err
}
defer tx.Rollback(ctx)
q := sqlcgen.New(tx)
if req.Body.Status != nil {
if err := q.UpdateSkillStatus(ctx, sqlcgen.UpdateSkillStatusParams{
EntityID: id,
Status: string(*req.Body.Status),
}); err != nil {
if err == pgx.ErrNoRows {
return nil, fmt.Errorf("%w: skill %s", domain.ErrNotFound, req.Id)
}
return nil, err
}
}
// Re-read skill.
var skill gen.Skill
var procBytes []byte
var patternIDs []uuid.UUID
err = tx.QueryRow(ctx, `
SELECT entity_id, version, name, procedure, applies_type, action,
pattern_ids, status, success_rate, changed_by::text,
change_reason, last_used_at
FROM skills WHERE entity_id = $1 ORDER BY version DESC LIMIT 1`, id).
Scan(&skill.Id, &skill.Version, &skill.Name, &procBytes, &skill.AppliesType,
&skill.Action, &patternIDs, &skill.Status, &skill.SuccessRate,
&skill.ChangedBy, &skill.ChangeReason, &skill.LastUsedAt)
if err != nil {
if err == pgx.ErrNoRows {
return nil, fmt.Errorf("%w: skill %s", domain.ErrNotFound, req.Id)
}
return nil, err
}
if err := json.Unmarshal(procBytes, &skill.Procedure); err != nil {
slog.Warn("phase3: unmarshal skill proc", "error", err)
}
if len(patternIDs) > 0 {
pids := make([]string, len(patternIDs))
for i, pid := range patternIDs {
pids[i] = pid.String()
}
skill.PatternIds = &pids
}
actorType, actor := actorInfo(ctx)
if auditErr := observability.Audit(ctx, q, actorType, actor, "patch",
&id, "PATCH", "/api/v1/skills/"+req.Id, "",
nil,
map[string]any{"status": req.Body.Status, "pinned_version": req.Body.PinnedVersion}); auditErr != nil {
return nil, auditErr
}
if err := tx.Commit(ctx); err != nil {
return nil, err
}
return gen.PatchSkill200JSONResponse(skill), nil
}
func (s *Server) ListSkillVersions(ctx context.Context, req gen.ListSkillVersionsRequestObject) (gen.ListSkillVersionsResponseObject, error) {
id, err := s.resolveEntityID(ctx, req.Id)
if err != nil {
return nil, err
}
rows, err := s.pool.Query(ctx, `
SELECT entity_id, version, name, procedure, applies_type, action,
pattern_ids, status, success_rate, changed_by::text,
change_reason, last_used_at
FROM skills WHERE entity_id = $1
ORDER BY version DESC`, id)
if err != nil {
return nil, err
}
defer rows.Close()
items := []gen.Skill{}
for rows.Next() {
var skill gen.Skill
var procBytes []byte
var patternIDs []uuid.UUID
if err := rows.Scan(&skill.Id, &skill.Version, &skill.Name, &procBytes, &skill.AppliesType,
&skill.Action, &patternIDs, &skill.Status, &skill.SuccessRate,
&skill.ChangedBy, &skill.ChangeReason, &skill.LastUsedAt); err != nil {
return nil, err
}
if err := json.Unmarshal(procBytes, &skill.Procedure); err != nil {
slog.Warn("phase3: unmarshal skill proc", "error", err)
}
if len(patternIDs) > 0 {
pids := make([]string, len(patternIDs))
for i, pid := range patternIDs {
pids[i] = pid.String()
}
skill.PatternIds = &pids
}
items = append(items, skill)
}
if rows.Err() != nil {
return nil, rows.Err()
}
if items == nil {
items = []gen.Skill{}
}
return gen.ListSkillVersions200JSONResponse{Items: items}, nil
}