Skip to content

refactor(daemon): satisfy daemonapi.Daemon via adapter; complete common extraction #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TeoSlayer merged 5 commits into from
May 29, 2026
Merged

refactor(daemon): satisfy daemonapi.Daemon via adapter; complete common extraction #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f352561
refactor(daemon): satisfy daemonapi.Daemon via adapter; alias contrac…
teovl May 28, 2026
7c5f790
fix(daemon): satisfy daemonapi.Daemon contract after common@v0.4.3 bump
teovl May 29, 2026
07a9cb0
deps: bump siblings to latest stable + pin common v0.4.4 + rendezvous…
teovl May 29, 2026
d49ad91
fix(test): switch ipcutil import from internal/ to common/ for #155
teovl May 29, 2026
2008370
Merge branch 'main' into daemon-implements-daemonapi
TeoSlayer May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions cmd/daemon/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"syscall"
"time"

"github.com/TeoSlayer/pilotprotocol/pkg/config"
"github.com/TeoSlayer/pilotprotocol/pkg/daemon"
"github.com/TeoSlayer/pilotprotocol/pkg/driver"
"github.com/TeoSlayer/pilotprotocol/pkg/logging"
"github.com/pilot-protocol/common/config"
"github.com/pilot-protocol/common/driver"
"github.com/pilot-protocol/common/logging"

// L11 plugin imports — cmd/daemon (L12) is the only place these
// are allowed. The daemon proper imports only pkg/coreapi
Expand Down Expand Up @@ -189,7 +189,15 @@ func main() {
// L11 plugin lifecycle (T7.1): composition root owns the
// ServiceRegistry via plugins/runtime. Daemon never imports
// pkg/coreapi.
rt := runtime.New(d)
//
// runtime + the per-plugin Runtime constructors take a
// daemonapi.Daemon. *Daemon doesn't satisfy that interface
// directly (engine-typed Connection/PortAllocator/etc.); the
// adapter at pkg/daemon/zz_daemonapi_conformance.go does. We
// resolve it once via d.DaemonAPI() and thread the shared value
// everywhere — keeps the type assertion in one place.
dapi := d.DaemonAPI()
rt := runtime.New(dapi)

ta := trustedagents.NewService()
if err := rt.Register(ta); err != nil {
Expand All @@ -215,14 +223,14 @@ func main() {
}
}

policySvc := policy.NewService(runtime.NewPolicyRuntime(d))
policySvc := policy.NewService(runtime.NewPolicyRuntime(dapi))
if err := rt.Register(policySvc); err != nil {
log.Fatalf("register policy: %v", err)
}
d.RegisterPolicyManager(runtime.AsDaemonPolicyManager(policySvc.Manager()))

// Manual trust-handshake (port 444) — extracted from pkg/daemon in T3.3.
hsSvc := handshake.NewService(runtime.NewHandshakeRuntime(d))
hsSvc := handshake.NewService(runtime.NewHandshakeRuntime(dapi))
if err := rt.Register(hsSvc); err != nil {
log.Fatalf("register handshake: %v", err)
}
Expand Down
6 changes: 3 additions & 3 deletions cmd/pilotctl/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"syscall"
"time"

"github.com/TeoSlayer/pilotprotocol/pkg/driver"
"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
registry "github.com/TeoSlayer/pilotprotocol/pkg/registry/client"
"github.com/pilot-protocol/common/driver"
"github.com/pilot-protocol/common/protocol"
registry "github.com/pilot-protocol/common/registry/client"
"github.com/pilot-protocol/dataexchange"
"github.com/pilot-protocol/eventstream"
"github.com/pilot-protocol/policy/policylang"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pilotctl/zz_fake_daemon_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"
"time"

"github.com/TeoSlayer/pilotprotocol/internal/ipcutil"
"github.com/pilot-protocol/common/ipcutil"
)

// IPC cmd codes — must match pkg/driver/ipc.go and cmd/daemon/ipc.go.
Expand Down
2 changes: 1 addition & 1 deletion cmd/pilotctl/zz_lifecycle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"testing"

"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
"github.com/pilot-protocol/common/protocol"
)

// withTempHomeFull isolates HOME so config/socket/registry helpers don't
Expand Down
4 changes: 2 additions & 2 deletions cmd/pilotctl/zz_stream_daemon_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"testing"
"time"

"github.com/TeoSlayer/pilotprotocol/internal/ipcutil"
"github.com/TeoSlayer/pilotprotocol/pkg/protocol"
"github.com/pilot-protocol/common/ipcutil"
"github.com/pilot-protocol/common/protocol"
)

// Round-3 coverage push: drive cmdConnect/cmdSend/cmdRecv/cmdDgram/
Expand Down
29 changes: 14 additions & 15 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,24 @@ go 1.25.10

require (
github.com/coder/websocket v1.8.14
github.com/pilot-protocol/app-store v0.1.0
github.com/pilot-protocol/beacon v0.1.0
github.com/pilot-protocol/common v0.4.0
github.com/pilot-protocol/dataexchange v0.1.0
github.com/pilot-protocol/eventstream v0.1.0
github.com/pilot-protocol/gateway v0.1.0
github.com/pilot-protocol/handshake v0.1.0
github.com/pilot-protocol/nameserver v0.1.0
github.com/pilot-protocol/policy v0.1.0
github.com/pilot-protocol/rendezvous v0.1.0
github.com/pilot-protocol/runtime v0.1.0
github.com/pilot-protocol/skillinject v0.1.0
github.com/pilot-protocol/trustedagents v0.1.0
github.com/pilot-protocol/webhook v0.1.0
github.com/pilot-protocol/app-store v0.2.0
github.com/pilot-protocol/beacon v0.2.2
github.com/pilot-protocol/common v0.4.4
github.com/pilot-protocol/dataexchange v0.2.0
github.com/pilot-protocol/eventstream v0.2.2
github.com/pilot-protocol/handshake v0.2.0
github.com/pilot-protocol/nameserver v0.2.1
github.com/pilot-protocol/policy v0.2.1
github.com/pilot-protocol/rendezvous v0.2.2
github.com/pilot-protocol/runtime v0.3.0
github.com/pilot-protocol/skillinject v0.2.1
github.com/pilot-protocol/trustedagents v0.2.2
github.com/pilot-protocol/updater v0.2.2-0.20260529065627-220ed5b8383f
github.com/pilot-protocol/webhook v0.2.0
)

require (
github.com/expr-lang/expr v1.17.8 // indirect
github.com/pilot-protocol/updater v0.2.2-0.20260529065627-220ed5b8383f // indirect
golang.org/x/net v0.55.0 // indirect
golang.org/x/sys v0.45.0 // indirect
)
56 changes: 26 additions & 30 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,34 @@ github.com/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9
github.com/coder/websocket v1.8.14/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg=
github.com/expr-lang/expr v1.17.8 h1:W1loDTT+0PQf5YteHSTpju2qfUfNoBt4yw9+wOEU9VM=
github.com/expr-lang/expr v1.17.8/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
github.com/pilot-protocol/app-store v0.1.0 h1:mMEbr04GURXWuFd4kQBONZZK+AMrXxdVt+IujeySfo8=
github.com/pilot-protocol/app-store v0.1.0/go.mod h1:0fo1XjzzLHmRMGuTc22aOLAseQzms7qM4QXfGilmMWY=
github.com/pilot-protocol/beacon v0.1.0 h1:jXO8duAzzpB8K+9It0QwR9BRupgKZ8IQhuwqy7rqtmk=
github.com/pilot-protocol/beacon v0.1.0/go.mod h1:PejZP5sZ4s5Lrtc0wdYHSEJVc7cn6E8yqo0R4CV+iUo=
github.com/pilot-protocol/common v0.1.0 h1:m8mZZATgeBiFoqhWXPnskw2u0lNkWxHp0IagZK35V1g=
github.com/pilot-protocol/common v0.1.0/go.mod h1:4YZWHK5nhM+4RLmYTspLxxAFbyBII7yzQDAHq3Ul2ck=
github.com/pilot-protocol/common v0.4.0 h1:lH1WdQBU5Zan1rAqF/kYpcJO6vBoYVWXrWUNwMX10jA=
github.com/pilot-protocol/common v0.4.0/go.mod h1:yrAwPXGVMbXU+SADvOCmbdXjK/wJ3uA0KshyLvRlej4=
github.com/pilot-protocol/dataexchange v0.1.0 h1:JJ29lL/LxDd1+szKFoEVxakzT93Tid3zoaAUBVGNKV4=
github.com/pilot-protocol/dataexchange v0.1.0/go.mod h1:mXD17Vh0Eup+M//YhCm4j6D/DyFaZM7JzN5xexBdfLs=
github.com/pilot-protocol/eventstream v0.1.0 h1:uHNTNTMA9MasBBpi2nCRkvFmFvTxbKCk7azPfuILkvY=
github.com/pilot-protocol/eventstream v0.1.0/go.mod h1:sFhEh/YP76Sjhn8kNz7SOvqgk0vaJEIFkXMXAKlPqnY=
github.com/pilot-protocol/gateway v0.1.0 h1:mCbMMO4N7hkkuFELHCaBKGwmGXIeWW6fR8YMS9aEBgk=
github.com/pilot-protocol/gateway v0.1.0/go.mod h1:NvzDHFgPDno8ftTMDeFUnU7yZxXEx/3ds1cX3IN5YV0=
github.com/pilot-protocol/handshake v0.1.0 h1:TmqIglsimTynKtE5hLpCt/SZmmBYs8OCn4qn755fmew=
github.com/pilot-protocol/handshake v0.1.0/go.mod h1:FIIMTgRcMIMEim/1d7F5f6YenJC+3xl53QMEmnnJY+0=
github.com/pilot-protocol/nameserver v0.1.0 h1:91R7g36eIXMKX7Ld1YObtNsDh72smw+eD1rIVxvutQM=
github.com/pilot-protocol/nameserver v0.1.0/go.mod h1:6o01gsjvw4LqYIAxI5sD8OHfaiWv78jC8aPtoxV7nJA=
github.com/pilot-protocol/policy v0.1.0 h1:Eh0CfCZDEX8UCkMPi2MrNrhCe8c15a/Bqf4eaKUhyis=
github.com/pilot-protocol/policy v0.1.0/go.mod h1:IMVm7IQhgLtH/iXow2AWFuLl+sKrxJ4mGs4EKLoHop8=
github.com/pilot-protocol/rendezvous v0.1.0 h1:vOBD7CnRY8uU8vma0Vfcr0aPSQ54qNuxppNUiljzk9Y=
github.com/pilot-protocol/rendezvous v0.1.0/go.mod h1:g3/IYBykbU5m9jeprSCrmuoDpaqROO4Lu/+ecKVIF3A=
github.com/pilot-protocol/runtime v0.1.0 h1:TyerRWKVN38WM2RAPR5bhCdY5cR7d3UYg5neUK0pdZk=
github.com/pilot-protocol/runtime v0.1.0/go.mod h1:X1sImTG8xu6HkvKimu8Eq91HmDKQt6GHEWju7HxofEQ=
github.com/pilot-protocol/skillinject v0.1.0 h1:gs912gqmxl0ifIvswefjx8BzPCmoBWS77mSp/RC1YEY=
github.com/pilot-protocol/skillinject v0.1.0/go.mod h1:303GIB6j95ZhnoYeTlYzlBDhUbO01PB/6KGohm4DcJs=
github.com/pilot-protocol/trustedagents v0.1.0 h1:rCX0IQxfZ84Q4dSgw01WJgjHUODRnI3iAon1t+NuFGE=
github.com/pilot-protocol/trustedagents v0.1.0/go.mod h1:uVySmuMPb6N7AOCnvLHN2I9C9ggqEpfBmAZwVuP5Xaw=
github.com/pilot-protocol/app-store v0.2.0 h1:/SbLPa2dKnvhv0ITeaYMZw/2KXXxWDRuYUdM5z9eyKk=
github.com/pilot-protocol/app-store v0.2.0/go.mod h1:f0umeJxswDG8/CctHpSFMlr5GLtE2GlPKkijIQErZuc=
github.com/pilot-protocol/beacon v0.2.2 h1:G1P5wuBK75LTSGHhpjNsN7bWi8JiZ0bWk3yjWcQNkwA=
github.com/pilot-protocol/beacon v0.2.2/go.mod h1:k/cHbldwYkkF7dN1WDlaDPGqiRfFgIAmiB71fXSPYW0=
github.com/pilot-protocol/common v0.4.4 h1:Y5AJ2PMNwy+2eb4DJfLdJlle+d/Z9UBWTN6czMA84cY=
github.com/pilot-protocol/common v0.4.4/go.mod h1:yrAwPXGVMbXU+SADvOCmbdXjK/wJ3uA0KshyLvRlej4=
github.com/pilot-protocol/dataexchange v0.2.0 h1:ldE6AyrES1uvdnn1NBl0KZ7C+SSWNtmeHHU3CQhwSCo=
github.com/pilot-protocol/dataexchange v0.2.0/go.mod h1:JVy2+hr/IjzMPshxjExbGO/4SbJTs7ZJ7iYvT/ODF3Q=
github.com/pilot-protocol/eventstream v0.2.2 h1:E0IjveK7K+dsIbE/5hD3N821FkHzxVsx1tiAORMzt8k=
github.com/pilot-protocol/eventstream v0.2.2/go.mod h1:gUjoMEItW1SRJYEq39VlcIeDe2LcE5B18/4bcaUJNrs=
github.com/pilot-protocol/handshake v0.2.0 h1:uLeV8iNHcsHbcVH+GZ9p7uuIbObA8BReDByF5XGjzB8=
github.com/pilot-protocol/handshake v0.2.0/go.mod h1:wMFeDFbz8Wu1aPZkcLAFDosZhYa3l5ab/SxUbRqhOig=
github.com/pilot-protocol/nameserver v0.2.1 h1:ACCa6WVkEoDZVctEe09WB24Lfobt/JoLDGIqX2MEnss=
github.com/pilot-protocol/nameserver v0.2.1/go.mod h1:ze4VFe74xdbyqu5oFPt0YGRrRMMnHWb/AczJhirG+h4=
github.com/pilot-protocol/policy v0.2.1 h1:s3aMgeDFVYzDNBcdvO4mzDRlrRF5CvMepW7az4HSmVU=
github.com/pilot-protocol/policy v0.2.1/go.mod h1:jzsAO71uGlRVyduPrQmS/UeqSwUpeUO/CjykHm/IfXM=
github.com/pilot-protocol/rendezvous v0.2.2 h1:YkiHeY0Wl4pmpuBmXDhewSV05sjvquNlz2S/CHjkxTc=
github.com/pilot-protocol/rendezvous v0.2.2/go.mod h1:bVGb1Mc93faQ+bG3R/nt/wv53cHv0SgLzpf8SZc/dqY=
github.com/pilot-protocol/runtime v0.3.0 h1:OVPv7hyaAZsw5EPWtf2XQGfCqxgaM/iANPhIYOMp+0w=
github.com/pilot-protocol/runtime v0.3.0/go.mod h1:GfFEIji0w7H9SSNR9Wl2q72pd2OYN3PHY9Qhcbvyrqk=
github.com/pilot-protocol/skillinject v0.2.1 h1:r7cwDlRTLHGPhL2+RtGa0GWz/M89yw0My+OND+wP5Ic=
github.com/pilot-protocol/skillinject v0.2.1/go.mod h1:toizAf7eI2IgsDRGiqF3mRiVpF4ISYwVQeO3ZltZEcM=
github.com/pilot-protocol/trustedagents v0.2.2 h1:EpK25654aN+CBeBhZkHUPh3J545pGoxLofLJmDmo1F0=
github.com/pilot-protocol/trustedagents v0.2.2/go.mod h1:r3wYwh5QpFDwG4nXbCA3RH2aA+hqM07KLMFFc3tbvKA=
github.com/pilot-protocol/updater v0.2.2-0.20260529065627-220ed5b8383f h1:1dyunPeEOriqTv1xbt0fuDwieA5V5NLU1nVSC2714jU=
github.com/pilot-protocol/updater v0.2.2-0.20260529065627-220ed5b8383f/go.mod h1:/I0uhVk1SljAOEYmjTdI/6CP7UmemmV4WB22ai1FxUw=
github.com/pilot-protocol/webhook v0.1.0 h1:SnIcn+IdHvzoJt+OFzGJbkBHurjNBD0xSc6HAUvExAg=
github.com/pilot-protocol/webhook v0.1.0/go.mod h1:c0du05MMy8FYnlc2YGqUWxRgTP8pRWTrtIdNuRhf6uk=
github.com/pilot-protocol/webhook v0.2.0 h1:3UFU9X2yBb0iKlPbzVcism+Z6yCrBBaOgdo9+vd4Wf4=
github.com/pilot-protocol/webhook v0.2.0/go.mod h1:WVXhHFg+o0pHHk+4nXMCh1zl/ZAyZ3AXrtx6mNuZS6g=
golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
Expand Down
40 changes: 0 additions & 40 deletions internal/ipcutil/ipcutil.go
View file
Open in desktop

This file was deleted.

137 changes: 0 additions & 137 deletions internal/ipcutil/zz_test.go
View file
Open in desktop

This file was deleted.

Loading
Loading