diff --git a/devagents/registry_build.go b/devagents/registry_build.go
index 6798279..6209ca8 100644
--- a/devagents/registry_build.go
+++ b/devagents/registry_build.go
@@ -295,7 +295,7 @@ func buildToolRegistry(
 }
 
 // resolveDataBase returns the base directory for agent runtime data.
-// Priority: config storage.base_path > $AGENTS_DATA_DIR/<id> > agents/<id>/data
+// Priority: config storage.base_path > $AGENTS_DATA_DIR/<id> > <config-dir>/data
 func resolveDataBase(cfg *config.AgentConfig) string {
 	if cfg.Storage.BasePath != "" {
 		return cfg.Storage.BasePath
@@ -303,5 +303,8 @@ func resolveDataBase(cfg *config.AgentConfig) string {
 	if envDir := os.Getenv("AGENTS_DATA_DIR"); envDir != "" {
 		return filepath.Join(envDir, cfg.Agent.ID)
 	}
+	if cfg.ConfigDir != "" {
+		return filepath.Join(cfg.ConfigDir, "data")
+	}
 	return filepath.Join("agents", cfg.Agent.ID, "data")
 }