diff --git a/pkg/agentic/prep.go b/pkg/agentic/prep.go
index 9508085..3a562fe 100644
--- a/pkg/agentic/prep.go
+++ b/pkg/agentic/prep.go
@@ -8,7 +8,6 @@ import (
 	"crypto/sha256"
 	"encoding/base64"
 	"encoding/hex"
-	"sync"
 	"time"
 
 	"dappco.re/go/agent/pkg/lib"
@@ -41,9 +40,9 @@ type PrepSubsystem struct {
 	failCount          map[string]int
 	providers          *ProviderManager
 	workspaces         *core.Registry[*WorkspaceStatus]
-	stateOnce          sync.Once
+	stateOnce          core.Once
 	state              *stateStoreRef
-	workspaceStatsOnce sync.Once
+	workspaceStatsOnce core.Once
 	workspaceStats     *workspaceStatsRef
 }
 
diff --git a/pkg/agentic/statestore.go b/pkg/agentic/statestore.go
index 36cfc73..e942779 100644
--- a/pkg/agentic/statestore.go
+++ b/pkg/agentic/statestore.go
@@ -3,8 +3,6 @@
 package agentic
 
 import (
-	"sync"
-
 	core "dappco.re/go/core"
 	store "dappco.re/go/store"
 )
@@ -28,9 +26,9 @@ func stateStorePath() string {
 }
 
 // stateStoreRef keeps the store instance, its initialisation error, and a
-// sync.Once so multiple callers observe the same lazily-initialised value.
+// core.Once so multiple callers observe the same lazily-initialised value.
 type stateStoreRef struct {
-	once     sync.Once
+	once     core.Once
 	instance *store.Store
 	err      error
 }
@@ -102,7 +100,7 @@ func (s *PrepSubsystem) closeStateStore() {
 	}
 	ref.err = nil
 	s.state = nil
-	s.stateOnce = sync.Once{}
+	s.stateOnce.Reset()
 }
 
 // openStateStore attempts to open the canonical state store at
diff --git a/pkg/agentic/workspace_stats.go b/pkg/agentic/workspace_stats.go
index 2f9c6cd..3fbb752 100644
--- a/pkg/agentic/workspace_stats.go
+++ b/pkg/agentic/workspace_stats.go
@@ -3,7 +3,6 @@
 package agentic
 
 import (
-	"sync"
 	"time"
 
 	core "dappco.re/go/core"
@@ -25,7 +24,7 @@ const stateWorkspaceStatsGroup = "stats"
 // separate from the top-level `stateStoreRef` so the two stores open
 // independently — a missing parent DB does not disable top-level state.
 type workspaceStatsRef struct {
-	once     sync.Once
+	once     core.Once
 	instance *store.Store
 	err      error
 }
@@ -90,7 +89,7 @@ func (s *PrepSubsystem) closeWorkspaceStatsStore() {
 	}
 	ref.err = nil
 	s.workspaceStats = nil
-	s.workspaceStatsOnce = sync.Once{}
+	s.workspaceStatsOnce.Reset()
 }
 
 // openWorkspaceStatsStore opens the parent workspace stats database,