DEV-000065 assistant presence attention surface
CI / test (push) Successful in 16s
CI / test (pull_request) Successful in 15s

This commit is contained in:
m
2026-08-17 16:23:16 +03:00
parent 6e73318e49
commit 5d4e064a94
26 changed files with 1335 additions and 20 deletions
+26
View File
@@ -183,3 +183,29 @@ func (c creatorContinuityClient) Item(ctx context.Context, authorization string,
return continuity.ProspectiveItem{}, errCreatorQueryUnavailable
}
}
func (c creatorContinuityClient) InternalItem(ctx context.Context, id continuity.ProspectiveItemID) (continuity.ProspectiveItem, error) {
target := *c.baseURL
target.Path = "/v1/prospective-items/" + url.PathEscape(string(id))
target.RawQuery = ""
request, err := http.NewRequestWithContext(ctx, http.MethodGet, target.String(), nil)
if err != nil {
return continuity.ProspectiveItem{}, errCreatorQueryUnavailable
}
response, err := c.client.Do(request)
if err != nil {
return continuity.ProspectiveItem{}, fmt.Errorf("%w: %v", errCreatorQueryUnavailable, err)
}
defer response.Body.Close()
if response.StatusCode == http.StatusNotFound {
return continuity.ProspectiveItem{}, errCreatorSubjectMissing
}
if response.StatusCode != http.StatusOK {
return continuity.ProspectiveItem{}, errCreatorQueryUnavailable
}
var item continuity.ProspectiveItem
if err := json.NewDecoder(io.LimitReader(response.Body, 32<<10)).Decode(&item); err != nil {
return continuity.ProspectiveItem{}, errCreatorQueryUnavailable
}
return item, nil
}
+135
View File
@@ -0,0 +1,135 @@
package main
import (
"context"
"encoding/json"
"errors"
"net/http"
"strings"
"time"
"git.cin.su/m/Assistant/adapters/notificationexecutor"
commitcontract "git.cin.su/m/Assistant/contracts/commit"
"git.cin.su/m/Assistant/contracts/continuity"
"git.cin.su/m/Assistant/contracts/identity"
"git.cin.su/m/Assistant/contracts/work"
commitdomain "git.cin.su/m/Assistant/modules/commit/domain"
"git.cin.su/m/Assistant/modules/commit/ports"
"git.cin.su/m/Assistant/platform/ids"
)
const prospectiveNotificationActor identity.ActorID = "domovoy-creator-actor"
type internalNotificationContinuity interface {
InternalItem(context.Context, continuity.ProspectiveItemID) (continuity.ProspectiveItem, error)
}
type internalNotificationHandler struct {
core creatorSessionSource
continuity internalNotificationContinuity
authority creatorAuthoritySource
repository creatorCommitRepository
executor ports.Executor
newID func() (ids.ID, error)
now func() time.Time
}
type internalProspectiveNotificationRequest struct {
ProspectiveItemID continuity.ProspectiveItemID `json:"prospective_item_id"`
ExpectedRevision continuity.ProspectiveRevision `json:"expected_revision"`
}
func registerInternalNotificationRoutes(mux *http.ServeMux, handler internalNotificationHandler, token string) {
mux.HandleFunc("POST /v1/internal/continuity/notify-due", requireCommitToken(token, handler.notifyDue))
}
func (h internalNotificationHandler) notifyDue(w http.ResponseWriter, r *http.Request) {
var request internalProspectiveNotificationRequest
decoder := json.NewDecoder(http.MaxBytesReader(w, r.Body, 8<<10))
decoder.DisallowUnknownFields()
if err := decoder.Decode(&request); err != nil || ensureCreatorEOF(decoder) != nil || request.ProspectiveItemID == "" || request.ExpectedRevision == 0 {
http.Error(w, "invalid prospective notification request", http.StatusBadRequest)
return
}
item, err := h.continuity.InternalItem(r.Context(), request.ProspectiveItemID)
if errors.Is(err, errCreatorSubjectMissing) {
http.Error(w, "prospective item not found", http.StatusNotFound)
return
}
if err != nil {
http.Error(w, "Continuity item unavailable", http.StatusServiceUnavailable)
return
}
if item.State != continuity.ProspectiveDelivered || item.Revision != request.ExpectedRevision || item.OwnerPrincipalID == "" || item.ScopeID == "" {
http.Error(w, "prospective item not deliverable", http.StatusConflict)
return
}
grant, scope, err := h.authority.LoadGrant(r.Context(), creatorGrantID)
if err != nil || scope.ID != item.ScopeID {
http.Error(w, "Creator authority unavailable", http.StatusConflict)
return
}
identityBinding, err := h.core.Binding(r.Context(), prospectiveNotificationActor, item.OwnerPrincipalID)
if err != nil {
http.Error(w, "Creator identity binding unavailable", http.StatusConflict)
return
}
capabilityBinding, err := h.core.ActiveCapabilityBinding(r.Context(), commitcontract.CapabilityProspectiveNotification, item.OwnerPrincipalID)
if err != nil {
http.Error(w, "notification capability unavailable", http.StatusConflict)
return
}
intentID, authorizedID, attemptID, err := internalActionIDs(h.newID)
if err != nil {
http.Error(w, "action identity unavailable", http.StatusServiceUnavailable)
return
}
title := "Домовой: напоминание"
message := "Пора: " + strings.TrimSpace(item.Summary)
payload := notificationexecutor.Payload{ActionIntentID: intentID, TemplateCode: commitcontract.ProspectiveDeliveredTemplateV1, ProspectiveItemID: string(item.ID), ExpectedRevision: int64(item.Revision), Title: title, Message: message}
digest, err := notificationexecutor.Digest(payload)
if err != nil {
http.Error(w, "notification evidence unavailable", http.StatusInternalServerError)
return
}
proposal := commitcontract.ActionProposal{
IntentID: intentID, ActorID: prospectiveNotificationActor, CapabilityID: commitcontract.CapabilityProspectiveNotification,
Target: work.TaskTarget{ScopeID: item.ScopeID, Revision: 1}, Operation: commitcontract.OperationDeliverProspectiveNotification,
NotificationSubject: commitcontract.ProspectiveNotificationSubject{ProspectiveItemID: item.ID, ExpectedRevision: item.Revision, TemplateCode: commitcontract.ProspectiveDeliveredTemplateV1, BindingID: capabilityBinding.ID, BindingRevision: capabilityBinding.Revision, RenderedTitle: title, RenderedMessage: message, RequestDigest: digest},
}
action, err := commitdomain.Authorize(proposal, commitdomain.AuthorizationContext{Binding: identityBinding, Scope: scope, Grant: grant}, authorityValidator{}, authorizedID, h.now().UnixMilli())
if err != nil {
http.Error(w, "Creator authorization denied", http.StatusConflict)
return
}
if err = h.repository.SaveAuthorized(r.Context(), action); err != nil {
http.Error(w, "commit authorized action", http.StatusInternalServerError)
return
}
attempt, operationErr := executeAuthorized(r.Context(), h.repository, h.executor, action, attemptID)
if operationErr != nil && !errors.Is(operationErr, commitdomain.ErrUnknownOutcome) {
http.Error(w, "execute committed notification", http.StatusInternalServerError)
return
}
status := http.StatusCreated
if errors.Is(operationErr, commitdomain.ErrUnknownOutcome) {
status = http.StatusAccepted
}
writeCreatorActionResponse(w, status, action, attempt)
}
func internalActionIDs(newID func() (ids.ID, error)) (commitcontract.ActionIntentID, commitcontract.AuthorizedActionID, commitcontract.ActionAttemptID, error) {
intent, err := newID()
if err != nil {
return "", "", "", err
}
authorized, err := newID()
if err != nil {
return "", "", "", err
}
attempt, err := newID()
if err != nil {
return "", "", "", err
}
return commitcontract.ActionIntentID(intent), commitcontract.AuthorizedActionID(authorized), commitcontract.ActionAttemptID(attempt), nil
}
+4
View File
@@ -89,6 +89,10 @@ func main() {
core: creatorCore, continuity: creatorContinuity, authority: authorityRepository, repository: repository,
executor: dispatcher, reconciler: dispatcher, newID: ids.New, now: time.Now,
})
registerInternalNotificationRoutes(mux, internalNotificationHandler{
core: creatorCore, continuity: creatorContinuity, authority: authorityRepository, repository: repository,
executor: dispatcher, newID: ids.New, now: time.Now,
}, executorToken)
mux.HandleFunc("POST /v1/authorized-actions", func(w http.ResponseWriter, r *http.Request) {
var request authorizationRequest
if err := json.NewDecoder(r.Body).Decode(&request); err != nil {
+112
View File
@@ -0,0 +1,112 @@
package main
import (
"context"
"encoding/json"
"errors"
"net/http"
"git.cin.su/m/Assistant/contracts/continuity"
"git.cin.su/m/Assistant/contracts/identity"
)
type attentionRepository interface {
AttentionByOwner(context.Context, identity.PrincipalID, int) ([]continuity.AttentionItem, error)
}
func registerCreatorAttentionRoutes(mux *http.ServeMux, identityClient creatorIdentityClient, repository attentionRepository) {
mux.HandleFunc("GET /v1/creator/attention", func(w http.ResponseWriter, r *http.Request) {
session, ok := creatorSessionForAttention(w, r, identityClient)
if !ok {
return
}
limit, err := parseListLimit(r.URL.Query().Get("limit"))
if err != nil {
http.Error(w, "invalid attention limit", http.StatusBadRequest)
return
}
items, err := repository.AttentionByOwner(r.Context(), session.PrincipalID, limit)
if err != nil {
http.Error(w, "attention unavailable", http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "application/json")
w.Header().Set("Cache-Control", "no-store")
_ = json.NewEncoder(w).Encode(continuity.AttentionListResult{Items: items})
})
mux.HandleFunc("GET /v1/creator/today", func(w http.ResponseWriter, r *http.Request) {
session, ok := creatorSessionForAttention(w, r, identityClient)
if !ok {
return
}
items, err := repository.AttentionByOwner(r.Context(), session.PrincipalID, 50)
if err != nil {
http.Error(w, "today unavailable", http.StatusInternalServerError)
return
}
result := continuity.TodayResult{Items: make([]continuity.TodayItem, 0, len(items))}
for _, item := range items {
result.Items = append(result.Items, continuity.TodayItem{
Title: item.Summary,
WhenUnixMillis: item.DueAtUnixMillis,
AttentionLevel: item.Level,
AttentionState: item.State,
HumanState: humanAttentionState(item.State),
DeliveryState: humanDeliveryState(item),
SourceDescription: humanAttentionSource(item.SourceKind),
})
}
w.Header().Set("Content-Type", "application/json")
w.Header().Set("Cache-Control", "no-store")
_ = json.NewEncoder(w).Encode(result)
})
}
func creatorSessionForAttention(w http.ResponseWriter, r *http.Request, identityClient creatorIdentityClient) (identity.CreatorSession, bool) {
session, err := identityClient.Session(r.Context(), r.Header.Get("Authorization"))
if errors.Is(err, errCreatorSessionDenied) {
http.Error(w, "creator session denied", http.StatusUnauthorized)
return identity.CreatorSession{}, false
}
if err != nil {
http.Error(w, "identity service unavailable", http.StatusServiceUnavailable)
return identity.CreatorSession{}, false
}
return session, true
}
func humanAttentionState(state continuity.AttentionState) string {
switch state {
case continuity.AttentionPending:
return "ожидает внимания"
case continuity.AttentionDelivering:
return "доставляется"
case continuity.AttentionDelivered:
return "доставлено"
case continuity.AttentionSuppressed:
return "скрыто"
case continuity.AttentionExpired:
return "истекло"
case continuity.AttentionFailed:
return "не доставлено"
default:
return "состояние уточняется"
}
}
func humanDeliveryState(item continuity.AttentionItem) string {
if item.State == continuity.AttentionDelivered {
return "уведомление отправлено"
}
if item.State == continuity.AttentionDelivering {
return "уведомление отправляется"
}
return "уведомление ещё не отправлено"
}
func humanAttentionSource(kind continuity.AttentionSourceKind) string {
if kind == continuity.AttentionSourceProspectiveReminder {
return "напоминание"
}
return "событие Домового"
}
+183
View File
@@ -0,0 +1,183 @@
package main
import (
"bytes"
"context"
"encoding/json"
"fmt"
"log"
"net/http"
"net/url"
"time"
commitcontract "git.cin.su/m/Assistant/contracts/commit"
"git.cin.su/m/Assistant/contracts/continuity"
"git.cin.su/m/Assistant/platform/ids"
)
type dueReminderRepository interface {
DueArmed(context.Context, int64, int) ([]continuity.ProspectiveItem, error)
ClaimDueReminder(context.Context, continuity.ProspectiveItemID, continuity.ProspectiveRevision, continuity.AttentionItemID, int64) (continuity.ProspectiveItem, continuity.AttentionItem, error)
PendingAttention(context.Context, int) ([]continuity.AttentionItem, error)
MarkAttentionDelivering(context.Context, continuity.AttentionItemID, continuity.AttentionRevision) (continuity.AttentionItem, error)
MarkAttentionDelivered(context.Context, continuity.AttentionItemID, continuity.AttentionRevision, continuity.CommittedActionIntentID, continuity.CommittedAuthorizedActionID, continuity.CommittedActionAttemptID, string, int64) (continuity.AttentionItem, error)
Load(context.Context, continuity.ProspectiveItemID) (continuity.ProspectiveItem, error)
}
type dueNotificationClient struct {
baseURL *url.URL
token string
client *http.Client
}
type dueNotifier interface {
NotifyDue(context.Context, continuity.ProspectiveItem) (dueNotificationResponse, error)
}
type dueNotificationRequest struct {
ProspectiveItemID continuity.ProspectiveItemID `json:"prospective_item_id"`
ExpectedRevision continuity.ProspectiveRevision `json:"expected_revision"`
}
type dueNotificationResponse struct {
AuthorizedActionID commitcontract.AuthorizedActionID `json:"AuthorizedActionID"`
ActionIntentID commitcontract.ActionIntentID `json:"ActionIntentID"`
ActionAttemptID commitcontract.ActionAttemptID `json:"ActionAttemptID"`
State commitcontract.ActionState `json:"State"`
}
func newDueNotificationClient(rawURL, token string, client *http.Client) (dueNotificationClient, error) {
base, err := url.Parse(rawURL)
if err != nil || base.Scheme == "" || base.Host == "" || token == "" {
return dueNotificationClient{}, fmt.Errorf("invalid Commit due notification configuration")
}
if client == nil {
client = http.DefaultClient
}
return dueNotificationClient{baseURL: base, token: token, client: client}, nil
}
func (c dueNotificationClient) NotifyDue(ctx context.Context, item continuity.ProspectiveItem) (dueNotificationResponse, error) {
target := *c.baseURL
target.Path = "/v1/internal/continuity/notify-due"
payload, err := json.Marshal(dueNotificationRequest{ProspectiveItemID: item.ID, ExpectedRevision: item.Revision})
if err != nil {
return dueNotificationResponse{}, err
}
request, err := http.NewRequestWithContext(ctx, http.MethodPost, target.String(), bytes.NewReader(payload))
if err != nil {
return dueNotificationResponse{}, err
}
request.Header.Set("Authorization", "Bearer "+c.token)
request.Header.Set("Content-Type", "application/json")
response, err := c.client.Do(request)
if err != nil {
return dueNotificationResponse{}, err
}
defer response.Body.Close()
if response.StatusCode != http.StatusCreated && response.StatusCode != http.StatusAccepted {
return dueNotificationResponse{}, fmt.Errorf("commit due notification status %d", response.StatusCode)
}
var result dueNotificationResponse
if err := json.NewDecoder(response.Body).Decode(&result); err != nil {
return dueNotificationResponse{}, err
}
if result.ActionIntentID == "" || result.AuthorizedActionID == "" || result.ActionAttemptID == "" {
return dueNotificationResponse{}, fmt.Errorf("invalid commit due notification response")
}
return result, nil
}
type dueReminderWorker struct {
repository dueReminderRepository
commit dueNotifier
now func() time.Time
newID func() (ids.ID, error)
interval time.Duration
limit int
}
func (w dueReminderWorker) Start(ctx context.Context) {
if w.interval <= 0 {
w.interval = 15 * time.Second
}
if w.limit <= 0 {
w.limit = 10
}
go func() {
w.process(ctx)
ticker := time.NewTicker(w.interval)
defer ticker.Stop()
for {
select {
case <-ctx.Done():
return
case <-ticker.C:
w.process(ctx)
}
}
}()
}
func (w dueReminderWorker) process(ctx context.Context) {
now := w.now()
if err := w.claimDue(ctx, now); err != nil {
log.Printf("due reminder claim skipped: %v", err)
}
if err := w.deliverPending(ctx, now); err != nil {
log.Printf("due reminder delivery skipped: %v", err)
}
}
func (w dueReminderWorker) claimDue(ctx context.Context, now time.Time) error {
items, err := w.repository.DueArmed(ctx, now.UnixMilli(), w.limit)
if err != nil {
return err
}
for _, item := range items {
id, err := w.newID()
if err != nil {
return err
}
if _, _, err = w.repository.ClaimDueReminder(ctx, item.ID, item.Revision, continuity.AttentionItemID(id), now.UnixMilli()); err != nil {
log.Printf("due reminder %s not claimed: %v", item.ID, err)
}
}
return nil
}
func (w dueReminderWorker) deliverPending(ctx context.Context, now time.Time) error {
items, err := w.repository.PendingAttention(ctx, w.limit)
if err != nil {
return err
}
for _, attention := range items {
if attention.SourceKind != continuity.AttentionSourceProspectiveReminder || attention.SourceProspectiveID == "" {
continue
}
delivering, err := w.repository.MarkAttentionDelivering(ctx, attention.ID, attention.Revision)
if err != nil {
log.Printf("attention %s not marked delivering: %v", attention.ID, err)
continue
}
prospective, err := w.repository.Load(ctx, delivering.SourceProspectiveID)
if err != nil {
log.Printf("attention %s source unavailable: %v", attention.ID, err)
continue
}
result, err := w.commit.NotifyDue(ctx, prospective)
if err != nil {
log.Printf("attention %s notification unavailable: %v", attention.ID, err)
continue
}
_, err = w.repository.MarkAttentionDelivered(ctx, delivering.ID, delivering.Revision,
continuity.CommittedActionIntentID(result.ActionIntentID),
continuity.CommittedAuthorizedActionID(result.AuthorizedActionID),
continuity.CommittedActionAttemptID(result.ActionAttemptID),
string(result.State), now.UnixMilli())
if err != nil {
log.Printf("attention %s delivery outcome not persisted: %v", attention.ID, err)
}
}
return nil
}
+92
View File
@@ -0,0 +1,92 @@
package main
import (
"context"
"testing"
"time"
"git.cin.su/m/Assistant/contracts/authority"
commitcontract "git.cin.su/m/Assistant/contracts/commit"
"git.cin.su/m/Assistant/contracts/continuity"
"git.cin.su/m/Assistant/contracts/identity"
"git.cin.su/m/Assistant/platform/ids"
)
type memoryDueRepo struct {
item continuity.ProspectiveItem
attention continuity.AttentionItem
}
func (r *memoryDueRepo) DueArmed(context.Context, int64, int) ([]continuity.ProspectiveItem, error) {
if r.item.State == continuity.ProspectiveArmed {
return []continuity.ProspectiveItem{r.item}, nil
}
return nil, nil
}
func (r *memoryDueRepo) ClaimDueReminder(_ context.Context, id continuity.ProspectiveItemID, revision continuity.ProspectiveRevision, attentionID continuity.AttentionItemID, now int64) (continuity.ProspectiveItem, continuity.AttentionItem, error) {
if r.item.ID != id || r.item.Revision != revision || r.item.State != continuity.ProspectiveArmed {
return continuity.ProspectiveItem{}, continuity.AttentionItem{}, nil
}
r.item.State = continuity.ProspectiveDelivered
r.item.Revision += 3
r.attention = continuity.AttentionItem{ID: attentionID, OwnerPrincipalID: r.item.OwnerPrincipalID, ScopeID: r.item.ScopeID, SourceKind: continuity.AttentionSourceProspectiveReminder, SourceProspectiveID: r.item.ID, Level: continuity.AttentionDue, State: continuity.AttentionPending, Summary: r.item.Summary, DueAtUnixMillis: r.item.TriggerAtUnixMillis, CreatedAtUnixMillis: now, Revision: 1}
return r.item, r.attention, nil
}
func (r *memoryDueRepo) PendingAttention(context.Context, int) ([]continuity.AttentionItem, error) {
if r.attention.State == continuity.AttentionPending {
return []continuity.AttentionItem{r.attention}, nil
}
return nil, nil
}
func (r *memoryDueRepo) MarkAttentionDelivering(_ context.Context, id continuity.AttentionItemID, revision continuity.AttentionRevision) (continuity.AttentionItem, error) {
if r.attention.ID == id && r.attention.Revision == revision {
r.attention.State = continuity.AttentionDelivering
r.attention.Revision++
}
return r.attention, nil
}
func (r *memoryDueRepo) MarkAttentionDelivered(_ context.Context, id continuity.AttentionItemID, revision continuity.AttentionRevision, intentID continuity.CommittedActionIntentID, authorizedID continuity.CommittedAuthorizedActionID, attemptID continuity.CommittedActionAttemptID, outcome string, deliveredAt int64) (continuity.AttentionItem, error) {
if r.attention.ID == id && r.attention.Revision == revision {
r.attention.State = continuity.AttentionDelivered
r.attention.Revision++
r.attention.ActionIntentID = intentID
r.attention.AuthorizedActionID = authorizedID
r.attention.ActionAttemptID = attemptID
r.attention.DeliveryOutcome = outcome
r.attention.DeliveredAtUnixMillis = deliveredAt
}
return r.attention, nil
}
func (r *memoryDueRepo) Load(context.Context, continuity.ProspectiveItemID) (continuity.ProspectiveItem, error) {
return r.item, nil
}
type fakeDueNotifier struct{ calls int }
func (n *fakeDueNotifier) NotifyDue(context.Context, continuity.ProspectiveItem) (dueNotificationResponse, error) {
n.calls++
return dueNotificationResponse{ActionIntentID: "intent", AuthorizedActionID: "authorized", ActionAttemptID: "attempt", State: commitcontract.ActionSucceeded}, nil
}
func TestDueReminderProducesAttentionAndNotificationOnce(t *testing.T) {
repo := &memoryDueRepo{item: continuity.ProspectiveItem{ID: "prospective", OwnerPrincipalID: identity.PrincipalID("owner"), ScopeID: authority.ScopeID("scope"), Summary: "проверить уведомление", TriggerAtUnixMillis: 10, State: continuity.ProspectiveArmed, Revision: 1}}
notifier := &fakeDueNotifier{}
now := time.UnixMilli(20)
worker := dueReminderWorker{repository: repo, commit: notifier, now: func() time.Time { return now }, newID: func() (ids.ID, error) { return ids.ID("attention"), nil }, limit: 10}
worker.process(context.Background())
worker.process(context.Background())
if repo.item.State != continuity.ProspectiveDelivered || repo.attention.State != continuity.AttentionDelivered {
t.Fatalf("unexpected states: prospective=%s attention=%s", repo.item.State, repo.attention.State)
}
if notifier.calls != 1 {
t.Fatalf("expected one notification call, got %d", notifier.calls)
}
if repo.attention.ActionIntentID == "" || repo.attention.DeliveredAtUnixMillis == 0 {
t.Fatal("delivery evidence was not persisted")
}
}
+9
View File
@@ -11,6 +11,7 @@ import (
"git.cin.su/m/Assistant/adapters/postgres"
"git.cin.su/m/Assistant/contracts/continuity"
"git.cin.su/m/Assistant/platform/ids"
"git.cin.su/m/Assistant/runtime/health"
)
@@ -34,6 +35,13 @@ func main() {
if executorToken == "" {
log.Fatal("COMMIT_EXECUTOR_TOKEN is required")
}
commitClient, err := newDueNotificationClient(envOr("COMMIT_RUNTIME_URL", "http://commit-runtime:8082"), executorToken, &http.Client{Timeout: 10 * time.Second})
if err != nil {
log.Fatal(err)
}
workerContext, cancelWorker := context.WithCancel(context.Background())
defer cancelWorker()
dueReminderWorker{repository: repository, commit: commitClient, now: time.Now, newID: ids.New, interval: 5 * time.Second, limit: 10}.Start(workerContext)
registerInternalExecutorRoutes(mux, repository, executorToken)
mux.HandleFunc("POST /v1/prospective-items", func(w http.ResponseWriter, r *http.Request) {
var item continuity.ProspectiveItem
@@ -104,6 +112,7 @@ func main() {
Items []continuity.ProspectiveItem
}{Items: items})
})
registerCreatorAttentionRoutes(mux, identityClient, repository)
log.Printf("continuity-runtime listening on %s", addr)
if err := http.ListenAndServe(addr, mux); err != nil {
log.Fatal(err)
+20
View File
@@ -145,6 +145,24 @@ func buildReminderRequest(message string, session identity.CreatorSession, inten
func parseReminderTime(message string, now time.Time) (time.Time, error) {
lower := strings.ToLower(message)
relative := regexp.MustCompile(`через\s+(\d{1,3})\s*(минуту|минуты|минут|час|часа|часов)`)
if match := relative.FindStringSubmatch(lower); len(match) > 0 {
value, err := strconv.Atoi(match[1])
if err != nil || value < 1 {
return time.Time{}, fmt.Errorf("invalid relative reminder time")
}
unit := match[2]
if strings.HasPrefix(unit, "час") {
if value > 72 {
return time.Time{}, fmt.Errorf("relative reminder time is too far")
}
return now.Add(time.Duration(value) * time.Hour), nil
}
if value > 24*60 {
return time.Time{}, fmt.Errorf("relative reminder time is too far")
}
return now.Add(time.Duration(value) * time.Minute), nil
}
day := now
if strings.Contains(lower, "послезавтра") {
day = now.AddDate(0, 0, 2)
@@ -187,6 +205,8 @@ func reminderSummary(message string) string {
for _, word := range []string{"послезавтра", "завтра", "сегодня"} {
clean = strings.TrimSpace(strings.ReplaceAll(strings.ToLower(clean), word, ""))
}
relative := regexp.MustCompile(`(?i)через\s+\d{1,3}\s*(минуту|минуты|минут|час|часа|часов)`)
clean = strings.TrimSpace(relative.ReplaceAllString(clean, ""))
re := regexp.MustCompile(`(?i)(в|на)\s+[0-2]?\d(?::[0-5]\d)?`)
clean = strings.TrimSpace(re.ReplaceAllString(clean, ""))
clean = strings.Trim(clean, " .,!?:;")
+15
View File
@@ -29,6 +29,21 @@ func TestBuildReminderRequestParsesTomorrowAtTen(t *testing.T) {
}
}
func TestBuildReminderRequestParsesRelativeMinutes(t *testing.T) {
now := time.Date(2026, 8, 17, 12, 0, 0, 0, time.FixedZone("MSK", 3*60*60))
request, err := buildReminderRequest("Напомни мне через 3 минуты проверить уведомление.", identity.CreatorSession{PrincipalID: "principal-1"}, interaction.OriginalHumanIntent{ID: "intent-1"}, interaction.HumanUtterance{ID: "utterance-1"}, now)
if err != nil {
t.Fatal(err)
}
trigger := time.UnixMilli(request.TriggerAtUnixMillis).In(now.Location())
if !trigger.Equal(now.Add(3 * time.Minute)) {
t.Fatalf("unexpected trigger: %s", trigger)
}
if request.Summary != "проверить уведомление" {
t.Fatalf("unexpected summary: %q", request.Summary)
}
}
func TestContinuityReminderClientDoesNotAcceptFalseSuccess(t *testing.T) {
upstream := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path != "/v1/creator/reminders" || r.Header.Get("Authorization") != "Bearer session" {
+4
View File
@@ -494,6 +494,10 @@ func creatorRoute(method, path string) (routeTarget, string, bool) {
}
case method == http.MethodGet && path == "/api/prospective-items":
return targetContinuity, "/v1/creator/prospective-items", true
case method == http.MethodGet && path == "/api/attention":
return targetContinuity, "/v1/creator/attention", true
case method == http.MethodGet && path == "/api/today":
return targetContinuity, "/v1/creator/today", true
case method == http.MethodGet && path == "/api/actions":
return targetCommit, "/v1/creator/authorized-actions", true
case method == http.MethodPost && path == "/api/actions/satisfy-delivered":
+24 -1
View File
@@ -29,12 +29,18 @@ textarea { resize: vertical; min-height: 84px; max-height: 240px; padding: 14px;
.login-form button, .composer button { border: 0; color: #11150f; background: var(--signal); font-weight: 700; }
.login-form button { width: 100%; height: 50px; margin-top: 18px; }
#login-error { min-height: 20px; color: var(--bad); font-size: 13px; }
.chat-view { min-height: 100vh; display: grid; grid-template-rows: 64px minmax(0, 1fr) auto; }
.chat-view { min-height: 100vh; display: grid; grid-template-rows: 64px minmax(0, 1fr); }
.chat-header { display: flex; align-items: center; gap: 18px; padding: 0 22px; border-bottom: 1px solid var(--line); background: rgba(16, 23, 20, .96); }
.chat-header a { color: var(--ink); text-decoration: none; font: 400 24px/1 var(--serif); }
.chat-header span { color: var(--muted); font: 10px/1 var(--mono); letter-spacing: .1em; text-transform: uppercase; }
#active-focus { margin-left: auto; color: var(--good); }
.chat-header button { width: 38px; height: 38px; border: 1px solid var(--line); background: transparent; }
.human-nav { display: flex; align-items: center; gap: 8px; }
.nav-tab, .operator-link { height: 34px; padding: 0 12px; display: inline-flex; align-items: center; border: 1px solid var(--line); color: var(--muted); background: #0b110e; text-decoration: none; font: 11px/1 var(--mono); text-transform: uppercase; letter-spacing: .08em; }
.nav-tab.active { color: #11150f; border-color: var(--signal); background: var(--signal); }
.operator-link { color: var(--good); }
.surface-panel { min-height: 0; position: relative; }
.active-panel { display: grid; min-height: 0; }
.messages { width: min(100%, 920px); margin: 0 auto; padding: 28px 18px 120px; display: flex; flex-direction: column; gap: 14px; overflow: auto; }
.message { max-width: min(720px, 92%); padding: 14px 16px; border: 1px solid var(--line); border-radius: var(--radius); line-height: 1.45; white-space: pre-wrap; }
.message.user { align-self: flex-end; background: #151e1a; }
@@ -43,8 +49,25 @@ textarea { resize: vertical; min-height: 84px; max-height: 240px; padding: 14px;
.composer { position: sticky; bottom: 0; width: min(100%, 920px); margin: 0 auto; padding: 16px 18px 20px; display: grid; grid-template-columns: minmax(0, 1fr) 130px; gap: 12px; background: linear-gradient(transparent, var(--base) 20%); }
.composer button { height: 48px; align-self: end; }
.composer button:disabled { cursor: wait; filter: saturate(.3); }
.attention-surface, .history-surface { width: min(100%, 920px); margin: 0 auto; padding: 34px 18px; align-content: start; gap: 18px; }
.surface-heading { display: flex; align-items: end; justify-content: space-between; gap: 16px; border-bottom: 1px solid var(--line); padding-bottom: 16px; }
.surface-heading p { margin: 0; font: 400 36px/.95 var(--serif); }
.surface-heading span, .attention-card small, .history-item span { color: var(--muted); font: 10px/1 var(--mono); text-transform: uppercase; letter-spacing: .1em; }
.surface-heading button { height: 36px; padding: 0 12px; border: 1px solid var(--line); background: transparent; }
.attention-list, .history-list { display: grid; gap: 12px; }
.attention-card, .history-item { border: 1px solid var(--line); background: #0f1613; padding: 16px; }
.attention-card time { color: var(--signal); font: 12px/1 var(--mono); }
.attention-card h2 { margin: 10px 0 8px; font: 400 24px/1.1 var(--serif); }
.attention-card p, .history-item p { margin: 0 0 10px; color: var(--ink); line-height: 1.45; }
.history-item.user { border-color: #34443c; background: #151e1a; }
.history-item strong { display: block; margin-bottom: 8px; color: var(--signal); }
.empty-state { margin: 24px 0 0; color: var(--muted); }
.empty-state.error { color: var(--bad); }
@media (max-width: 640px) {
.composer { grid-template-columns: 1fr; }
.composer button { width: 100%; }
.chat-header { gap: 10px; padding: 0 12px; }
.chat-header span { display: none; }
.human-nav { overflow-x: auto; }
.operator-link, .nav-tab { padding: 0 9px; }
}
+103 -6
View File
@@ -8,9 +8,14 @@ const messageInput = document.querySelector("#message");
const sendButton = document.querySelector("#send");
const logoutButton = document.querySelector("#logout");
const activeFocus = document.querySelector("#active-focus");
const todayList = document.querySelector("#today-list");
const refreshToday = document.querySelector("#refresh-today");
const historyList = document.querySelector("#history-list");
const navTabs = Array.from(document.querySelectorAll(".nav-tab"));
let token = sessionStorage.getItem("domovoy.chat.token") || "";
let conversationID = sessionStorage.getItem("domovoy.chat.conversation") || "";
let localHistory = [];
function showChat() {
loginView.hidden = true;
@@ -37,6 +42,8 @@ function appendMessage(kind, text, meta = "") {
}
messages.appendChild(node);
messages.scrollTop = messages.scrollHeight;
localHistory.push({kind, text, meta, at: new Date()});
renderHistory();
}
function updateActiveFocus(value, provenance = "") {
@@ -52,6 +59,91 @@ async function api(path, options = {}) {
return response.json();
}
function humanMeta(result) {
if (result.reminder_scheduled) return "Напоминание сохранено. Я вернусь к нему сам.";
if (result.capability_status && result.capability_status !== "AVAILABLE") return "Возможность пока не подключена.";
if (result.work_planned) return "Я разложил это как работу.";
return "";
}
function renderHistory() {
if (!historyList) return;
historyList.replaceChildren();
const items = localHistory.slice(-30).reverse();
if (!items.length) {
const empty = document.createElement("p");
empty.className = "empty-state";
empty.textContent = "История появится после сообщений в этом окне.";
historyList.appendChild(empty);
return;
}
for (const item of items) {
const row = document.createElement("article");
row.className = `history-item ${item.kind}`;
const title = document.createElement("strong");
title.textContent = item.kind === "user" ? "Вы" : "Домовой";
const body = document.createElement("p");
body.textContent = item.text;
const time = document.createElement("span");
time.textContent = item.at.toLocaleTimeString("ru-RU", {hour: "2-digit", minute: "2-digit"});
row.append(title, body, time);
historyList.appendChild(row);
}
}
async function loadToday() {
if (!todayList || !token) return;
todayList.replaceChildren();
const loading = document.createElement("p");
loading.className = "empty-state";
loading.textContent = "Смотрю, что требует внимания...";
todayList.appendChild(loading);
try {
const result = await api("/api/today", {method: "GET"});
todayList.replaceChildren();
const items = result.Items || result.items || [];
if (!items.length) {
const empty = document.createElement("p");
empty.className = "empty-state";
empty.textContent = "Сейчас ничего срочного не требует внимания.";
todayList.appendChild(empty);
return;
}
for (const item of items) {
const card = document.createElement("article");
card.className = "attention-card";
const when = document.createElement("time");
const stamp = item.WhenUnixMillis || item.when_unix_millis || 0;
when.textContent = stamp ? new Date(stamp).toLocaleString("ru-RU", {day: "2-digit", month: "2-digit", hour: "2-digit", minute: "2-digit"}) : "сейчас";
const title = document.createElement("h2");
title.textContent = item.Title || item.title || "Событие Домового";
const state = document.createElement("p");
state.textContent = item.HumanState || item.human_state || "ожидает внимания";
const source = document.createElement("small");
source.textContent = [item.SourceDescription || item.source_description, item.DeliveryState || item.delivery_state].filter(Boolean).join(" · ");
card.append(when, title, state, source);
todayList.appendChild(card);
}
} catch {
todayList.replaceChildren();
const error = document.createElement("p");
error.className = "empty-state error";
error.textContent = "Внимание сейчас недоступно. Чат можно продолжать.";
todayList.appendChild(error);
}
}
function activateTab(panelID) {
for (const tab of navTabs) tab.classList.toggle("active", tab.dataset.tab === panelID);
for (const panel of document.querySelectorAll(".surface-panel")) {
const active = panel.id === panelID;
panel.hidden = !active;
panel.classList.toggle("active-panel", active);
}
if (panelID === "today-panel") loadToday();
if (panelID === "history-panel") renderHistory();
}
loginForm.addEventListener("submit", async (event) => {
event.preventDefault();
loginError.textContent = "";
@@ -79,12 +171,11 @@ chatForm.addEventListener("submit", async (event) => {
conversationID = result.conversation_id;
sessionStorage.setItem("domovoy.chat.conversation", conversationID);
updateActiveFocus(result.active_focus, result.project_provenance);
const semanticMeta = [result.speech_act, `cognition=${result.cognition}`];
if (result.work_planned) semanticMeta.push("work=planned");
if (result.capability_status) semanticMeta.push(`capability=${result.capability_kind || "unknown"}:${result.capability_status}`);
if (result.reminder_scheduled) semanticMeta.push("reminder=scheduled");
if (result.clarification) semanticMeta.push(`clarification=${result.clarification}`);
appendMessage("assistant", result.reply_text || "Сообщение записано.", semanticMeta.join("; "));
appendMessage("assistant", result.reply_text || "Сообщение записано.", humanMeta(result));
if (/что сейчас требует моего внимания/i.test(text)) {
await loadToday();
activateTab("today-panel");
}
} catch {
appendMessage("assistant", "Чат сейчас недоступен. Сообщение не принято runtime.");
} finally {
@@ -93,6 +184,12 @@ chatForm.addEventListener("submit", async (event) => {
}
});
for (const tab of navTabs) {
tab.addEventListener("click", () => activateTab(tab.dataset.tab));
}
if (refreshToday) refreshToday.addEventListener("click", loadToday);
logoutButton.addEventListener("click", () => {
token = "";
conversationID = "";
+28 -6
View File
@@ -25,16 +25,38 @@
<section id="chat-view" class="chat-view" hidden>
<header class="chat-header">
<a href="/" aria-label="Консоль создателя">Домовой</a>
<a href="/chat" aria-label="Домовой">Домовой</a>
<nav class="human-nav" aria-label="Разделы Домового">
<button class="nav-tab active" data-tab="chat-panel" type="button">Чат</button>
<button class="nav-tab" data-tab="today-panel" type="button">Сегодня</button>
<button class="nav-tab" data-tab="history-panel" type="button">История</button>
<a href="/" class="operator-link">Оператор</a>
</nav>
<span id="active-focus">фокус: не выбран</span>
<span id="session-state">сессия активна</span>
<button id="logout" type="button" aria-label="Выйти">↗</button>
</header>
<div id="messages" class="messages" aria-live="polite"></div>
<form id="chat-form" class="composer">
<textarea id="message" rows="3" maxlength="16384" placeholder="Напишите Домовому обычное сообщение..." required></textarea>
<button id="send" type="submit">Отправить</button>
</form>
<section id="chat-panel" class="surface-panel active-panel">
<div id="messages" class="messages" aria-live="polite"></div>
<form id="chat-form" class="composer">
<textarea id="message" rows="3" maxlength="16384" placeholder="Напишите Домовому обычное сообщение..." required></textarea>
<button id="send" type="submit">Отправить</button>
</form>
</section>
<section id="today-panel" class="surface-panel attention-surface" hidden>
<div class="surface-heading">
<p>Сегодня / внимание</p>
<button id="refresh-today" type="button">Обновить</button>
</div>
<div id="today-list" class="attention-list"></div>
</section>
<section id="history-panel" class="surface-panel history-surface" hidden>
<div class="surface-heading">
<p>История</p>
<span>Последние сообщения текущего окна</span>
</div>
<div id="history-list" class="history-list"></div>
</section>
</section>
</main>
<script src="/assets/chat.js"></script>