From 904e7d2c0dd030c269ce967aec3c52df09abfd12 Mon Sep 17 00:00:00 2001 From: Sam Catlow Date: Sun, 4 Oct 2026 18:58:10 +1100 Subject: [PATCH] refactor(forgerpc): identity RPC subjects are keyed by identity ID --- internal/forgerpc/forgerpc.go | 5 ++++- internal/worktreerpc/worktreerpc.go | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/forgerpc/forgerpc.go b/internal/forgerpc/forgerpc.go index 12d1b553b..e995728fa 100644 --- a/internal/forgerpc/forgerpc.go +++ b/internal/forgerpc/forgerpc.go @@ -13,6 +13,7 @@ import ( "github.com/nats-io/nats.go" + domainidentity "github.com/samcharles93/archie-core/internal/domain/identity" "github.com/samcharles93/archie-core/internal/domain/workflow" "github.com/samcharles93/archie-core/internal/forge" "github.com/samcharles93/archie-core/internal/natsrpc" @@ -34,7 +35,9 @@ func SubjectFor(identity, base string) string { if identity == "" { return base } - return "archie.forge." + identity + "." + strings.TrimPrefix(base, "archie.forge.") + // Keyed by the identity's ID, not its name: a name may hold characters a + // subject cannot, and both ends derive the same ID from the name. + return "archie.forge." + string(domainidentity.StableID(identity)) + "." + strings.TrimPrefix(base, "archie.forge.") } // Target is what every request acts on and the credential that authorizes diff --git a/internal/worktreerpc/worktreerpc.go b/internal/worktreerpc/worktreerpc.go index 752dda608..cc403d43d 100644 --- a/internal/worktreerpc/worktreerpc.go +++ b/internal/worktreerpc/worktreerpc.go @@ -13,6 +13,7 @@ import ( "github.com/nats-io/nats.go" + domainidentity "github.com/samcharles93/archie-core/internal/domain/identity" "github.com/samcharles93/archie-core/internal/domain/workflow" "github.com/samcharles93/archie-core/internal/natsrpc" "github.com/samcharles93/archie-core/internal/worktree" @@ -28,7 +29,8 @@ func SubjectFor(identity, base string) string { if identity == "" { return base } - return "archie.worktree." + identity + "." + strings.TrimPrefix(base, "archie.worktree.") + // Keyed by the identity's ID, as forgerpc.SubjectFor is. + return "archie.worktree." + string(domainidentity.StableID(identity)) + "." + strings.TrimPrefix(base, "archie.worktree.") } type PushRequest struct {