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
+117 -4
View File
@@ -2,11 +2,22 @@ package postgres
import (
"context"
"errors"
"fmt"
"reflect"
commitcontract "git.cin.su/m/Assistant/contracts/commit"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgxpool"
)
var (
ErrAuthorizedActionNotFound = errors.New("authorized action not found")
ErrAuthorizedActionConflict = errors.New("authorized action identity conflict")
ErrActionAttemptNotFound = errors.New("action attempt not found")
ErrActionAttemptConflict = errors.New("action attempt identity conflict")
)
type CommitRepository struct{ pool *pgxpool.Pool }
func OpenCommit(ctx context.Context, c ContinuityConfig) (*CommitRepository, error) {
@@ -18,10 +29,112 @@ func OpenCommit(ctx context.Context, c ContinuityConfig) (*CommitRepository, err
}
func (r *CommitRepository) Close() { r.pool.Close() }
func (r *CommitRepository) SaveAuthorized(ctx context.Context, a commitcontract.AuthorizedAction) error {
_, e := r.pool.Exec(ctx, `INSERT INTO commit.authorized_actions (authorized_action_id,action_intent_id,state,revision) VALUES ($1,$2,$3,1) ON CONFLICT (authorized_action_id) DO NOTHING`, a.ID, a.Proposal.IntentID, a.State)
return e
tx, err := r.pool.Begin(ctx)
if err != nil {
return err
}
defer func() { _ = tx.Rollback(ctx) }()
if _, err = tx.Exec(ctx, `INSERT INTO commit.authorized_actions (authorized_action_id,action_intent_id,state,revision) VALUES ($1,$2,$3,1) ON CONFLICT (authorized_action_id) DO NOTHING`, a.ID, a.Proposal.IntentID, a.State); err != nil {
return err
}
result, err := tx.Exec(ctx, `INSERT INTO commit.authorized_action_envelopes (
authorized_action_id,action_intent_id,actor_id,principal_id,grant_id,grant_revision,scope_id,
task_id,goal_id,task_scope_id,task_revision,capability_id,operation,prospective_item_id,
expected_prospective_revision,prospective_from_state,prospective_to_state,evidence_ref,
proposal_state,action_state,authorized_at_unix_millis,envelope_revision)
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,1)
ON CONFLICT DO NOTHING`,
a.ID, a.Proposal.IntentID, a.Proposal.ActorID, a.PrincipalID, a.GrantID, a.GrantRevision, a.ScopeID,
a.Proposal.Target.TaskID, a.Proposal.Target.GoalID, a.Proposal.Target.ScopeID, a.Proposal.Target.Revision,
a.Proposal.CapabilityID, a.Proposal.Operation, a.Proposal.ContinuitySubject.ProspectiveItemID,
a.Proposal.ContinuitySubject.ExpectedRevision, a.Proposal.ContinuitySubject.FromState,
a.Proposal.ContinuitySubject.ToState, a.Proposal.ContinuitySubject.EvidenceRef,
a.Proposal.State, a.State, a.AuthorizedAtUnixMillis)
if err != nil {
return err
}
if result.RowsAffected() == 0 {
existing, loadErr := loadAuthorized(ctx, tx, a.ID)
if loadErr != nil || !reflect.DeepEqual(existing, a) {
return ErrAuthorizedActionConflict
}
}
return tx.Commit(ctx)
}
func (r *CommitRepository) SaveAttempt(ctx context.Context, a commitcontract.ActionAttempt) error {
_, e := r.pool.Exec(ctx, `INSERT INTO commit.action_attempts (action_attempt_id,authorized_action_id,action_intent_id,state) VALUES ($1,$2,$3,$4) ON CONFLICT (action_attempt_id) DO NOTHING`, a.ID, a.AuthorizedID, a.IntentID, a.State)
return e
result, err := r.pool.Exec(ctx, `INSERT INTO commit.action_attempts (action_attempt_id,authorized_action_id,action_intent_id,state) VALUES ($1,$2,$3,$4) ON CONFLICT (action_attempt_id) DO NOTHING`, a.ID, a.AuthorizedID, a.IntentID, a.State)
if err != nil {
return err
}
if result.RowsAffected() == 0 {
var existing commitcontract.ActionAttempt
err = r.pool.QueryRow(ctx, `SELECT action_attempt_id,authorized_action_id,action_intent_id,state FROM commit.action_attempts WHERE action_attempt_id=$1`, a.ID).Scan(&existing.ID, &existing.AuthorizedID, &existing.IntentID, &existing.State)
if err != nil || existing != a {
return ErrActionAttemptConflict
}
}
return nil
}
func (r *CommitRepository) BeginAttempt(ctx context.Context, a commitcontract.ActionAttempt) error {
if a.State != commitcontract.ActionExecuting {
return ErrActionAttemptConflict
}
return r.SaveAttempt(ctx, a)
}
func (r *CommitRepository) FinishAttempt(ctx context.Context, a commitcontract.ActionAttempt) error {
if a.State != commitcontract.ActionSucceeded && a.State != commitcontract.ActionFailed && a.State != commitcontract.ActionUnknownOutcome {
return ErrActionAttemptConflict
}
result, err := r.pool.Exec(ctx, `UPDATE commit.action_attempts SET state=$1,revision=revision+1,updated_at=CURRENT_TIMESTAMP
WHERE action_attempt_id=$2 AND authorized_action_id=$3 AND action_intent_id=$4 AND state=$5`,
a.State, a.ID, a.AuthorizedID, a.IntentID, commitcontract.ActionExecuting)
if err != nil {
return err
}
if result.RowsAffected() != 1 {
return ErrActionAttemptConflict
}
return nil
}
func (r *CommitRepository) LoadAuthorized(ctx context.Context, id commitcontract.AuthorizedActionID) (commitcontract.AuthorizedAction, error) {
return loadAuthorized(ctx, r.pool, id)
}
func (r *CommitRepository) LoadLatestAttempt(ctx context.Context, id commitcontract.AuthorizedActionID) (commitcontract.ActionAttempt, error) {
var attempt commitcontract.ActionAttempt
err := r.pool.QueryRow(ctx, `SELECT action_attempt_id,authorized_action_id,action_intent_id,state FROM commit.action_attempts WHERE authorized_action_id=$1 ORDER BY recorded_at DESC, action_attempt_id DESC LIMIT 1`, id).Scan(&attempt.ID, &attempt.AuthorizedID, &attempt.IntentID, &attempt.State)
if errors.Is(err, pgx.ErrNoRows) {
return commitcontract.ActionAttempt{}, ErrActionAttemptNotFound
}
return attempt, err
}
type commitRowQuerier interface {
QueryRow(context.Context, string, ...any) pgx.Row
}
func loadAuthorized(ctx context.Context, querier commitRowQuerier, id commitcontract.AuthorizedActionID) (commitcontract.AuthorizedAction, error) {
var action commitcontract.AuthorizedAction
err := querier.QueryRow(ctx, `SELECT authorized_action_id,action_intent_id,actor_id,principal_id,grant_id,grant_revision,scope_id,
task_id,goal_id,task_scope_id,task_revision,capability_id,operation,prospective_item_id,
expected_prospective_revision,prospective_from_state,prospective_to_state,evidence_ref,
proposal_state,action_state,authorized_at_unix_millis
FROM commit.authorized_action_envelopes WHERE authorized_action_id=$1`, id).Scan(
&action.ID, &action.Proposal.IntentID, &action.Proposal.ActorID, &action.PrincipalID,
&action.GrantID, &action.GrantRevision, &action.ScopeID, &action.Proposal.Target.TaskID,
&action.Proposal.Target.GoalID, &action.Proposal.Target.ScopeID, &action.Proposal.Target.Revision,
&action.Proposal.CapabilityID, &action.Proposal.Operation, &action.Proposal.ContinuitySubject.ProspectiveItemID,
&action.Proposal.ContinuitySubject.ExpectedRevision, &action.Proposal.ContinuitySubject.FromState,
&action.Proposal.ContinuitySubject.ToState, &action.Proposal.ContinuitySubject.EvidenceRef,
&action.Proposal.State, &action.State, &action.AuthorizedAtUnixMillis)
if errors.Is(err, pgx.ErrNoRows) {
return commitcontract.AuthorizedAction{}, ErrAuthorizedActionNotFound
}
if err != nil {
return commitcontract.AuthorizedAction{}, fmt.Errorf("load authorized action: %w", err)
}
return action, nil
}
+124 -1
View File
@@ -7,10 +7,19 @@ import (
"git.cin.su/m/Assistant/contracts/continuity"
"git.cin.su/m/Assistant/contracts/identity"
continuitydomain "git.cin.su/m/Assistant/modules/continuity/domain"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgxpool"
)
var ErrProspectiveNotFound = errors.New("prospective item not found")
var (
ErrProspectiveNotFound = errors.New("prospective item not found")
ErrProspectiveOwnerConflict = errors.New("prospective item owner conflict")
ErrProspectiveStateConflict = errors.New("prospective item state conflict")
ErrProspectiveRevisionConflict = errors.New("prospective item revision conflict")
ErrActionReceiptNotFound = errors.New("continuity action receipt not found")
ErrActionIntentConflict = errors.New("action intent was already used for a different command")
)
type ContinuityConfig struct{ Host, Port, Database, User, Password string }
type ContinuityRepository struct{ pool *pgxpool.Pool }
@@ -56,3 +65,117 @@ func (r *ContinuityRepository) ByOwner(ctx context.Context, owner identity.Princ
}
return items, nil
}
// SatisfyDelivered owns both the Prospective CAS and its idempotency receipt in
// one Continuity-local transaction. It never reaches Commit storage.
func (r *ContinuityRepository) SatisfyDelivered(ctx context.Context, command continuity.SatisfyDeliveredCommand) (continuity.ActionReceipt, error) {
if err := continuitydomain.ValidateSatisfyDelivered(command); err != nil {
return continuity.ActionReceipt{}, err
}
tx, err := r.pool.Begin(ctx)
if err != nil {
return continuity.ActionReceipt{}, err
}
defer func() { _ = tx.Rollback(ctx) }()
// Serialize deliveries of one ActionIntent inside the canonical owner. The
// receipt remains the durable correctness source; the lock is transaction-local.
if _, err = tx.Exec(ctx, `SELECT pg_advisory_xact_lock(hashtextextended($1,0))`, command.ActionIntentID); err != nil {
return continuity.ActionReceipt{}, err
}
if existing, loadErr := loadActionReceipt(ctx, tx, command.ActionIntentID); loadErr == nil {
if receiptMatchesCommand(existing, command) {
return existing, tx.Commit(ctx)
}
return continuity.ActionReceipt{}, ErrActionIntentConflict
} else if !errors.Is(loadErr, ErrActionReceiptNotFound) {
return continuity.ActionReceipt{}, loadErr
}
var item continuity.ProspectiveItem
err = tx.QueryRow(ctx, `UPDATE continuity.prospective_items
SET state=$1, revision=revision+1
WHERE prospective_item_id=$2 AND owner_principal_id=$3 AND state=$4 AND revision=$5
RETURNING prospective_item_id,commitment_id,owner_principal_id,scope_id,goal_id,trigger_at_unix_millis,state,revision`,
continuity.ProspectiveSatisfied, command.Subject.ProspectiveItemID, command.OwnerPrincipalID,
continuity.ProspectiveDelivered, command.Subject.ExpectedRevision).Scan(
&item.ID, &item.CommitmentID, &item.OwnerPrincipalID, &item.ScopeID, &item.GoalID,
&item.TriggerAtUnixMillis, &item.State, &item.Revision)
if errors.Is(err, pgx.ErrNoRows) {
return continuity.ActionReceipt{}, diagnoseProspectiveConflict(ctx, tx, command)
}
if err != nil {
return continuity.ActionReceipt{}, fmt.Errorf("satisfy delivered prospective item: %w", err)
}
receipt := continuity.ActionReceipt{
ActionIntentID: command.ActionIntentID, AuthorizedActionID: command.AuthorizedActionID,
OwnerPrincipalID: command.OwnerPrincipalID, Subject: command.Subject,
ResultState: item.State, ResultRevision: item.Revision,
}
_, err = tx.Exec(ctx, `INSERT INTO continuity.action_receipts (
action_intent_id,authorized_action_id,owner_principal_id,prospective_item_id,expected_revision,
from_state,to_state,evidence_ref,result_state,result_revision)
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10)`, receipt.ActionIntentID, receipt.AuthorizedActionID,
receipt.OwnerPrincipalID, receipt.Subject.ProspectiveItemID, receipt.Subject.ExpectedRevision,
receipt.Subject.FromState, receipt.Subject.ToState, receipt.Subject.EvidenceRef,
receipt.ResultState, receipt.ResultRevision)
if err != nil {
return continuity.ActionReceipt{}, fmt.Errorf("save continuity action receipt: %w", err)
}
if err = tx.Commit(ctx); err != nil {
return continuity.ActionReceipt{}, err
}
return receipt, nil
}
func (r *ContinuityRepository) LoadActionReceipt(ctx context.Context, intentID continuity.CommittedActionIntentID) (continuity.ActionReceipt, error) {
return loadActionReceipt(ctx, r.pool, intentID)
}
type continuityRowQuerier interface {
QueryRow(context.Context, string, ...any) pgx.Row
}
func loadActionReceipt(ctx context.Context, querier continuityRowQuerier, intentID continuity.CommittedActionIntentID) (continuity.ActionReceipt, error) {
var receipt continuity.ActionReceipt
err := querier.QueryRow(ctx, `SELECT action_intent_id,authorized_action_id,owner_principal_id,prospective_item_id,
expected_revision,from_state,to_state,evidence_ref,result_state,result_revision
FROM continuity.action_receipts WHERE action_intent_id=$1`, intentID).Scan(
&receipt.ActionIntentID, &receipt.AuthorizedActionID, &receipt.OwnerPrincipalID,
&receipt.Subject.ProspectiveItemID, &receipt.Subject.ExpectedRevision, &receipt.Subject.FromState,
&receipt.Subject.ToState, &receipt.Subject.EvidenceRef, &receipt.ResultState, &receipt.ResultRevision)
if errors.Is(err, pgx.ErrNoRows) {
return continuity.ActionReceipt{}, ErrActionReceiptNotFound
}
if err != nil {
return continuity.ActionReceipt{}, fmt.Errorf("load continuity action receipt: %w", err)
}
return receipt, nil
}
func receiptMatchesCommand(receipt continuity.ActionReceipt, command continuity.SatisfyDeliveredCommand) bool {
return receipt.ActionIntentID == command.ActionIntentID && receipt.AuthorizedActionID == command.AuthorizedActionID &&
receipt.OwnerPrincipalID == command.OwnerPrincipalID && receipt.Subject == command.Subject
}
func diagnoseProspectiveConflict(ctx context.Context, querier continuityRowQuerier, command continuity.SatisfyDeliveredCommand) error {
var owner identity.PrincipalID
var state continuity.ProspectiveState
var revision continuity.ProspectiveRevision
err := querier.QueryRow(ctx, `SELECT owner_principal_id,state,revision FROM continuity.prospective_items WHERE prospective_item_id=$1`, command.Subject.ProspectiveItemID).Scan(&owner, &state, &revision)
if errors.Is(err, pgx.ErrNoRows) {
return ErrProspectiveNotFound
}
if err != nil {
return err
}
if owner != command.OwnerPrincipalID {
return ErrProspectiveOwnerConflict
}
if state != continuity.ProspectiveDelivered {
return ErrProspectiveStateConflict
}
if revision != command.Subject.ExpectedRevision {
return ErrProspectiveRevisionConflict
}
return ErrProspectiveRevisionConflict
}