diff --git a/cmd/dev/cmd_bundles.go b/cmd/dev/cmd_bundles.go
index cceaf24..e35f4e3 100644
--- a/cmd/dev/cmd_bundles.go
+++ b/cmd/dev/cmd_bundles.go
@@ -3,7 +3,7 @@ package dev
 import (
 	"context"
 
-	"forge.lthn.ai/core/go-agentic"
+	agentic "forge.lthn.ai/core/agent/pkg/lifecycle"
 	"forge.lthn.ai/core/go/pkg/core"
 	"forge.lthn.ai/core/go-scm/git"
 )
diff --git a/cmd/dev/cmd_work.go b/cmd/dev/cmd_work.go
index 8fee43f..6eea8f7 100644
--- a/cmd/dev/cmd_work.go
+++ b/cmd/dev/cmd_work.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"forge.lthn.ai/core/cli/pkg/cli"
-	"forge.lthn.ai/core/go-agentic"
+	agentic "forge.lthn.ai/core/agent/pkg/lifecycle"
 	"forge.lthn.ai/core/go-scm/git"
 	"forge.lthn.ai/core/go-i18n"
 )
diff --git a/cmd/dev/registry.go b/cmd/dev/registry.go
index bf4f7b1..7f2219f 100644
--- a/cmd/dev/registry.go
+++ b/cmd/dev/registry.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"forge.lthn.ai/core/go-agentic/cmd/workspace"
+	"forge.lthn.ai/core/agent/cmd/workspace"
 	"forge.lthn.ai/core/cli/pkg/cli"
 	"forge.lthn.ai/core/go-i18n"
 	"forge.lthn.ai/core/go-io"
diff --git a/cmd/dev/service.go b/cmd/dev/service.go
index 23c62b7..64e6cd4 100644
--- a/cmd/dev/service.go
+++ b/cmd/dev/service.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"forge.lthn.ai/core/cli/pkg/cli"
-	"forge.lthn.ai/core/go-agentic"
+	agentic "forge.lthn.ai/core/agent/pkg/lifecycle"
 	"forge.lthn.ai/core/go-scm/git"
 	"forge.lthn.ai/core/go/pkg/core"
 )
diff --git a/cmd/docs/cmd_scan.go b/cmd/docs/cmd_scan.go
index 572d2dc..de752f6 100644
--- a/cmd/docs/cmd_scan.go
+++ b/cmd/docs/cmd_scan.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"forge.lthn.ai/core/go-agentic/cmd/workspace"
+	"forge.lthn.ai/core/agent/cmd/workspace"
 	"forge.lthn.ai/core/cli/pkg/cli"
 	"forge.lthn.ai/core/go-i18n"
 	"forge.lthn.ai/core/go-io"
diff --git a/cmd/setup/cmd_bootstrap.go b/cmd/setup/cmd_bootstrap.go
index a79265b..7ead9ba 100644
--- a/cmd/setup/cmd_bootstrap.go
+++ b/cmd/setup/cmd_bootstrap.go
@@ -13,7 +13,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"forge.lthn.ai/core/go-agentic/cmd/workspace"
+	"forge.lthn.ai/core/agent/cmd/workspace"
 	"forge.lthn.ai/core/go-i18n"
 	coreio "forge.lthn.ai/core/go-io"
 	"forge.lthn.ai/core/go-scm/repos"
diff --git a/cmd/setup/cmd_registry.go b/cmd/setup/cmd_registry.go
index cc11341..d62dca3 100644
--- a/cmd/setup/cmd_registry.go
+++ b/cmd/setup/cmd_registry.go
@@ -13,7 +13,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"forge.lthn.ai/core/go-agentic/cmd/workspace"
+	"forge.lthn.ai/core/agent/cmd/workspace"
 	"forge.lthn.ai/core/cli/pkg/cli"
 	"forge.lthn.ai/core/go-i18n"
 	coreio "forge.lthn.ai/core/go-io"
diff --git a/go.mod b/go.mod
index 37495b1..6d0934b 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.26.0
 
 require (
 	forge.lthn.ai/core/cli v0.1.0
-	forge.lthn.ai/core/go-agentic v0.1.0
+	forge.lthn.ai/core/agent v0.1.0
 	forge.lthn.ai/core/go-ansible v0.1.0
 	forge.lthn.ai/core/go-config v0.1.0
 	forge.lthn.ai/core/go-container v0.1.0