feat: persist fenced client command events

internal/server/session/agent_server.go

@@ -241,7 +241,70 @@ func (server *AgentServer) serveConnection(parent context.Context, connection *w
 				server.close(connection, websocket.StatusPolicyViolation, "invalid command acceptance")
 				return
 			}
+			continue
 		}
+		if event := envelope.GetCommandEvent(); event != nil {
+			appendEvent, eventErr := eventAppendFromWire(event, hello.GetClientId(), server.now())
+			if eventErr != nil {
+				server.close(connection, websocket.StatusPolicyViolation, "invalid command event")
+				return
+			}
+			appended, eventErr := server.Store.AppendCommandEvent(sessionContext, appendEvent)
+			if eventErr != nil {
+				server.close(connection, websocket.StatusPolicyViolation, "command event was not accepted")
+				return
+			}
+			ack, eventErr := proto.Marshal(&rvboxv1.AgentEnvelope{SessionId: encodedSessionID, SessionGeneration: registration.Generation, Payload: &rvboxv1.AgentEnvelope_EventAck{EventAck: &rvboxv1.EventAck{IssueUuid: event.GetIssueUuid(), ThroughEventSeq: appended.ThroughEventSeq}}})
+			if eventErr != nil || queue.EnqueueControl(Frame{Kind: FrameControl, Payload: ack}) != nil {
+				server.close(connection, websocket.StatusInternalError, "could not acknowledge command event")
+				return
+			}
+		}
+	}
+}
+
+func eventAppendFromWire(event *rvboxv1.CommandEvent, clientID string, receipt time.Time) (store.EventAppend, error) {
+	issue, err := domain.ParseUUIDv7(event.GetIssueUuid())
+	if err != nil {
+		return store.EventAppend{}, err
+	}
+	payload, err := proto.MarshalOptions{Deterministic: true}.Marshal(event)
+	if err != nil {
+		return store.EventAppend{}, err
+	}
+	var immutable [32]byte
+	copy(immutable[:], event.GetImmutableEventSha256())
+	result := store.EventAppend{IssueUUID: [16]byte(issue), ClientID: clientID, EventSeq: event.GetEventSeq(), ObservedUnixNano: event.GetObservedAt().AsTime().UnixNano(), ReceiptUnixNano: receipt.UnixNano(), EventType: eventType(event), Compression: 1, RawLength: uint64(len(payload)), Payload: payload, ImmutableSHA256: immutable}
+	if output := event.GetOutput(); output != nil {
+		result.Stream = uint16(output.GetStream())
+		result.Output = true
+	}
+	if result.EventType == 0 {
+		return store.EventAppend{}, errors.New("unsupported command event")
+	}
+	return result, nil
+}
+
+func eventType(event *rvboxv1.CommandEvent) uint16 {
+	switch event.Payload.(type) {
+	case *rvboxv1.CommandEvent_Lifecycle:
+		return 4
+	case *rvboxv1.CommandEvent_Output:
+		return 5
+	case *rvboxv1.CommandEvent_Resource:
+		return 6
+	case *rvboxv1.CommandEvent_StdinAck:
+		return 7
+	case *rvboxv1.CommandEvent_SignalResult:
+		return 8
+	case *rvboxv1.CommandEvent_ScriptStatus:
+		return 9
+	case *rvboxv1.CommandEvent_OutputTruncation:
+		return 10
+	case *rvboxv1.CommandEvent_OutputIncomplete:
+		return 11
+	default:
+		return 0
 	}
 }
 

internal/server/session/agent_server_test.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/coder/websocket"
 	rvboxv1 "github.com/rvbox/rvbox/gen/go/rvbox/v1"
+	"github.com/rvbox/rvbox/internal/agentproto"
 	"github.com/rvbox/rvbox/internal/domain"
 	"github.com/rvbox/rvbox/internal/server/store"
 	"google.golang.org/protobuf/proto"
@@ -108,6 +109,19 @@ func TestAgentServerRejectsHostileWireInputs_BH_SES_04(t *testing.T) {
 	}
 }
 
+func TestWireEventAppendCarriesClientBinding_HP_EVENT_01(t *testing.T) {
+	event := &rvboxv1.CommandEvent{IssueUuid: "019c46f1-1d02-7000-8000-000000000096", EventSeq: 1, ObservedAt: timestamppb.Now(), Payload: &rvboxv1.CommandEvent_Lifecycle{Lifecycle: &rvboxv1.LifecycleChange{Lifecycle: rvboxv1.CommandLifecycle_COMMAND_RUNNING, CommandRevision: 1}}}
+	digest, err := agentproto.CommandEventDigest(event)
+	if err != nil {
+		t.Fatal(err)
+	}
+	event.ImmutableEventSha256 = digest[:]
+	appendEvent, err := eventAppendFromWire(event, "client-a", time.Now())
+	if err != nil || appendEvent.ClientID != "client-a" || appendEvent.EventSeq != 1 || appendEvent.EventType != 4 || appendEvent.ImmutableSHA256 != digest {
+		t.Fatalf("wire event append = %#v, %v", appendEvent, err)
+	}
+}
+
 func newTestAgentServer(t *testing.T) (*httptest.Server, func()) {
 	t.Helper()
 	dataDirectory := filepath.Join(t.TempDir(), "store")

internal/server/store/event.go

@@ -33,6 +33,7 @@ func (function FaultInjectorFunc) Checkpoint(name string) error { return functio
 
 type EventAppend struct {
 	IssueUUID        [16]byte
+	ClientID         string
 	EventSeq         uint64
 	ObservedUnixNano int64
 	ReceiptUnixNano  int64
@@ -80,11 +81,17 @@ func (store *Store) AppendCommandEvent(ctx context.Context, event EventAppend) (
 	}
 	var lastSequence, commandOutputCharged, commandCharged, clientCharged, serverCharged, closeoutRemaining uint64
 	var clientID string
-	err = database.QueryRowContext(ctx, `SELECT commands.last_event_seq, commands.output_charged_bytes,
+	query := `SELECT commands.last_event_seq, commands.output_charged_bytes,
 commands.charged_bytes, commands.closeout_remaining_bytes, commands.client_id, clients.charged_bytes,
 storage_counters.command_charged_bytes
 FROM commands JOIN clients ON clients.client_id = commands.client_id
-JOIN storage_counters ON storage_counters.singleton = 1 WHERE commands.issue_uuid = ?`, event.IssueUUID[:]).Scan(
+JOIN storage_counters ON storage_counters.singleton = 1 WHERE commands.issue_uuid = ?`
+	arguments := []any{event.IssueUUID[:]}
+	if event.ClientID != "" {
+		query += ` AND commands.client_id = ?`
+		arguments = append(arguments, event.ClientID)
+	}
+	err = database.QueryRowContext(ctx, query, arguments...).Scan(
 		&lastSequence, &commandOutputCharged, &commandCharged, &closeoutRemaining, &clientID, &clientCharged, &serverCharged)
 	if errors.Is(err, sql.ErrNoRows) {
 		return result, ErrCommandNotFound