Completes the objective deletion gate for the UI Service (archie-core-8cda.5.6): go list -deps ./cmd/archie-ui now links zero banned packages -- no modernc.org/sqlite, no internal/store, gateway, channels, memory, secret, agentexec, tools, skill, yaegiutil, curator, or the workflow engine. The closure shrinks from 68 to 26 archie-core packages. Each cut is a producer-side move; no consumer-side defensive shims. - Store contracts (TaskStore family, value types, sentinels) moved from internal/store to internal/domain/storecontract -- the approved contract location per state-store-contract rev. 2d, and NOT internal/contracts: that tree is buf generate output and tools/proto.sh check deletes hand-written files there. internal/store keeps aliases; sentinel message strings are byte-identical and remain the wire contract. - Chat contracts (ChatContract, sessions, turns, streaming, commands) moved from internal/gateway to internal/domain/messaging; gateway keeps aliases. ToolCallEvent rendering helpers become gateway functions (methods cannot live on alias types). - Task vocabulary (Task, statuses, mid-run Store, Definition) split into internal/domain/workflow/task; the pipeline engine stays in package workflow with aliases, so daemon-side callers are unchanged. - overlay.DeniedKeys moved to internal/infrastructure/configuration: webui referenced the constant and that dragged the overlay SQLite store in. - webui.Server's concrete runtime handles become webui-owned view interfaces with daemon-side bootstrap adapters: channel lifecycle (internal/channels/status), MemoryStatus, CuratorStatus, and a SkillCatalog seam replacing the direct skill.DefaultRoots/CatalogRoots calls. Each degrades to an empty page when unwired. - config.SecretRef moved into internal/config (config vocabulary); internal/secret keeps an alias and Registry.Resolve absorbs the zero-value short-circuit. Docs: state-store-contract rev. 2d relocation record; ui-service-boundary deletion gate marked satisfied; ARCHITECTURE.md package map rows.
132 lines
4.6 KiB
Go
132 lines
4.6 KiB
Go
package taskactions
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"log/slog"
|
|
"time"
|
|
|
|
"github.com/nats-io/nats.go"
|
|
|
|
"github.com/samcharles93/archie-core/internal/domain/storecontract"
|
|
"github.com/samcharles93/archie-core/internal/domain/taskactions"
|
|
"github.com/samcharles93/archie-core/internal/gateway"
|
|
"github.com/samcharles93/archie-core/internal/natsrpc"
|
|
"github.com/samcharles93/archie-core/internal/taskstate"
|
|
)
|
|
|
|
// actionSubject is the request/reply subject the Gateway's ChatTaskActor
|
|
// client issues and the daemon's responder serves. The daemon owns task
|
|
// execution; the standalone Gateway never mutates the task store directly.
|
|
const actionSubject = "archie.gateway.task-action"
|
|
|
|
// Identity is a pointer because its absence is meaningful: nil is an
|
|
// authenticated dashboard operator acting across identities, which the
|
|
// daemon's service distinguishes from any named identity, empty included.
|
|
type actionRequest struct {
|
|
Identity *string `json:"identity"`
|
|
TaskID int64 `json:"task_id"`
|
|
Action taskstate.Action `json:"action"`
|
|
}
|
|
|
|
// actionResponse carries the error's class beside its message. This hop
|
|
// reduces an error to a JSON string, and the dashboard chooses its HTTP
|
|
// status from the sentinel (404, 409, 503), so the class has to cross
|
|
// explicitly or every failure arrives as an opaque 500.
|
|
type actionResponse struct {
|
|
natsrpc.Envelope
|
|
Kind string `json:"kind,omitempty"`
|
|
}
|
|
|
|
// actionErrorKinds names the sentinels a caller matches on. Anything absent
|
|
// crosses as a message alone, which is the honest result: an unclassified
|
|
// failure is a server error at every consumer.
|
|
var actionErrorKinds = []struct {
|
|
kind string
|
|
err error
|
|
}{
|
|
{kind: "not_found", err: taskactions.ErrNotFound},
|
|
{kind: "conflict", err: taskactions.ErrConflict},
|
|
{kind: "stale_transition", err: storecontract.ErrStaleTransition},
|
|
{kind: "unavailable", err: taskactions.ErrUnavailable},
|
|
}
|
|
|
|
func actionErrorKind(err error) string {
|
|
for _, candidate := range actionErrorKinds {
|
|
if errors.Is(err, candidate.err) {
|
|
return candidate.kind
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// remoteActionError restores a sentinel the daemon reported, keeping the
|
|
// daemon's own wording as the message.
|
|
type remoteActionError struct {
|
|
message string
|
|
sentinel error
|
|
}
|
|
|
|
func (e remoteActionError) Error() string { return e.message }
|
|
func (e remoteActionError) Unwrap() error { return e.sentinel }
|
|
|
|
func actionErrorFor(kind string, err error) error {
|
|
for _, candidate := range actionErrorKinds {
|
|
if candidate.kind == kind {
|
|
return remoteActionError{message: err.Error(), sentinel: candidate.err}
|
|
}
|
|
}
|
|
return err
|
|
}
|
|
|
|
// Register exposes only identity-scoped operator actions on the daemon. The
|
|
// daemon retains execution cancellation, retry policy, forge closure and event
|
|
// ownership; the Gateway's client reaches this responder over NATS.
|
|
// Handlers run with context.Background() (the storerpc convention): the
|
|
// daemon's lifecycle ctx is not request-scoped, and a cancelled boot ctx must
|
|
// not poison later requests.
|
|
func Register(nc *nats.Conn, service taskactions.Service, log *slog.Logger) (func(), error) {
|
|
return natsrpc.RegisterAll(nc, []natsrpc.Registration{{
|
|
Subject: actionSubject,
|
|
Handler: func(msg *nats.Msg) {
|
|
var req actionRequest
|
|
if err := json.Unmarshal(msg.Data, &req); err != nil {
|
|
natsrpc.Respond(msg, log, "taskactions", actionResponse{Envelope: natsrpc.NewEnvelope(err)})
|
|
return
|
|
}
|
|
err := service.Apply(context.Background(), req.Identity, req.TaskID, req.Action)
|
|
natsrpc.Respond(msg, log, "taskactions", actionResponse{
|
|
Envelope: natsrpc.NewEnvelope(err),
|
|
Kind: actionErrorKind(err),
|
|
})
|
|
},
|
|
}})
|
|
}
|
|
|
|
// Client forwards Gateway task actions to their daemon owner over NATS.
|
|
type Client struct {
|
|
Conn *nats.Conn
|
|
Timeout time.Duration // bounds each call when ctx has no deadline
|
|
}
|
|
|
|
func (c Client) rpc() *natsrpc.Client {
|
|
return &natsrpc.Client{Conn: c.Conn, Timeout: c.Timeout}
|
|
}
|
|
|
|
// ApplyChatTaskAction sends an operator action to the daemon's responder.
|
|
func (c Client) ApplyChatTaskAction(ctx context.Context, identity *string, id int64, action taskstate.Action) (gateway.TaskActionResult, error) {
|
|
if c.Conn == nil {
|
|
return gateway.TaskActionResult{}, fmt.Errorf("task action connection is unavailable")
|
|
}
|
|
resp, err := natsrpc.Call[actionResponse](ctx, c.rpc(), actionSubject, actionRequest{Identity: identity, TaskID: id, Action: action})
|
|
if err != nil {
|
|
return gateway.TaskActionResult{}, err
|
|
}
|
|
if err := resp.Err(); err != nil {
|
|
return gateway.TaskActionResult{}, actionErrorFor(resp.Kind, err)
|
|
}
|
|
return gateway.TaskActionResult{TaskID: id, Action: string(action), Message: fmt.Sprintf("Applied %s to task %d.", action, id)}, nil
|
|
}
|