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.
72 lines
2.2 KiB
Go
72 lines
2.2 KiB
Go
package gatewayrpc
|
|
|
|
import (
|
|
"errors"
|
|
|
|
"google.golang.org/grpc/codes"
|
|
"google.golang.org/grpc/status"
|
|
|
|
"github.com/samcharles93/archie-core/internal/domain/storecontract"
|
|
"github.com/samcharles93/archie-core/internal/domain/taskactions"
|
|
)
|
|
|
|
// taskActionCodes pairs each sentinel the daemon's action service reports
|
|
// with the gRPC code that carries it. The dashboard picks its HTTP status by
|
|
// matching these (404, 409, 503), and gRPC transports a code and a string,
|
|
// not a Go error, so the class travels as the code and is restored on
|
|
// arrival. Adding a sentinel a caller matches on without adding it here
|
|
// silently degrades that case to a 500.
|
|
var taskActionCodes = []struct {
|
|
code codes.Code
|
|
err error
|
|
}{
|
|
{code: codes.NotFound, err: taskactions.ErrNotFound},
|
|
{code: codes.FailedPrecondition, err: taskactions.ErrConflict},
|
|
{code: codes.Aborted, err: storecontract.ErrStaleTransition},
|
|
{code: codes.Unavailable, err: taskactions.ErrUnavailable},
|
|
}
|
|
|
|
// taskActionStatus classifies an action error for the wire, keeping the
|
|
// daemon's own wording as the status message.
|
|
func taskActionStatus(err error) error {
|
|
if err == nil {
|
|
return nil
|
|
}
|
|
for _, candidate := range taskActionCodes {
|
|
if errors.Is(err, candidate.err) {
|
|
return status.Error(candidate.code, err.Error())
|
|
}
|
|
}
|
|
return err
|
|
}
|
|
|
|
// remoteTaskActionError restores a classified error on the caller's side,
|
|
// keeping the message the daemon produced.
|
|
type remoteTaskActionError struct {
|
|
message string
|
|
sentinel error
|
|
}
|
|
|
|
func (e remoteTaskActionError) Error() string { return e.message }
|
|
func (e remoteTaskActionError) Unwrap() error { return e.sentinel }
|
|
|
|
// taskActionError is taskActionStatus's inverse. A code with no sentinel
|
|
// behind it (including a transport failure) is returned untouched, so an
|
|
// unclassified failure stays a server error rather than being dressed up as
|
|
// a known one.
|
|
func taskActionError(err error) error {
|
|
if err == nil {
|
|
return nil
|
|
}
|
|
reported, ok := status.FromError(err)
|
|
if !ok {
|
|
return err
|
|
}
|
|
for _, candidate := range taskActionCodes {
|
|
if reported.Code() == candidate.code {
|
|
return remoteTaskActionError{message: reported.Message(), sentinel: candidate.err}
|
|
}
|
|
}
|
|
return err
|
|
}
|