diff --git a/internal/app/archiegateway/catalog.go b/internal/app/archiegateway/catalog.go new file mode 100644 index 000000000..32a389801 --- /dev/null +++ b/internal/app/archiegateway/catalog.go @@ -0,0 +1,88 @@ +package archiegateway + +import ( + "context" + "slices" + + "github.com/samcharles93/archie-core/internal/infrastructure/gatewayrpc" + "github.com/samcharles93/archie-core/internal/skill" +) + +// setSkillList records the catalogue the last refresh registered, so the +// dashboard reads exactly what skill_activate serves. +func (b *server) setSkillList(entries []skill.CatalogEntry) { + b.skillMu.Lock() + defer b.skillMu.Unlock() + b.skillList = slices.Clone(entries) +} + +// chatCatalog exposes this process's runtime surfaces over ChatService: the +// live skill catalogue and the curator registry. The Gateway hosts no +// channels, so channel reload is left unset and answers Unavailable. +func (b *server) chatCatalog() gatewayrpc.Catalog { + return gatewayrpc.Catalog{ + Skills: b.skillEntries, + Curators: b.curatorStates, + } +} + +func (b *server) skillEntries() []gatewayrpc.SkillEntry { + b.skillMu.Lock() + entries := slices.Clone(b.skillList) + b.skillMu.Unlock() + cfg := b.cfgHolder.Get() + out := make([]gatewayrpc.SkillEntry, 0, len(entries)) + for _, e := range entries { + out = append(out, gatewayrpc.SkillEntry{ + Name: e.Name, + Description: e.Description, + Workflow: e.Workflow, + Source: skillSource(e, cfg.WorkDir, cfg.SkillsDir), + }) + } + return out +} + +// curatorStates reads the live curator registry: names, point-in-time health +// and recent activity. A process without a registry answers empty. +func (b *server) curatorStates(ctx context.Context) []gatewayrpc.CuratorState { + registry := b.curatorRegistry + if registry == nil { + return nil + } + names := registry.Names() + health := registry.Health(ctx) + out := make([]gatewayrpc.CuratorState, 0, len(names)) + for _, name := range names { + h := health[name] + state := gatewayrpc.CuratorState{Name: name, HealthStatus: string(h.Status), HealthMessage: h.Message} + if activity, ok := registry.Activity(name); ok { + state.HasActivity = true + state.LastRunAt = activity.LastRunAt + state.LastRunActions = activity.LastRunActions + for _, action := range activity.Recent { + state.Recent = append(state.Recent, gatewayrpc.CuratorAction{ + At: action.At, Type: action.Type, Detail: action.Detail, Reason: action.Reason, + }) + } + } + out = append(out, state) + } + return out +} + +// skillSource labels where a skill was loaded from. storedDir wins because a +// resource-held skill carries no root; sharedDir is checked before workDir +// because when they are equal the roots collapse to one entry. +func skillSource(entry skill.CatalogEntry, workDir, sharedDir string) string { + switch { + case entry.Body != "": + return "stored skills" + case sharedDir != "" && entry.Root == sharedDir: + return "shared skills" + case entry.Root == workDir: + return "project skills" + default: + return "user-global skills" + } +} diff --git a/internal/app/archiegateway/gateway.go b/internal/app/archiegateway/gateway.go index 8828b0897..fca3a1d1b 100644 --- a/internal/app/archiegateway/gateway.go +++ b/internal/app/archiegateway/gateway.go @@ -27,7 +27,7 @@ func (b *server) serveGatewayListener(ctx context.Context, listener net.Listener // begins accepting the moment it is called, and a unit whose // TimeoutStartSec expires first would restart a healthy process. b.announceReady() - return serveGateway(ctx, listener, contract, b.chatSessionStore, opts) + return serveGateway(ctx, listener, contract, b.chatSessionStore, b.chatCatalog(), opts) } func (b *server) startGatewayRuntime(ctx context.Context, actor gateway.ChatTaskActor) (gateway.ChatContract, error) { @@ -107,9 +107,9 @@ func gatewayServerOpts(listen, token string) (opts []grpc.ServerOption, loopback }, false, nil } -func serveGateway(ctx context.Context, listener net.Listener, contract gateway.ChatContract, sessions gateway.SessionStore, opts []grpc.ServerOption) error { +func serveGateway(ctx context.Context, listener net.Listener, contract gateway.ChatContract, sessions gateway.SessionStore, catalog gatewayrpc.Catalog, opts []grpc.ServerOption) error { server := grpc.NewServer(opts...) - gatewayrpc.RegisterServer(server, contract, sessions) + gatewayrpc.RegisterServer(server, contract, sessions, catalog) serveErr := make(chan error, 1) go func() { serveErr <- server.Serve(listener) }() select { diff --git a/internal/app/archiegateway/server.go b/internal/app/archiegateway/server.go index 219235eb1..935587a26 100644 --- a/internal/app/archiegateway/server.go +++ b/internal/app/archiegateway/server.go @@ -36,6 +36,7 @@ import ( "github.com/samcharles93/archie-core/internal/releaseupdate" "github.com/samcharles93/archie-core/internal/sdnotify" "github.com/samcharles93/archie-core/internal/secret" + "github.com/samcharles93/archie-core/internal/skill" "github.com/samcharles93/archie-core/internal/tools" toolprovider "github.com/samcharles93/archie-core/internal/tools/provider" ) @@ -92,6 +93,10 @@ type server struct { chatController *gateway.StoreTaskController defaultChatIdentity string + // skillMu guards skillList, the catalogue refreshSkills last registered. + skillMu sync.Mutex + skillList []skill.CatalogEntry + cleanups []func() } diff --git a/internal/app/archiegateway/skills.go b/internal/app/archiegateway/skills.go index a7acfcedc..fa920b203 100644 --- a/internal/app/archiegateway/skills.go +++ b/internal/app/archiegateway/skills.go @@ -44,6 +44,7 @@ func (b *server) refreshSkills(ctx context.Context, applied *string) { return } catalog = append(catalog, b.storedSkills(ctx, catalog)...) + b.setSkillList(catalog) signature := catalogSignature(catalog) if signature == *applied { return diff --git a/internal/app/archieui/catalog_clients.go b/internal/app/archieui/catalog_clients.go new file mode 100644 index 000000000..f089f1176 --- /dev/null +++ b/internal/app/archieui/catalog_clients.go @@ -0,0 +1,94 @@ +package archieui + +import ( + "context" + "time" + + "github.com/samcharles93/archie-core/internal/infrastructure/gatewayrpc" + "github.com/samcharles93/archie-core/internal/webui" +) + +// catalogTimeout bounds the interface calls that carry no request context, so a +// hung Gateway cannot pin a dashboard request. +const catalogTimeout = 5 * time.Second + +// skillCatalog serves the Skills page from the Gateway's live catalogue. A +// failed read is an empty page, never a failed dashboard. +type skillCatalog struct{ client gatewayrpc.CatalogClient } + +var _ webui.SkillCatalog = skillCatalog{} + +func (a skillCatalog) Skills() []webui.SkillView { + ctx, cancel := context.WithTimeout(context.Background(), catalogTimeout) + defer cancel() + entries, err := a.client.ListSkills(ctx) + if err != nil { + return nil + } + views := make([]webui.SkillView, 0, len(entries)) + for _, e := range entries { + views = append(views, webui.SkillView{ + Name: e.Name, + Description: e.Description, + Workflow: e.Workflow, + Source: e.Source, + }) + } + return views +} + +// curatorStatus serves the Curators page from the Gateway's curator registry. +type curatorStatus struct{ client gatewayrpc.CatalogClient } + +var _ webui.CuratorStatus = curatorStatus{} + +func (a curatorStatus) Names() []string { + ctx, cancel := context.WithTimeout(context.Background(), catalogTimeout) + defer cancel() + states, err := a.client.CuratorHealth(ctx) + if err != nil { + return nil + } + names := make([]string, 0, len(states)) + for _, state := range states { + names = append(names, state.Name) + } + return names +} + +func (a curatorStatus) Health(ctx context.Context) map[string]webui.CuratorHealthView { + states, err := a.client.CuratorHealth(ctx) + if err != nil { + return nil + } + out := make(map[string]webui.CuratorHealthView, len(states)) + for _, state := range states { + out[state.Name] = webui.CuratorHealthView{Status: state.HealthStatus, Message: state.HealthMessage} + } + return out +} + +func (a curatorStatus) Activity(name string) (webui.CuratorActivity, bool) { + ctx, cancel := context.WithTimeout(context.Background(), catalogTimeout) + defer cancel() + states, err := a.client.CuratorHealth(ctx) + if err != nil { + return webui.CuratorActivity{}, false + } + for _, state := range states { + if state.Name != name || !state.HasActivity { + continue + } + activity := webui.CuratorActivity{ + LastRunAt: state.LastRunAt, LastRunActions: state.LastRunActions, + Recent: make([]webui.CuratorActionView, 0, len(state.Recent)), + } + for _, action := range state.Recent { + activity.Recent = append(activity.Recent, webui.CuratorActionView{ + At: action.At, Type: action.Type, Detail: action.Detail, Reason: action.Reason, + }) + } + return activity, true + } + return webui.CuratorActivity{}, false +} diff --git a/internal/app/archieui/compose.go b/internal/app/archieui/compose.go index 54e1f1fe0..55895ab87 100644 --- a/internal/app/archieui/compose.go +++ b/internal/app/archieui/compose.go @@ -15,6 +15,7 @@ import ( "github.com/samcharles93/archie-core/internal/events" infraaccess "github.com/samcharles93/archie-core/internal/infrastructure/access" "github.com/samcharles93/archie-core/internal/infrastructure/captureintake" + "github.com/samcharles93/archie-core/internal/infrastructure/gatewayrpc" "github.com/samcharles93/archie-core/internal/webhookguard" "github.com/samcharles93/archie-core/internal/webui" ) @@ -106,6 +107,7 @@ func compose(d deps) *webui.Server { if d.Chat != nil { srv.Chat = &webui.ChatService{Contract: d.Chat} } + wireCatalog(d, srv) // The policy chain: wired together or not at all. srv.Refusals = refusalStore(d.Store) if d.Access != nil { @@ -119,6 +121,20 @@ func compose(d deps) *webui.Server { return srv } +// wireCatalog attaches the Gateway-owned surfaces the dashboard reads over the +// chat client: the skill catalogue, the curator registry and the channel +// reload seam. A client that cannot answer them leaves those pages empty rather +// than fabricating a set. +func wireCatalog(d deps, srv *webui.Server) { + catalog, ok := d.Chat.(gatewayrpc.CatalogClient) + if !ok { + return + } + srv.Skills = skillCatalog{client: catalog} + srv.Curators = curatorStatus{client: catalog} + srv.ReloadChannel = catalog.ReloadChannel +} + // wireTaskLogs attaches the task-log read when the store client carries the // contract, and logs the absence when it does not: a store without it leaves // the page reporting that this process cannot read logs, which is true, rather diff --git a/internal/contracts/gateway/v1/chat.pb.go b/internal/contracts/gateway/v1/chat.pb.go index f8c5303a3..ed996007c 100644 --- a/internal/contracts/gateway/v1/chat.pb.go +++ b/internal/contracts/gateway/v1/chat.pb.go @@ -2900,6 +2900,473 @@ func (x *SearchMessagesResponse) GetTruncated() bool { return false } +// ListSkills reports the live skill catalogue the Gateway runs, as the +// dashboard's Skills page shows it. source labels where each skill was +// discovered (project, shared, user-global or stored). +type ListSkillsRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ListSkillsRequest) Reset() { + *x = ListSkillsRequest{} + mi := &file_gateway_v1_chat_proto_msgTypes[48] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListSkillsRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListSkillsRequest) ProtoMessage() {} + +func (x *ListSkillsRequest) ProtoReflect() protoreflect.Message { + mi := &file_gateway_v1_chat_proto_msgTypes[48] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListSkillsRequest.ProtoReflect.Descriptor instead. +func (*ListSkillsRequest) Descriptor() ([]byte, []int) { + return file_gateway_v1_chat_proto_rawDescGZIP(), []int{48} +} + +type ListSkillsResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Skills []*Skill `protobuf:"bytes,1,rep,name=skills,proto3" json:"skills,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ListSkillsResponse) Reset() { + *x = ListSkillsResponse{} + mi := &file_gateway_v1_chat_proto_msgTypes[49] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ListSkillsResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ListSkillsResponse) ProtoMessage() {} + +func (x *ListSkillsResponse) ProtoReflect() protoreflect.Message { + mi := &file_gateway_v1_chat_proto_msgTypes[49] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ListSkillsResponse.ProtoReflect.Descriptor instead. +func (*ListSkillsResponse) Descriptor() ([]byte, []int) { + return file_gateway_v1_chat_proto_rawDescGZIP(), []int{49} +} + +func (x *ListSkillsResponse) GetSkills() []*Skill { + if x != nil { + return x.Skills + } + return nil +} + +type Skill struct { + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` + Workflow string `protobuf:"bytes,3,opt,name=workflow,proto3" json:"workflow,omitempty"` + Source string `protobuf:"bytes,4,opt,name=source,proto3" json:"source,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *Skill) Reset() { + *x = Skill{} + mi := &file_gateway_v1_chat_proto_msgTypes[50] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Skill) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Skill) ProtoMessage() {} + +func (x *Skill) ProtoReflect() protoreflect.Message { + mi := &file_gateway_v1_chat_proto_msgTypes[50] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Skill.ProtoReflect.Descriptor instead. +func (*Skill) Descriptor() ([]byte, []int) { + return file_gateway_v1_chat_proto_rawDescGZIP(), []int{50} +} + +func (x *Skill) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *Skill) GetDescription() string { + if x != nil { + return x.Description + } + return "" +} + +func (x *Skill) GetWorkflow() string { + if x != nil { + return x.Workflow + } + return "" +} + +func (x *Skill) GetSource() string { + if x != nil { + return x.Source + } + return "" +} + +// CuratorHealth reports every registered curator's point-in-time health and +// recent activity. last_run_at is absent for a curator that has never run. +type CuratorHealthRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *CuratorHealthRequest) Reset() { + *x = CuratorHealthRequest{} + mi := &file_gateway_v1_chat_proto_msgTypes[51] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CuratorHealthRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CuratorHealthRequest) ProtoMessage() {} + +func (x *CuratorHealthRequest) ProtoReflect() protoreflect.Message { + mi := &file_gateway_v1_chat_proto_msgTypes[51] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CuratorHealthRequest.ProtoReflect.Descriptor instead. +func (*CuratorHealthRequest) Descriptor() ([]byte, []int) { + return file_gateway_v1_chat_proto_rawDescGZIP(), []int{51} +} + +type CuratorHealthResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Curators []*Curator `protobuf:"bytes,1,rep,name=curators,proto3" json:"curators,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *CuratorHealthResponse) Reset() { + *x = CuratorHealthResponse{} + mi := &file_gateway_v1_chat_proto_msgTypes[52] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CuratorHealthResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CuratorHealthResponse) ProtoMessage() {} + +func (x *CuratorHealthResponse) ProtoReflect() protoreflect.Message { + mi := &file_gateway_v1_chat_proto_msgTypes[52] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CuratorHealthResponse.ProtoReflect.Descriptor instead. +func (*CuratorHealthResponse) Descriptor() ([]byte, []int) { + return file_gateway_v1_chat_proto_rawDescGZIP(), []int{52} +} + +func (x *CuratorHealthResponse) GetCurators() []*Curator { + if x != nil { + return x.Curators + } + return nil +} + +type Curator struct { + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + HealthStatus string `protobuf:"bytes,2,opt,name=health_status,json=healthStatus,proto3" json:"health_status,omitempty"` + HealthMessage string `protobuf:"bytes,3,opt,name=health_message,json=healthMessage,proto3" json:"health_message,omitempty"` + LastRunAt *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=last_run_at,json=lastRunAt,proto3,oneof" json:"last_run_at,omitempty"` + LastRunActions int64 `protobuf:"varint,5,opt,name=last_run_actions,json=lastRunActions,proto3" json:"last_run_actions,omitempty"` + RecentActions []*CuratorAction `protobuf:"bytes,6,rep,name=recent_actions,json=recentActions,proto3" json:"recent_actions,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *Curator) Reset() { + *x = Curator{} + mi := &file_gateway_v1_chat_proto_msgTypes[53] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *Curator) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Curator) ProtoMessage() {} + +func (x *Curator) ProtoReflect() protoreflect.Message { + mi := &file_gateway_v1_chat_proto_msgTypes[53] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Curator.ProtoReflect.Descriptor instead. +func (*Curator) Descriptor() ([]byte, []int) { + return file_gateway_v1_chat_proto_rawDescGZIP(), []int{53} +} + +func (x *Curator) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *Curator) GetHealthStatus() string { + if x != nil { + return x.HealthStatus + } + return "" +} + +func (x *Curator) GetHealthMessage() string { + if x != nil { + return x.HealthMessage + } + return "" +} + +func (x *Curator) GetLastRunAt() *timestamppb.Timestamp { + if x != nil { + return x.LastRunAt + } + return nil +} + +func (x *Curator) GetLastRunActions() int64 { + if x != nil { + return x.LastRunActions + } + return 0 +} + +func (x *Curator) GetRecentActions() []*CuratorAction { + if x != nil { + return x.RecentActions + } + return nil +} + +type CuratorAction struct { + state protoimpl.MessageState `protogen:"open.v1"` + At *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=at,proto3" json:"at,omitempty"` + Type string `protobuf:"bytes,2,opt,name=type,proto3" json:"type,omitempty"` + Detail string `protobuf:"bytes,3,opt,name=detail,proto3" json:"detail,omitempty"` + Reason string `protobuf:"bytes,4,opt,name=reason,proto3" json:"reason,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *CuratorAction) Reset() { + *x = CuratorAction{} + mi := &file_gateway_v1_chat_proto_msgTypes[54] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *CuratorAction) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CuratorAction) ProtoMessage() {} + +func (x *CuratorAction) ProtoReflect() protoreflect.Message { + mi := &file_gateway_v1_chat_proto_msgTypes[54] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use CuratorAction.ProtoReflect.Descriptor instead. +func (*CuratorAction) Descriptor() ([]byte, []int) { + return file_gateway_v1_chat_proto_rawDescGZIP(), []int{54} +} + +func (x *CuratorAction) GetAt() *timestamppb.Timestamp { + if x != nil { + return x.At + } + return nil +} + +func (x *CuratorAction) GetType() string { + if x != nil { + return x.Type + } + return "" +} + +func (x *CuratorAction) GetDetail() string { + if x != nil { + return x.Detail + } + return "" +} + +func (x *CuratorAction) GetReason() string { + if x != nil { + return x.Reason + } + return "" +} + +// ReloadChannel asks the process hosting a channel to re-read its +// configuration. It is Unavailable from a Gateway that hosts no channels. +type ReloadChannelRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ReloadChannelRequest) Reset() { + *x = ReloadChannelRequest{} + mi := &file_gateway_v1_chat_proto_msgTypes[55] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ReloadChannelRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ReloadChannelRequest) ProtoMessage() {} + +func (x *ReloadChannelRequest) ProtoReflect() protoreflect.Message { + mi := &file_gateway_v1_chat_proto_msgTypes[55] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ReloadChannelRequest.ProtoReflect.Descriptor instead. +func (*ReloadChannelRequest) Descriptor() ([]byte, []int) { + return file_gateway_v1_chat_proto_rawDescGZIP(), []int{55} +} + +func (x *ReloadChannelRequest) GetChannelId() string { + if x != nil { + return x.ChannelId + } + return "" +} + +type ReloadChannelResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *ReloadChannelResponse) Reset() { + *x = ReloadChannelResponse{} + mi := &file_gateway_v1_chat_proto_msgTypes[56] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *ReloadChannelResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ReloadChannelResponse) ProtoMessage() {} + +func (x *ReloadChannelResponse) ProtoReflect() protoreflect.Message { + mi := &file_gateway_v1_chat_proto_msgTypes[56] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ReloadChannelResponse.ProtoReflect.Descriptor instead. +func (*ReloadChannelResponse) Descriptor() ([]byte, []int) { + return file_gateway_v1_chat_proto_rawDescGZIP(), []int{56} +} + var File_gateway_v1_chat_proto protoreflect.FileDescriptor const file_gateway_v1_chat_proto_rawDesc = "" + @@ -3143,7 +3610,35 @@ const file_gateway_v1_chat_proto_rawDesc = "" + "\vnext_offset\x18\x02 \x01(\x03R\n" + "nextOffset\x12\x19\n" + "\bhas_more\x18\x03 \x01(\bR\ahasMore\x12\x1c\n" + - "\ttruncated\x18\x04 \x01(\bR\ttruncated2\xf6\r\n" + + "\ttruncated\x18\x04 \x01(\bR\ttruncated\"\x13\n" + + "\x11ListSkillsRequest\"?\n" + + "\x12ListSkillsResponse\x12)\n" + + "\x06skills\x18\x01 \x03(\v2\x11.gateway.v1.SkillR\x06skills\"q\n" + + "\x05Skill\x12\x12\n" + + "\x04name\x18\x01 \x01(\tR\x04name\x12 \n" + + "\vdescription\x18\x02 \x01(\tR\vdescription\x12\x1a\n" + + "\bworkflow\x18\x03 \x01(\tR\bworkflow\x12\x16\n" + + "\x06source\x18\x04 \x01(\tR\x06source\"\x16\n" + + "\x14CuratorHealthRequest\"H\n" + + "\x15CuratorHealthResponse\x12/\n" + + "\bcurators\x18\x01 \x03(\v2\x13.gateway.v1.CuratorR\bcurators\"\xa6\x02\n" + + "\aCurator\x12\x12\n" + + "\x04name\x18\x01 \x01(\tR\x04name\x12#\n" + + "\rhealth_status\x18\x02 \x01(\tR\fhealthStatus\x12%\n" + + "\x0ehealth_message\x18\x03 \x01(\tR\rhealthMessage\x12?\n" + + "\vlast_run_at\x18\x04 \x01(\v2\x1a.google.protobuf.TimestampH\x00R\tlastRunAt\x88\x01\x01\x12(\n" + + "\x10last_run_actions\x18\x05 \x01(\x03R\x0elastRunActions\x12@\n" + + "\x0erecent_actions\x18\x06 \x03(\v2\x19.gateway.v1.CuratorActionR\rrecentActionsB\x0e\n" + + "\f_last_run_at\"\x7f\n" + + "\rCuratorAction\x12*\n" + + "\x02at\x18\x01 \x01(\v2\x1a.google.protobuf.TimestampR\x02at\x12\x12\n" + + "\x04type\x18\x02 \x01(\tR\x04type\x12\x16\n" + + "\x06detail\x18\x03 \x01(\tR\x06detail\x12\x16\n" + + "\x06reason\x18\x04 \x01(\tR\x06reason\"5\n" + + "\x14ReloadChannelRequest\x12\x1d\n" + + "\n" + + "channel_id\x18\x01 \x01(\tR\tchannelId\"\x17\n" + + "\x15ReloadChannelResponse2\xef\x0f\n" + "\vChatService\x12E\n" + "\bSnapshot\x12\x1b.gateway.v1.SnapshotRequest\x1a\x1c.gateway.v1.SnapshotResponse\x12K\n" + "\n" + @@ -3167,7 +3662,11 @@ const file_gateway_v1_chat_proto_rawDesc = "" + "\fMessageCount\x12\x1f.gateway.v1.MessageCountRequest\x1a .gateway.v1.MessageCountResponse\x12Q\n" + "\fSaveMessages\x12\x1f.gateway.v1.SaveMessagesRequest\x1a .gateway.v1.SaveMessagesResponse\x12Z\n" + "\x0fReplaceMessages\x12\".gateway.v1.ReplaceMessagesRequest\x1a#.gateway.v1.ReplaceMessagesResponse\x12W\n" + - "\x0eSearchMessages\x12!.gateway.v1.SearchMessagesRequest\x1a\".gateway.v1.SearchMessagesResponseB\xb1\x01\n" + + "\x0eSearchMessages\x12!.gateway.v1.SearchMessagesRequest\x1a\".gateway.v1.SearchMessagesResponse\x12K\n" + + "\n" + + "ListSkills\x12\x1d.gateway.v1.ListSkillsRequest\x1a\x1e.gateway.v1.ListSkillsResponse\x12T\n" + + "\rCuratorHealth\x12 .gateway.v1.CuratorHealthRequest\x1a!.gateway.v1.CuratorHealthResponse\x12T\n" + + "\rReloadChannel\x12 .gateway.v1.ReloadChannelRequest\x1a!.gateway.v1.ReloadChannelResponseB\xb1\x01\n" + "\x0ecom.gateway.v1B\tChatProtoP\x01ZKgithub.com/samcharles93/archie-core/internal/contracts/gateway/v1;gatewayv1\xa2\x02\x03GXX\xaa\x02\n" + "Gateway.V1\xca\x02\n" + "Gateway\\V1\xe2\x02\x16Gateway\\V1\\GPBMetadata\xea\x02\vGateway::V1b\x06proto3" @@ -3184,7 +3683,7 @@ func file_gateway_v1_chat_proto_rawDescGZIP() []byte { return file_gateway_v1_chat_proto_rawDescData } -var file_gateway_v1_chat_proto_msgTypes = make([]protoimpl.MessageInfo, 50) +var file_gateway_v1_chat_proto_msgTypes = make([]protoimpl.MessageInfo, 59) var file_gateway_v1_chat_proto_goTypes = []any{ (*Session)(nil), // 0: gateway.v1.Session (*Message)(nil), // 1: gateway.v1.Message @@ -3234,21 +3733,30 @@ var file_gateway_v1_chat_proto_goTypes = []any{ (*ReplaceMessagesRequest)(nil), // 45: gateway.v1.ReplaceMessagesRequest (*SearchMessagesRequest)(nil), // 46: gateway.v1.SearchMessagesRequest (*SearchMessagesResponse)(nil), // 47: gateway.v1.SearchMessagesResponse - nil, // 48: gateway.v1.SnapshotResponse.ModelsByProviderEntry - nil, // 49: gateway.v1.SnapshotResponse.ActivePersonasEntry - (*timestamppb.Timestamp)(nil), // 50: google.protobuf.Timestamp + (*ListSkillsRequest)(nil), // 48: gateway.v1.ListSkillsRequest + (*ListSkillsResponse)(nil), // 49: gateway.v1.ListSkillsResponse + (*Skill)(nil), // 50: gateway.v1.Skill + (*CuratorHealthRequest)(nil), // 51: gateway.v1.CuratorHealthRequest + (*CuratorHealthResponse)(nil), // 52: gateway.v1.CuratorHealthResponse + (*Curator)(nil), // 53: gateway.v1.Curator + (*CuratorAction)(nil), // 54: gateway.v1.CuratorAction + (*ReloadChannelRequest)(nil), // 55: gateway.v1.ReloadChannelRequest + (*ReloadChannelResponse)(nil), // 56: gateway.v1.ReloadChannelResponse + nil, // 57: gateway.v1.SnapshotResponse.ModelsByProviderEntry + nil, // 58: gateway.v1.SnapshotResponse.ActivePersonasEntry + (*timestamppb.Timestamp)(nil), // 59: google.protobuf.Timestamp } var file_gateway_v1_chat_proto_depIdxs = []int32{ - 50, // 0: gateway.v1.Session.created_at:type_name -> google.protobuf.Timestamp - 50, // 1: gateway.v1.Session.last_active_at:type_name -> google.protobuf.Timestamp - 50, // 2: gateway.v1.Message.at:type_name -> google.protobuf.Timestamp + 59, // 0: gateway.v1.Session.created_at:type_name -> google.protobuf.Timestamp + 59, // 1: gateway.v1.Session.last_active_at:type_name -> google.protobuf.Timestamp + 59, // 2: gateway.v1.Message.at:type_name -> google.protobuf.Timestamp 3, // 3: gateway.v1.Message.media:type_name -> gateway.v1.Media 2, // 4: gateway.v1.Turn.tool_calls:type_name -> gateway.v1.ToolCall - 50, // 5: gateway.v1.Turn.created_at:type_name -> google.protobuf.Timestamp - 50, // 6: gateway.v1.Turn.updated_at:type_name -> google.protobuf.Timestamp + 59, // 5: gateway.v1.Turn.created_at:type_name -> google.protobuf.Timestamp + 59, // 6: gateway.v1.Turn.updated_at:type_name -> google.protobuf.Timestamp 0, // 7: gateway.v1.SnapshotResponse.sessions:type_name -> gateway.v1.Session - 48, // 8: gateway.v1.SnapshotResponse.models_by_provider:type_name -> gateway.v1.SnapshotResponse.ModelsByProviderEntry - 49, // 9: gateway.v1.SnapshotResponse.active_personas:type_name -> gateway.v1.SnapshotResponse.ActivePersonasEntry + 57, // 8: gateway.v1.SnapshotResponse.models_by_provider:type_name -> gateway.v1.SnapshotResponse.ModelsByProviderEntry + 58, // 9: gateway.v1.SnapshotResponse.active_personas:type_name -> gateway.v1.SnapshotResponse.ActivePersonasEntry 0, // 10: gateway.v1.GetSessionResponse.session:type_name -> gateway.v1.Session 1, // 11: gateway.v1.RecentMessagesResponse.messages:type_name -> gateway.v1.Message 4, // 12: gateway.v1.RecentTurnsResponse.turns:type_name -> gateway.v1.Turn @@ -3263,54 +3771,65 @@ var file_gateway_v1_chat_proto_depIdxs = []int32{ 1, // 21: gateway.v1.SaveMessagesRequest.messages:type_name -> gateway.v1.Message 1, // 22: gateway.v1.ReplaceMessagesRequest.messages:type_name -> gateway.v1.Message 1, // 23: gateway.v1.SearchMessagesResponse.messages:type_name -> gateway.v1.Message - 5, // 24: gateway.v1.SnapshotResponse.ModelsByProviderEntry.value:type_name -> gateway.v1.StringList - 6, // 25: gateway.v1.ChatService.Snapshot:input_type -> gateway.v1.SnapshotRequest - 8, // 26: gateway.v1.ChatService.GetSession:input_type -> gateway.v1.GetSessionRequest - 10, // 27: gateway.v1.ChatService.RecentMessages:input_type -> gateway.v1.RecentMessagesRequest - 12, // 28: gateway.v1.ChatService.RecentTurns:input_type -> gateway.v1.RecentTurnsRequest - 14, // 29: gateway.v1.ChatService.Route:input_type -> gateway.v1.RouteRequest - 16, // 30: gateway.v1.ChatService.Stream:input_type -> gateway.v1.StreamRequest - 18, // 31: gateway.v1.ChatService.Cancel:input_type -> gateway.v1.CancelRequest - 20, // 32: gateway.v1.ChatService.SetPersona:input_type -> gateway.v1.SetPersonaRequest - 22, // 33: gateway.v1.ChatService.ApplyTaskAction:input_type -> gateway.v1.ApplyTaskActionRequest - 24, // 34: gateway.v1.ChatService.ApplyOperatorTaskAction:input_type -> gateway.v1.ApplyOperatorTaskActionRequest - 27, // 35: gateway.v1.ChatService.SaveSession:input_type -> gateway.v1.SaveSessionRequest - 28, // 36: gateway.v1.ChatService.GetSessionsByChannel:input_type -> gateway.v1.GetSessionsByChannelRequest - 36, // 37: gateway.v1.ChatService.DeleteSession:input_type -> gateway.v1.DeleteSessionRequest - 37, // 38: gateway.v1.ChatService.TouchSession:input_type -> gateway.v1.TouchSessionRequest - 38, // 39: gateway.v1.ChatService.ListSessions:input_type -> gateway.v1.ListSessionsRequest - 39, // 40: gateway.v1.ChatService.SaveMessage:input_type -> gateway.v1.SaveMessageRequest - 40, // 41: gateway.v1.ChatService.DeleteRecentMessages:input_type -> gateway.v1.DeleteRecentMessagesRequest - 42, // 42: gateway.v1.ChatService.MessageCount:input_type -> gateway.v1.MessageCountRequest - 44, // 43: gateway.v1.ChatService.SaveMessages:input_type -> gateway.v1.SaveMessagesRequest - 45, // 44: gateway.v1.ChatService.ReplaceMessages:input_type -> gateway.v1.ReplaceMessagesRequest - 46, // 45: gateway.v1.ChatService.SearchMessages:input_type -> gateway.v1.SearchMessagesRequest - 7, // 46: gateway.v1.ChatService.Snapshot:output_type -> gateway.v1.SnapshotResponse - 9, // 47: gateway.v1.ChatService.GetSession:output_type -> gateway.v1.GetSessionResponse - 11, // 48: gateway.v1.ChatService.RecentMessages:output_type -> gateway.v1.RecentMessagesResponse - 13, // 49: gateway.v1.ChatService.RecentTurns:output_type -> gateway.v1.RecentTurnsResponse - 15, // 50: gateway.v1.ChatService.Route:output_type -> gateway.v1.RouteResponse - 17, // 51: gateway.v1.ChatService.Stream:output_type -> gateway.v1.StreamResponse - 19, // 52: gateway.v1.ChatService.Cancel:output_type -> gateway.v1.CancelResponse - 21, // 53: gateway.v1.ChatService.SetPersona:output_type -> gateway.v1.SetPersonaResponse - 23, // 54: gateway.v1.ChatService.ApplyTaskAction:output_type -> gateway.v1.ApplyTaskActionResponse - 25, // 55: gateway.v1.ChatService.ApplyOperatorTaskAction:output_type -> gateway.v1.ApplyOperatorTaskActionResponse - 26, // 56: gateway.v1.ChatService.SaveSession:output_type -> gateway.v1.SaveSessionResponse - 29, // 57: gateway.v1.ChatService.GetSessionsByChannel:output_type -> gateway.v1.GetSessionsByChannelResponse - 31, // 58: gateway.v1.ChatService.DeleteSession:output_type -> gateway.v1.DeleteSessionResponse - 32, // 59: gateway.v1.ChatService.TouchSession:output_type -> gateway.v1.TouchSessionResponse - 30, // 60: gateway.v1.ChatService.ListSessions:output_type -> gateway.v1.ListSessionsResponse - 33, // 61: gateway.v1.ChatService.SaveMessage:output_type -> gateway.v1.SaveMessageResponse - 41, // 62: gateway.v1.ChatService.DeleteRecentMessages:output_type -> gateway.v1.DeleteRecentMessagesResponse - 43, // 63: gateway.v1.ChatService.MessageCount:output_type -> gateway.v1.MessageCountResponse - 34, // 64: gateway.v1.ChatService.SaveMessages:output_type -> gateway.v1.SaveMessagesResponse - 35, // 65: gateway.v1.ChatService.ReplaceMessages:output_type -> gateway.v1.ReplaceMessagesResponse - 47, // 66: gateway.v1.ChatService.SearchMessages:output_type -> gateway.v1.SearchMessagesResponse - 46, // [46:67] is the sub-list for method output_type - 25, // [25:46] is the sub-list for method input_type - 25, // [25:25] is the sub-list for extension type_name - 25, // [25:25] is the sub-list for extension extendee - 0, // [0:25] is the sub-list for field type_name + 50, // 24: gateway.v1.ListSkillsResponse.skills:type_name -> gateway.v1.Skill + 53, // 25: gateway.v1.CuratorHealthResponse.curators:type_name -> gateway.v1.Curator + 59, // 26: gateway.v1.Curator.last_run_at:type_name -> google.protobuf.Timestamp + 54, // 27: gateway.v1.Curator.recent_actions:type_name -> gateway.v1.CuratorAction + 59, // 28: gateway.v1.CuratorAction.at:type_name -> google.protobuf.Timestamp + 5, // 29: gateway.v1.SnapshotResponse.ModelsByProviderEntry.value:type_name -> gateway.v1.StringList + 6, // 30: gateway.v1.ChatService.Snapshot:input_type -> gateway.v1.SnapshotRequest + 8, // 31: gateway.v1.ChatService.GetSession:input_type -> gateway.v1.GetSessionRequest + 10, // 32: gateway.v1.ChatService.RecentMessages:input_type -> gateway.v1.RecentMessagesRequest + 12, // 33: gateway.v1.ChatService.RecentTurns:input_type -> gateway.v1.RecentTurnsRequest + 14, // 34: gateway.v1.ChatService.Route:input_type -> gateway.v1.RouteRequest + 16, // 35: gateway.v1.ChatService.Stream:input_type -> gateway.v1.StreamRequest + 18, // 36: gateway.v1.ChatService.Cancel:input_type -> gateway.v1.CancelRequest + 20, // 37: gateway.v1.ChatService.SetPersona:input_type -> gateway.v1.SetPersonaRequest + 22, // 38: gateway.v1.ChatService.ApplyTaskAction:input_type -> gateway.v1.ApplyTaskActionRequest + 24, // 39: gateway.v1.ChatService.ApplyOperatorTaskAction:input_type -> gateway.v1.ApplyOperatorTaskActionRequest + 27, // 40: gateway.v1.ChatService.SaveSession:input_type -> gateway.v1.SaveSessionRequest + 28, // 41: gateway.v1.ChatService.GetSessionsByChannel:input_type -> gateway.v1.GetSessionsByChannelRequest + 36, // 42: gateway.v1.ChatService.DeleteSession:input_type -> gateway.v1.DeleteSessionRequest + 37, // 43: gateway.v1.ChatService.TouchSession:input_type -> gateway.v1.TouchSessionRequest + 38, // 44: gateway.v1.ChatService.ListSessions:input_type -> gateway.v1.ListSessionsRequest + 39, // 45: gateway.v1.ChatService.SaveMessage:input_type -> gateway.v1.SaveMessageRequest + 40, // 46: gateway.v1.ChatService.DeleteRecentMessages:input_type -> gateway.v1.DeleteRecentMessagesRequest + 42, // 47: gateway.v1.ChatService.MessageCount:input_type -> gateway.v1.MessageCountRequest + 44, // 48: gateway.v1.ChatService.SaveMessages:input_type -> gateway.v1.SaveMessagesRequest + 45, // 49: gateway.v1.ChatService.ReplaceMessages:input_type -> gateway.v1.ReplaceMessagesRequest + 46, // 50: gateway.v1.ChatService.SearchMessages:input_type -> gateway.v1.SearchMessagesRequest + 48, // 51: gateway.v1.ChatService.ListSkills:input_type -> gateway.v1.ListSkillsRequest + 51, // 52: gateway.v1.ChatService.CuratorHealth:input_type -> gateway.v1.CuratorHealthRequest + 55, // 53: gateway.v1.ChatService.ReloadChannel:input_type -> gateway.v1.ReloadChannelRequest + 7, // 54: gateway.v1.ChatService.Snapshot:output_type -> gateway.v1.SnapshotResponse + 9, // 55: gateway.v1.ChatService.GetSession:output_type -> gateway.v1.GetSessionResponse + 11, // 56: gateway.v1.ChatService.RecentMessages:output_type -> gateway.v1.RecentMessagesResponse + 13, // 57: gateway.v1.ChatService.RecentTurns:output_type -> gateway.v1.RecentTurnsResponse + 15, // 58: gateway.v1.ChatService.Route:output_type -> gateway.v1.RouteResponse + 17, // 59: gateway.v1.ChatService.Stream:output_type -> gateway.v1.StreamResponse + 19, // 60: gateway.v1.ChatService.Cancel:output_type -> gateway.v1.CancelResponse + 21, // 61: gateway.v1.ChatService.SetPersona:output_type -> gateway.v1.SetPersonaResponse + 23, // 62: gateway.v1.ChatService.ApplyTaskAction:output_type -> gateway.v1.ApplyTaskActionResponse + 25, // 63: gateway.v1.ChatService.ApplyOperatorTaskAction:output_type -> gateway.v1.ApplyOperatorTaskActionResponse + 26, // 64: gateway.v1.ChatService.SaveSession:output_type -> gateway.v1.SaveSessionResponse + 29, // 65: gateway.v1.ChatService.GetSessionsByChannel:output_type -> gateway.v1.GetSessionsByChannelResponse + 31, // 66: gateway.v1.ChatService.DeleteSession:output_type -> gateway.v1.DeleteSessionResponse + 32, // 67: gateway.v1.ChatService.TouchSession:output_type -> gateway.v1.TouchSessionResponse + 30, // 68: gateway.v1.ChatService.ListSessions:output_type -> gateway.v1.ListSessionsResponse + 33, // 69: gateway.v1.ChatService.SaveMessage:output_type -> gateway.v1.SaveMessageResponse + 41, // 70: gateway.v1.ChatService.DeleteRecentMessages:output_type -> gateway.v1.DeleteRecentMessagesResponse + 43, // 71: gateway.v1.ChatService.MessageCount:output_type -> gateway.v1.MessageCountResponse + 34, // 72: gateway.v1.ChatService.SaveMessages:output_type -> gateway.v1.SaveMessagesResponse + 35, // 73: gateway.v1.ChatService.ReplaceMessages:output_type -> gateway.v1.ReplaceMessagesResponse + 47, // 74: gateway.v1.ChatService.SearchMessages:output_type -> gateway.v1.SearchMessagesResponse + 49, // 75: gateway.v1.ChatService.ListSkills:output_type -> gateway.v1.ListSkillsResponse + 52, // 76: gateway.v1.ChatService.CuratorHealth:output_type -> gateway.v1.CuratorHealthResponse + 56, // 77: gateway.v1.ChatService.ReloadChannel:output_type -> gateway.v1.ReloadChannelResponse + 54, // [54:78] is the sub-list for method output_type + 30, // [30:54] is the sub-list for method input_type + 30, // [30:30] is the sub-list for extension type_name + 30, // [30:30] is the sub-list for extension extendee + 0, // [0:30] is the sub-list for field type_name } func init() { file_gateway_v1_chat_proto_init() } @@ -3319,13 +3838,14 @@ func file_gateway_v1_chat_proto_init() { return } file_gateway_v1_chat_proto_msgTypes[3].OneofWrappers = []any{} + file_gateway_v1_chat_proto_msgTypes[53].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_gateway_v1_chat_proto_rawDesc), len(file_gateway_v1_chat_proto_rawDesc)), NumEnums: 0, - NumMessages: 50, + NumMessages: 59, NumExtensions: 0, NumServices: 1, }, diff --git a/internal/contracts/gateway/v1/chat_grpc.pb.go b/internal/contracts/gateway/v1/chat_grpc.pb.go index d15a671f8..a8c02c2e8 100644 --- a/internal/contracts/gateway/v1/chat_grpc.pb.go +++ b/internal/contracts/gateway/v1/chat_grpc.pb.go @@ -40,6 +40,9 @@ const ( ChatService_SaveMessages_FullMethodName = "/gateway.v1.ChatService/SaveMessages" ChatService_ReplaceMessages_FullMethodName = "/gateway.v1.ChatService/ReplaceMessages" ChatService_SearchMessages_FullMethodName = "/gateway.v1.ChatService/SearchMessages" + ChatService_ListSkills_FullMethodName = "/gateway.v1.ChatService/ListSkills" + ChatService_CuratorHealth_FullMethodName = "/gateway.v1.ChatService/CuratorHealth" + ChatService_ReloadChannel_FullMethodName = "/gateway.v1.ChatService/ReloadChannel" ) // ChatServiceClient is the client API for ChatService service. @@ -67,6 +70,9 @@ type ChatServiceClient interface { SaveMessages(ctx context.Context, in *SaveMessagesRequest, opts ...grpc.CallOption) (*SaveMessagesResponse, error) ReplaceMessages(ctx context.Context, in *ReplaceMessagesRequest, opts ...grpc.CallOption) (*ReplaceMessagesResponse, error) SearchMessages(ctx context.Context, in *SearchMessagesRequest, opts ...grpc.CallOption) (*SearchMessagesResponse, error) + ListSkills(ctx context.Context, in *ListSkillsRequest, opts ...grpc.CallOption) (*ListSkillsResponse, error) + CuratorHealth(ctx context.Context, in *CuratorHealthRequest, opts ...grpc.CallOption) (*CuratorHealthResponse, error) + ReloadChannel(ctx context.Context, in *ReloadChannelRequest, opts ...grpc.CallOption) (*ReloadChannelResponse, error) } type chatServiceClient struct { @@ -296,6 +302,36 @@ func (c *chatServiceClient) SearchMessages(ctx context.Context, in *SearchMessag return out, nil } +func (c *chatServiceClient) ListSkills(ctx context.Context, in *ListSkillsRequest, opts ...grpc.CallOption) (*ListSkillsResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ListSkillsResponse) + err := c.cc.Invoke(ctx, ChatService_ListSkills_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *chatServiceClient) CuratorHealth(ctx context.Context, in *CuratorHealthRequest, opts ...grpc.CallOption) (*CuratorHealthResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(CuratorHealthResponse) + err := c.cc.Invoke(ctx, ChatService_CuratorHealth_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *chatServiceClient) ReloadChannel(ctx context.Context, in *ReloadChannelRequest, opts ...grpc.CallOption) (*ReloadChannelResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(ReloadChannelResponse) + err := c.cc.Invoke(ctx, ChatService_ReloadChannel_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + // ChatServiceServer is the server API for ChatService service. // All implementations must embed UnimplementedChatServiceServer // for forward compatibility. @@ -321,6 +357,9 @@ type ChatServiceServer interface { SaveMessages(context.Context, *SaveMessagesRequest) (*SaveMessagesResponse, error) ReplaceMessages(context.Context, *ReplaceMessagesRequest) (*ReplaceMessagesResponse, error) SearchMessages(context.Context, *SearchMessagesRequest) (*SearchMessagesResponse, error) + ListSkills(context.Context, *ListSkillsRequest) (*ListSkillsResponse, error) + CuratorHealth(context.Context, *CuratorHealthRequest) (*CuratorHealthResponse, error) + ReloadChannel(context.Context, *ReloadChannelRequest) (*ReloadChannelResponse, error) mustEmbedUnimplementedChatServiceServer() } @@ -394,6 +433,15 @@ func (UnimplementedChatServiceServer) ReplaceMessages(context.Context, *ReplaceM func (UnimplementedChatServiceServer) SearchMessages(context.Context, *SearchMessagesRequest) (*SearchMessagesResponse, error) { return nil, status.Error(codes.Unimplemented, "method SearchMessages not implemented") } +func (UnimplementedChatServiceServer) ListSkills(context.Context, *ListSkillsRequest) (*ListSkillsResponse, error) { + return nil, status.Error(codes.Unimplemented, "method ListSkills not implemented") +} +func (UnimplementedChatServiceServer) CuratorHealth(context.Context, *CuratorHealthRequest) (*CuratorHealthResponse, error) { + return nil, status.Error(codes.Unimplemented, "method CuratorHealth not implemented") +} +func (UnimplementedChatServiceServer) ReloadChannel(context.Context, *ReloadChannelRequest) (*ReloadChannelResponse, error) { + return nil, status.Error(codes.Unimplemented, "method ReloadChannel not implemented") +} func (UnimplementedChatServiceServer) mustEmbedUnimplementedChatServiceServer() {} func (UnimplementedChatServiceServer) testEmbeddedByValue() {} @@ -786,6 +834,60 @@ func _ChatService_SearchMessages_Handler(srv interface{}, ctx context.Context, d return interceptor(ctx, in, info, handler) } +func _ChatService_ListSkills_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ListSkillsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ChatServiceServer).ListSkills(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: ChatService_ListSkills_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ChatServiceServer).ListSkills(ctx, req.(*ListSkillsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ChatService_CuratorHealth_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CuratorHealthRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ChatServiceServer).CuratorHealth(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: ChatService_CuratorHealth_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ChatServiceServer).CuratorHealth(ctx, req.(*CuratorHealthRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _ChatService_ReloadChannel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ReloadChannelRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ChatServiceServer).ReloadChannel(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: ChatService_ReloadChannel_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ChatServiceServer).ReloadChannel(ctx, req.(*ReloadChannelRequest)) + } + return interceptor(ctx, in, info, handler) +} + // ChatService_ServiceDesc is the grpc.ServiceDesc for ChatService service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -873,6 +975,18 @@ var ChatService_ServiceDesc = grpc.ServiceDesc{ MethodName: "SearchMessages", Handler: _ChatService_SearchMessages_Handler, }, + { + MethodName: "ListSkills", + Handler: _ChatService_ListSkills_Handler, + }, + { + MethodName: "CuratorHealth", + Handler: _ChatService_CuratorHealth_Handler, + }, + { + MethodName: "ReloadChannel", + Handler: _ChatService_ReloadChannel_Handler, + }, }, Streams: []grpc.StreamDesc{ { diff --git a/internal/infrastructure/channelext/channelext.go b/internal/infrastructure/channelext/channelext.go index d487554ed..8866267b3 100644 --- a/internal/infrastructure/channelext/channelext.go +++ b/internal/infrastructure/channelext/channelext.go @@ -82,7 +82,7 @@ func (c *Channel) Start(ctx context.Context, chat messaging.ChatContract, lifecy id := ext.broker.NextId() go ext.broker.AcceptAndServe(id, func(opts []grpc.ServerOption) *grpc.Server { server := grpc.NewServer(opts...) - gatewayrpc.RegisterServer(server, restricted{chat}) + gatewayrpc.RegisterServer(server, restricted{chat}, nil, gatewayrpc.Catalog{}) return server }) diff --git a/internal/infrastructure/channelext/channelext_test.go b/internal/infrastructure/channelext/channelext_test.go index d3dfee254..147e2e7c9 100644 --- a/internal/infrastructure/channelext/channelext_test.go +++ b/internal/infrastructure/channelext/channelext_test.go @@ -30,7 +30,7 @@ func (c *recordingChat) ApplyOperatorTaskAction(context.Context, taskactions.Act func TestChannelExtensionCannotActAsOperator(t *testing.T) { chat := &recordingChat{} server := grpc.NewServer() - gatewayrpc.RegisterServer(server, restricted{chat}) + gatewayrpc.RegisterServer(server, restricted{chat}, nil, gatewayrpc.Catalog{}) lc := net.ListenConfig{} ln, err := lc.Listen(t.Context(), "tcp", "127.0.0.1:0") if err != nil { diff --git a/internal/infrastructure/gatewayrpc/catalog.go b/internal/infrastructure/gatewayrpc/catalog.go new file mode 100644 index 000000000..a2a484872 --- /dev/null +++ b/internal/infrastructure/gatewayrpc/catalog.go @@ -0,0 +1,151 @@ +package gatewayrpc + +import ( + "context" + "time" + + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + + pb "github.com/samcharles93/archie-core/internal/contracts/gateway/v1" +) + +// SkillEntry is one catalogued skill as the Skills page shows it: what it does +// and where it was discovered. +type SkillEntry struct { + Name string + Description string + Workflow string + Source string +} + +// CuratorState is one registered curator's observable state: identity, health +// and recent activity. HasActivity is false for a curator that has never run. +type CuratorState struct { + Name string + HealthStatus string + HealthMessage string + HasActivity bool + LastRunAt time.Time + LastRunActions int + Recent []CuratorAction +} + +// CuratorAction is one recorded curator action. +type CuratorAction struct { + At time.Time + Type string + Detail string + Reason string +} + +// Catalog supplies the process-owned runtime surfaces the dashboard reads over +// ChatService. A zero Catalog answers empty lists and an Unavailable reload, +// which is the honest answer from a process that hosts none of them. +type Catalog struct { + Skills func() []SkillEntry + Curators func(context.Context) []CuratorState + ReloadChannel func(context.Context, string) error +} + +// CatalogClient is the subset of the Gateway client the dashboard's catalog +// surfaces consume. +type CatalogClient interface { + ListSkills(ctx context.Context) ([]SkillEntry, error) + CuratorHealth(ctx context.Context) ([]CuratorState, error) + ReloadChannel(ctx context.Context, id string) error +} + +var _ CatalogClient = (*Client)(nil) + +func (s *server) ListSkills(_ context.Context, _ *pb.ListSkillsRequest) (*pb.ListSkillsResponse, error) { + if s.catalog.Skills == nil { + return &pb.ListSkillsResponse{}, nil + } + entries := s.catalog.Skills() + out := make([]*pb.Skill, 0, len(entries)) + for _, e := range entries { + out = append(out, &pb.Skill{ + Name: e.Name, Description: e.Description, Workflow: e.Workflow, Source: e.Source, + }) + } + return &pb.ListSkillsResponse{Skills: out}, nil +} + +func (s *server) CuratorHealth(ctx context.Context, _ *pb.CuratorHealthRequest) (*pb.CuratorHealthResponse, error) { + if s.catalog.Curators == nil { + return &pb.CuratorHealthResponse{}, nil + } + states := s.catalog.Curators(ctx) + out := make([]*pb.Curator, 0, len(states)) + for _, st := range states { + curator := &pb.Curator{ + Name: st.Name, + HealthStatus: st.HealthStatus, + HealthMessage: st.HealthMessage, + LastRunActions: int64(st.LastRunActions), + } + if st.HasActivity { + curator.LastRunAt = timestamp(st.LastRunAt) + } + for _, a := range st.Recent { + curator.RecentActions = append(curator.RecentActions, &pb.CuratorAction{ + At: timestamp(a.At), Type: a.Type, Detail: a.Detail, Reason: a.Reason, + }) + } + out = append(out, curator) + } + return &pb.CuratorHealthResponse{Curators: out}, nil +} + +func (s *server) ReloadChannel(ctx context.Context, r *pb.ReloadChannelRequest) (*pb.ReloadChannelResponse, error) { + if s.catalog.ReloadChannel == nil { + return nil, status.Error(codes.Unavailable, "this gateway hosts no channels") + } + if err := s.catalog.ReloadChannel(ctx, r.ChannelId); err != nil { + return nil, err + } + return &pb.ReloadChannelResponse{}, nil +} + +func (c *Client) ListSkills(ctx context.Context) ([]SkillEntry, error) { + v, err := c.client.ListSkills(ctx, &pb.ListSkillsRequest{}) + if err != nil { + return nil, err + } + out := make([]SkillEntry, 0, len(v.Skills)) + for _, s := range v.Skills { + out = append(out, SkillEntry{Name: s.Name, Description: s.Description, Workflow: s.Workflow, Source: s.Source}) + } + return out, nil +} + +func (c *Client) CuratorHealth(ctx context.Context) ([]CuratorState, error) { + v, err := c.client.CuratorHealth(ctx, &pb.CuratorHealthRequest{}) + if err != nil { + return nil, err + } + out := make([]CuratorState, 0, len(v.Curators)) + for _, curator := range v.Curators { + state := CuratorState{ + Name: curator.Name, + HealthStatus: curator.HealthStatus, + HealthMessage: curator.HealthMessage, + LastRunActions: int(curator.LastRunActions), + } + if curator.LastRunAt != nil { + state.HasActivity = true + state.LastRunAt = curator.LastRunAt.AsTime() + } + for _, a := range curator.RecentActions { + state.Recent = append(state.Recent, CuratorAction{At: timeValue(a.At), Type: a.Type, Detail: a.Detail, Reason: a.Reason}) + } + out = append(out, state) + } + return out, nil +} + +func (c *Client) ReloadChannel(ctx context.Context, id string) error { + _, err := c.client.ReloadChannel(ctx, &pb.ReloadChannelRequest{ChannelId: id}) + return err +} diff --git a/internal/infrastructure/gatewayrpc/server.go b/internal/infrastructure/gatewayrpc/server.go index 0cdebf31c..bebfbeb3a 100644 --- a/internal/infrastructure/gatewayrpc/server.go +++ b/internal/infrastructure/gatewayrpc/server.go @@ -18,14 +18,15 @@ type server struct { pb.UnimplementedChatServiceServer chat messaging.ChatContract sessions messaging.SessionStore + catalog Catalog } -func RegisterServer(registrar grpc.ServiceRegistrar, chat messaging.ChatContract, sessions ...messaging.SessionStore) { - var ss messaging.SessionStore - if len(sessions) > 0 { - ss = sessions[0] - } - pb.RegisterChatServiceServer(registrar, &server{chat: chat, sessions: ss}) +// RegisterServer serves the Gateway chat contract. catalog supplies the +// process-owned runtime surfaces (skill catalogue, curator registry, channel +// reload) the dashboard reads over the same contract; a zero Catalog answers +// empty lists and an Unavailable reload. +func RegisterServer(registrar grpc.ServiceRegistrar, chat messaging.ChatContract, sessions messaging.SessionStore, catalog Catalog) { + pb.RegisterChatServiceServer(registrar, &server{chat: chat, sessions: sessions, catalog: catalog}) } func (s *server) sessionStore() (messaging.SessionStore, error) { diff --git a/proto/gateway/v1/chat.proto b/proto/gateway/v1/chat.proto index 6d8805707..909afba7f 100644 --- a/proto/gateway/v1/chat.proto +++ b/proto/gateway/v1/chat.proto @@ -26,6 +26,9 @@ service ChatService { rpc SaveMessages(SaveMessagesRequest) returns (SaveMessagesResponse); rpc ReplaceMessages(ReplaceMessagesRequest) returns (ReplaceMessagesResponse); rpc SearchMessages(SearchMessagesRequest) returns (SearchMessagesResponse); + rpc ListSkills(ListSkillsRequest) returns (ListSkillsResponse); + rpc CuratorHealth(CuratorHealthRequest) returns (CuratorHealthResponse); + rpc ReloadChannel(ReloadChannelRequest) returns (ReloadChannelResponse); } message Session { @@ -213,3 +216,39 @@ message SaveMessagesRequest { string session_id = 1; repeated Message messages = message ReplaceMessagesRequest { string session_id = 1; repeated Message messages = 2; repeated string superseded = 3; } message SearchMessagesRequest { string session_id = 1; string query = 2; int64 limit = 3; int64 offset = 4; } message SearchMessagesResponse { repeated Message messages = 1; int64 next_offset = 2; bool has_more = 3; bool truncated = 4; } + +// ListSkills reports the live skill catalogue the Gateway runs, as the +// dashboard's Skills page shows it. source labels where each skill was +// discovered (project, shared, user-global or stored). +message ListSkillsRequest {} +message ListSkillsResponse { repeated Skill skills = 1; } +message Skill { + string name = 1; + string description = 2; + string workflow = 3; + string source = 4; +} + +// CuratorHealth reports every registered curator's point-in-time health and +// recent activity. last_run_at is absent for a curator that has never run. +message CuratorHealthRequest {} +message CuratorHealthResponse { repeated Curator curators = 1; } +message Curator { + string name = 1; + string health_status = 2; + string health_message = 3; + optional google.protobuf.Timestamp last_run_at = 4; + int64 last_run_actions = 5; + repeated CuratorAction recent_actions = 6; +} +message CuratorAction { + google.protobuf.Timestamp at = 1; + string type = 2; + string detail = 3; + string reason = 4; +} + +// ReloadChannel asks the process hosting a channel to re-read its +// configuration. It is Unavailable from a Gateway that hosts no channels. +message ReloadChannelRequest { string channel_id = 1; } +message ReloadChannelResponse {}