diff --git a/agents/runtime.go b/agents/runtime.go
index e8f7a75..4739e7f 100644
--- a/agents/runtime.go
+++ b/agents/runtime.go
@@ -175,6 +175,11 @@ func New(cfg *config.AgentConfig, rules []decision.Rule, logger *slog.Logger) (*
 	// Effects runner
 	runner := effects.NewRunner(matrixClient, sshExec, logger)
 
+	// Resolve base data path for this agent.
+	// Priority: config storage.base_path > $AGENTS_DATA_DIR/<id> > agents/<id>/data
+	dataBase := resolveDataBase(cfg)
+	logger.Debug("data base path", "path", dataBase)
+
 	// Memory subsystem
 	var memStore memory.Store
 	windowSize := defaultWindowSize
@@ -188,7 +193,7 @@ func New(cfg *config.AgentConfig, rules []decision.Rule, logger *slog.Logger) (*
 
 		dbPath := cfg.Memory.DBPath
 		if dbPath == "" {
-			dbPath = filepath.Join("agents", cfg.Agent.ID, "data", "memory.db")
+			dbPath = filepath.Join(dataBase, "memory.db")
 		}
 		store, err := shellmem.New(dbPath, logger)
 		if err != nil {
@@ -205,7 +210,7 @@ func New(cfg *config.AgentConfig, rules []decision.Rule, logger *slog.Logger) (*
 		if knowledgeDir == "" {
 			knowledgeDir = filepath.Join("agents", cfg.Agent.ID, "knowledge")
 		}
-		knowledgeDBPath := filepath.Join("agents", cfg.Agent.ID, "data", "knowledge.db")
+		knowledgeDBPath := filepath.Join(dataBase, "knowledge.db")
 		var kErr error
 		kStore, kErr = shellknowledge.New(knowledgeDir, knowledgeDBPath, logger)
 		if kErr != nil {
@@ -902,6 +907,18 @@ func (a *Agent) sanitizeInput(content, roomID, senderID string) (string, bool) {
 	return result.Output, result.Rejected
 }
 
+// resolveDataBase returns the base directory for agent runtime data.
+// Priority: config storage.base_path > $AGENTS_DATA_DIR/<id> > agents/<id>/data
+func resolveDataBase(cfg *config.AgentConfig) string {
+	if cfg.Storage.BasePath != "" {
+		return cfg.Storage.BasePath
+	}
+	if envDir := os.Getenv("AGENTS_DATA_DIR"); envDir != "" {
+		return filepath.Join(envDir, cfg.Agent.ID)
+	}
+	return filepath.Join("agents", cfg.Agent.ID, "data")
+}
+
 // buildToolRegistry creates a Registry with tools enabled in the agent's config.
 func buildToolRegistry(
 	cfg *config.AgentConfig,
diff --git a/internal/config/schema.go b/internal/config/schema.go
index 37876c8..cd05d9f 100644
--- a/internal/config/schema.go
+++ b/internal/config/schema.go
@@ -413,9 +413,10 @@ type QueueCfg struct {
 // ── Storage ───────────────────────────────────────────────────────────────
 
 type StorageCfg struct {
-	State   StateStorageCfg   `yaml:"state"`
-	Cache   CacheStorageCfg   `yaml:"cache"`
-	History HistoryStorageCfg `yaml:"history"`
+	BasePath string            `yaml:"base_path"` // root for all data; default $AGENTS_DATA_DIR/<id> or agents/<id>/data
+	State    StateStorageCfg   `yaml:"state"`
+	Cache    CacheStorageCfg   `yaml:"cache"`
+	History  HistoryStorageCfg `yaml:"history"`
 }
 
 type StateStorageCfg struct {