feat: execute continuity satisfaction through commit
CI / test (push) Successful in 11s

This commit is contained in:
m
2026-08-16 16:19:23 +03:00
parent fe0b93739f
commit 4a165b5238
25 changed files with 1249 additions and 28 deletions
@@ -0,0 +1,69 @@
package main
import (
"context"
"crypto/subtle"
"encoding/json"
"errors"
"net/http"
"strings"
"git.cin.su/m/Assistant/adapters/postgres"
"git.cin.su/m/Assistant/contracts/continuity"
continuitydomain "git.cin.su/m/Assistant/modules/continuity/domain"
)
type continuityExecutorRepository interface {
SatisfyDelivered(context.Context, continuity.SatisfyDeliveredCommand) (continuity.ActionReceipt, error)
LoadActionReceipt(context.Context, continuity.CommittedActionIntentID) (continuity.ActionReceipt, error)
}
func registerInternalExecutorRoutes(mux *http.ServeMux, repository continuityExecutorRepository, token string) {
mux.HandleFunc("POST /v1/internal/executor/satisfy-delivered", requireExecutorToken(token, func(w http.ResponseWriter, r *http.Request) {
var command continuity.SatisfyDeliveredCommand
decoder := json.NewDecoder(http.MaxBytesReader(w, r.Body, 32<<10))
if err := decoder.Decode(&command); err != nil {
http.Error(w, "invalid executor command", http.StatusBadRequest)
return
}
receipt, err := repository.SatisfyDelivered(r.Context(), command)
switch {
case err == nil:
w.Header().Set("Content-Type", "application/json")
_ = json.NewEncoder(w).Encode(receipt)
case errors.Is(err, continuitydomain.ErrInvalidSatisfaction):
http.Error(w, "invalid executor command", http.StatusBadRequest)
case errors.Is(err, postgres.ErrProspectiveNotFound):
http.Error(w, "prospective item not found", http.StatusNotFound)
case errors.Is(err, postgres.ErrProspectiveOwnerConflict), errors.Is(err, postgres.ErrProspectiveStateConflict),
errors.Is(err, postgres.ErrProspectiveRevisionConflict), errors.Is(err, postgres.ErrActionIntentConflict):
http.Error(w, "prospective command conflict", http.StatusConflict)
default:
http.Error(w, "continuity execution unavailable", http.StatusInternalServerError)
}
}))
mux.HandleFunc("GET /v1/internal/executor/receipts/{intentID}", requireExecutorToken(token, func(w http.ResponseWriter, r *http.Request) {
receipt, err := repository.LoadActionReceipt(r.Context(), continuity.CommittedActionIntentID(r.PathValue("intentID")))
if errors.Is(err, postgres.ErrActionReceiptNotFound) {
http.Error(w, "receipt not found", http.StatusNotFound)
return
}
if err != nil {
http.Error(w, "continuity receipt unavailable", http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "application/json")
_ = json.NewEncoder(w).Encode(receipt)
}))
}
func requireExecutorToken(expected string, next http.HandlerFunc) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
provided := strings.TrimPrefix(r.Header.Get("Authorization"), "Bearer ")
if expected == "" || len(provided) != len(expected) || subtle.ConstantTimeCompare([]byte(provided), []byte(expected)) != 1 {
http.Error(w, "executor denied", http.StatusUnauthorized)
return
}
next(w, r)
}
}
@@ -0,0 +1,64 @@
package main
import (
"bytes"
"context"
"encoding/json"
"net/http"
"net/http/httptest"
"testing"
"git.cin.su/m/Assistant/adapters/postgres"
"git.cin.su/m/Assistant/contracts/continuity"
)
type fakeContinuityExecutorRepository struct {
receipt continuity.ActionReceipt
err error
calls int
}
func (f *fakeContinuityExecutorRepository) SatisfyDelivered(context.Context, continuity.SatisfyDeliveredCommand) (continuity.ActionReceipt, error) {
f.calls++
return f.receipt, f.err
}
func (f *fakeContinuityExecutorRepository) LoadActionReceipt(context.Context, continuity.CommittedActionIntentID) (continuity.ActionReceipt, error) {
return f.receipt, f.err
}
func TestInternalExecutorRequiresTokenAndReturnsReceipt(t *testing.T) {
repository := &fakeContinuityExecutorRepository{receipt: continuity.ActionReceipt{ActionIntentID: "intent-1", ResultState: continuity.ProspectiveSatisfied, ResultRevision: 2}}
mux := http.NewServeMux()
registerInternalExecutorRoutes(mux, repository, "secret")
command := continuity.SatisfyDeliveredCommand{ActionIntentID: "intent-1"}
body, _ := json.Marshal(command)
denied := httptest.NewRequest(http.MethodPost, "/v1/internal/executor/satisfy-delivered", bytes.NewReader(body))
deniedResult := httptest.NewRecorder()
mux.ServeHTTP(deniedResult, denied)
if deniedResult.Code != http.StatusUnauthorized || repository.calls != 0 {
t.Fatalf("denied status=%d calls=%d", deniedResult.Code, repository.calls)
}
request := httptest.NewRequest(http.MethodPost, "/v1/internal/executor/satisfy-delivered", bytes.NewReader(body))
request.Header.Set("Authorization", "Bearer secret")
result := httptest.NewRecorder()
mux.ServeHTTP(result, request)
if result.Code != http.StatusOK || repository.calls != 1 {
t.Fatalf("status=%d calls=%d body=%s", result.Code, repository.calls, result.Body.String())
}
}
func TestInternalExecutorMapsOwnerConflictWithoutLeakingDetails(t *testing.T) {
repository := &fakeContinuityExecutorRepository{err: postgres.ErrProspectiveOwnerConflict}
mux := http.NewServeMux()
registerInternalExecutorRoutes(mux, repository, "secret")
request := httptest.NewRequest(http.MethodPost, "/v1/internal/executor/satisfy-delivered", bytes.NewBufferString(`{}`))
request.Header.Set("Authorization", "Bearer secret")
result := httptest.NewRecorder()
mux.ServeHTTP(result, request)
if result.Code != http.StatusConflict {
t.Fatalf("status=%d", result.Code)
}
}
+5
View File
@@ -30,6 +30,11 @@ func main() {
}
mux := http.NewServeMux()
mux.Handle("/healthz", health.Handler{Runtime: "continuity-runtime", SemanticGeneration: 1, ArchitectureGeneration: 1})
executorToken := os.Getenv("COMMIT_EXECUTOR_TOKEN")
if executorToken == "" {
log.Fatal("COMMIT_EXECUTOR_TOKEN is required")
}
registerInternalExecutorRoutes(mux, repository, executorToken)
mux.HandleFunc("POST /v1/prospective-items", func(w http.ResponseWriter, r *http.Request) {
var item continuity.ProspectiveItem
if err := json.NewDecoder(r.Body).Decode(&item); err != nil {