nextlevelbuilder
diff --git a/‎cmd/gateway.go‎
Lines changed: 73 additions & 29 deletions b/‎cmd/gateway.go‎
Lines changed: 73 additions & 29 deletions
diff --git a/‎cmd/gateway_callbacks.go‎
Lines changed: 2 additions & 2 deletions b/‎cmd/gateway_callbacks.go‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎cmd/gateway_consumer_helpers.go‎
Lines changed: 12 additions & 0 deletions b/‎cmd/gateway_consumer_helpers.go‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎cmd/gateway_consumer_normal.go‎
Lines changed: 6 additions & 0 deletions b/‎cmd/gateway_consumer_normal.go‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎cmd/gateway_cron.go‎
Lines changed: 13 additions & 4 deletions b/‎cmd/gateway_cron.go‎
Lines changed: 13 additions & 4 deletions
diff --git a/‎cmd/gateway_deps.go‎
Lines changed: 6 additions & 0 deletions b/‎cmd/gateway_deps.go‎
Lines changed: 6 additions & 0 deletions
@@ -20,6 +20,8 @@ import (
 	"github.com/nextlevelbuilder/goclaw/internal/eventbus"
 	kg "github.com/nextlevelbuilder/goclaw/internal/knowledgegraph"
 	"github.com/nextlevelbuilder/goclaw/internal/channels/discord"
+	"github.com/nextlevelbuilder/goclaw/internal/channels/facebook"
+	"github.com/nextlevelbuilder/goclaw/internal/channels/pancake"
 	"github.com/nextlevelbuilder/goclaw/internal/channels/feishu"
 	slackchannel "github.com/nextlevelbuilder/goclaw/internal/channels/slack"
 	"github.com/nextlevelbuilder/goclaw/internal/channels/telegram"
@@ -179,52 +181,48 @@ func runGateway() {
 	}
 	setupMemoryEmbeddings(pgStores, providerRegistry)
 
+	// Resolve background provider for consolidation + vault enrichment.
+	// Fallback: background.provider → agent.default_provider → first registered provider.
+	bgProvider, bgModel := resolveBackgroundProvider(cfg, providerRegistry)
+
 	// V3: Wire consolidation pipeline (episodic → semantic → KG → dreaming)
 	if pgStores.Episodic != nil {
-		var consolidationProvider providers.Provider
-		if names := providerRegistry.ListForTenant(providers.MasterTenantID); len(names) > 0 {
-			consolidationProvider, _ = providerRegistry.GetForTenant(providers.MasterTenantID, names[0])
-		}
-		if consolidationProvider != nil {
-			// Create KG extractor for semantic worker (entity/relation extraction from episodic summaries)
+		if bgProvider != nil {
 			var kgExtractor *kg.Extractor
 			if pgStores.KnowledgeGraph != nil {
-				kgExtractor = kg.NewExtractor(consolidationProvider, consolidationProvider.DefaultModel(), 0)
+				kgExtractor = kg.NewExtractor(bgProvider, bgModel, 0)
 			}
 			cleanupConsolidation := consolidation.Register(consolidation.ConsolidationDeps{
 				EpisodicStore: pgStores.Episodic,
 				MemoryStore:   pgStores.Memory,
 				KGStore:       pgStores.KnowledgeGraph,
 				SessionStore:  pgStores.Sessions,
 				EventBus:      domainBus,
-				Provider:      consolidationProvider,
-				Model:         consolidationProvider.DefaultModel(),
+				Provider:      bgProvider,
+				Model:         bgModel,
 				Extractor:     kgExtractor,
+				AgentStore:    pgStores.Agents,
 			})
 			defer cleanupConsolidation()
-			slog.Info("consolidation pipeline registered")
+			slog.Info("consolidation pipeline registered", "provider", bgProvider.Name(), "model", bgModel)
 		} else {
 			slog.Warn("consolidation pipeline skipped: no provider available")
 		}
 	}
 
 	// V3: Wire vault enrichment worker (async summary + embedding + auto-linking).
-	// Resolves provider independently from consolidation pipeline.
-	if pgStores.Vault != nil {
-		var vaultProvider providers.Provider
-		if names := providerRegistry.ListForTenant(providers.MasterTenantID); len(names) > 0 {
-			vaultProvider, _ = providerRegistry.GetForTenant(providers.MasterTenantID, names[0])
-		}
-		if vaultProvider != nil {
-			cleanupVaultEnrich := vault.RegisterEnrichWorker(vault.EnrichWorkerDeps{
-				VaultStore: pgStores.Vault,
-				Provider:   vaultProvider,
-				Model:      vaultProvider.DefaultModel(),
-				EventBus:   domainBus,
-			})
-			defer cleanupVaultEnrich()
-			slog.Info("vault enrichment worker registered")
-		}
+	var enrichProgress *vault.EnrichProgress
+	if pgStores.Vault != nil && bgProvider != nil {
+		cleanupVaultEnrich, ep := vault.RegisterEnrichWorker(vault.EnrichWorkerDeps{
+			VaultStore: pgStores.Vault,
+			Provider:   bgProvider,
+			Model:      bgModel,
+			EventBus:   domainBus,
+			MsgBus:     msgBus,
+		})
+		enrichProgress = ep
+		defer cleanupVaultEnrich()
+		slog.Info("vault enrichment worker registered", "provider", bgProvider.Name(), "model", bgModel)
 	}
 
 	loadBootstrapFiles(pgStores, workspace, agentCfg)
@@ -282,7 +280,7 @@ func runGateway() {
 	var mcpPool *mcpbridge.Pool
 	var mediaStore *media.Store
 	var postTurn tools.PostTurnProcessor
-	contextFileInterceptor, mcpPool, mediaStore, postTurn = wireExtras(pgStores, agentRouter, providerRegistry, msgBus, pgStores.Sessions, toolsReg, toolPE, skillsLoader, hasMemory, traceCollector, workspace, cfg.Gateway.InjectionAction, cfg, sandboxMgr, redisClient, domainBus)
+	contextFileInterceptor, mcpPool, mediaStore, postTurn = wireExtras(pgStores, agentRouter, providerRegistry, modelReg, msgBus, pgStores.Sessions, toolsReg, toolPE, skillsLoader, hasMemory, traceCollector, workspace, cfg.Gateway.InjectionAction, cfg, sandboxMgr, redisClient, domainBus)
 	if mcpPool != nil {
 		defer mcpPool.Stop()
 	}
@@ -297,8 +295,10 @@ func runGateway() {
 		agentRouter:      agentRouter,
 		toolsReg:         toolsReg,
 		skillsLoader:     skillsLoader,
+		enrichProgress:   enrichProgress,
 		workspace:        workspace,
 		dataDir:          dataDir,
+		domainBus:        domainBus,
 	}
 
 	gatewayAddr := loopbackAddr(cfg.Gateway.Host, cfg.Gateway.Port)
@@ -314,7 +314,11 @@ func runGateway() {
 	// Wire dependencies for system prompt preview parity.
 	if agentsH != nil {
 		agentsH.SetPreviewDeps(toolsReg, skillsLoader)
-		agentsH.SetPreviewStores(pgStores.Teams, pgStores.AgentLinks)
+		var skillAccess store.SkillAccessStore
+		if pgStores.Skills != nil {
+			skillAccess, _ = pgStores.Skills.(store.SkillAccessStore)
+		}
+		agentsH.SetPreviewStores(pgStores.Teams, pgStores.AgentLinks, skillAccess)
 	}
 
 	// External wake/trigger API
@@ -417,6 +421,8 @@ func runGateway() {
 		instanceLoader.RegisterFactory(channels.TypeZaloPersonal, zalopersonal.FactoryWithPendingStore(pgStores.PendingMessages))
 		instanceLoader.RegisterFactory(channels.TypeWhatsApp, whatsapp.FactoryWithDB(pgStores.DB, pgStores.PendingMessages, "pgx"))
 		instanceLoader.RegisterFactory(channels.TypeSlack, slackchannel.FactoryWithPendingStore(pgStores.PendingMessages))
+		instanceLoader.RegisterFactory(channels.TypeFacebook, facebook.Factory)
+		instanceLoader.RegisterFactory(channels.TypePancake, pancake.Factory)
 		if err := instanceLoader.LoadAll(context.Background()); err != nil {
 			slog.Error("failed to load channel instances from DB", "error", err)
 		}
@@ -507,8 +513,10 @@ func runGateway() {
 		methods.NewTenantsMethods(pgStores.Tenants, msgBus, workspace).Register(server.Router())
 		server.SetTenantsHandler(httpapi.NewTenantsHandler(pgStores.Tenants, msgBus, workspace))
 		server.Router().SetTenantStore(pgStores.Tenants)
-		// Permission cache for tenant membership checks
+		// Permission cache for tenant membership checks. Store on deps so
+		// lifecycle shutdown can call Close() to stop the sweep goroutines.
 		permCache := cache.NewPermissionCache()
+		deps.permCache = permCache
 		msgBus.Subscribe("permission-cache", func(e bus.Event) {
 			if p, ok := e.Payload.(bus.CacheInvalidatePayload); ok {
 				permCache.HandleInvalidation(p)
@@ -534,3 +542,39 @@ func runGateway() {
 		sigCh:             sigCh,
 	})
 }
+
+// resolveBackgroundProvider picks the LLM provider+model for background workers
+// (vault enrichment, consolidation). Fallback chain:
+//
+//	background.provider/model → agent.default_provider/model → first registered provider.
+func resolveBackgroundProvider(cfg *config.Config, reg *providers.Registry) (providers.Provider, string) {
+	try := func(name, model string) (providers.Provider, string, bool) {
+		if name == "" {
+			return nil, "", false
+		}
+		p, err := reg.GetForTenant(providers.MasterTenantID, name)
+		if err != nil || p == nil {
+			return nil, "", false
+		}
+		if model == "" {
+			model = p.DefaultModel()
+		}
+		return p, model, true
+	}
+
+	// 1. Explicit background config
+	if p, m, ok := try(cfg.Gateway.BackgroundProvider, cfg.Gateway.BackgroundModel); ok {
+		return p, m
+	}
+	// 2. Agent default provider
+	if p, m, ok := try(cfg.Agents.Defaults.Provider, cfg.Agents.Defaults.Model); ok {
+		return p, m
+	}
+	// 3. First registered provider (legacy fallback)
+	if names := reg.ListForTenant(providers.MasterTenantID); len(names) > 0 {
+		if p, m, ok := try(names[0], ""); ok {
+			return p, m
+		}
+	}
+	return nil, ""
+}
@@ -30,8 +30,8 @@ func buildEnsureUserProfile(as store.AgentStore) agent.EnsureUserProfileFunc {
 // isNew=true seeds all files; isNew=false only seeds if user has zero files
 // (avoids re-seeding BOOTSTRAP.md after auto-cleanup on server restart).
 func buildSeedUserFiles(as store.AgentStore) agent.SeedUserFilesFunc {
-	return func(ctx context.Context, agentID uuid.UUID, userID, agentType string, isNew bool) error {
-		_, err := bootstrap.SeedUserFiles(ctx, as, agentID, userID, agentType, !isNew)
+	return func(ctx context.Context, agentID uuid.UUID, userID, agentType string, isNew bool, channelMeta *bootstrap.ChannelMeta) error {
+		_, err := bootstrap.SeedUserFiles(ctx, as, agentID, userID, agentType, !isNew, channelMeta)
 		return err
 	}
 }
 
@@ -91,6 +91,18 @@ func extractSessionMetadata(msg bus.InboundMessage, peerKind string) map[string]
 	return meta
 }
 
+// buildPancakeSessionLabel returns "Pancake:{senderName}:{pageName}" with non-empty parts only.
+func buildPancakeSessionLabel(senderName, pageName string) string {
+	label := "Pancake"
+	if senderName != "" {
+		label += ":" + senderName
+	}
+	if pageName != "" {
+		label += ":" + pageName
+	}
+	return label
+}
+
 // buildAnnounceOutMeta builds outbound metadata for announce messages so that
 // Send() can route replies to the correct forum topic or DM thread.
 func buildAnnounceOutMeta(localKey string) map[string]string {
 
@@ -108,6 +108,12 @@ func processNormalMessage(
 		}
 	}
 
+	// Set session label for Pancake channels: "Pancake:{SenderName}:{PageName}"
+	if msg.Metadata["pancake_mode"] != "" {
+		label := buildPancakeSessionLabel(msg.Metadata["display_name"], msg.Metadata["page_name"])
+		deps.SessStore.SetLabel(ctx, sessionKey, label)
+	}
+
 	// Auto-collect channel contacts for the contact selector.
 	// Skip internal senders (system:*, notification:*, teammate:*, ticker:*, session_send_tool).
 	if deps.ContactCollector != nil && msg.SenderID != "" && !bus.IsInternalSender(msg.SenderID) {
 
@@ -78,8 +78,12 @@ func makeCronJobHandler(sched *scheduler.Scheduler, msgBus *bus.MessageBus, cfg
 			)
 		}
 
-		// Build context with tenant scope so agent loop events are scoped correctly.
-		cronCtx := store.WithTenantID(context.Background(), job.TenantID)
+		// Build context with tenant scope and timeout so agent loop events are
+		// scoped correctly and a hung agent can't block the cron scheduler forever.
+		jobTimeout := cfg.Cron.JobTimeoutDuration()
+		cronCtx, cancelCron := context.WithTimeout(context.Background(), jobTimeout)
+		defer cancelCron()
+		cronCtx = store.WithTenantID(cronCtx, job.TenantID)
 
 		// Reset session before each cron run to prevent tool errors from previous
 		// runs from polluting the context and blocking future executions (#294).
@@ -106,8 +110,13 @@ func makeCronJobHandler(sched *scheduler.Scheduler, msgBus *bus.MessageBus, cfg
 			TraceTags:         []string{"cron"},
 		})
 
-		// Block until the scheduled run completes
-		outcome := <-outCh
+		// Block until the scheduled run completes or the timeout fires.
+		var outcome scheduler.RunOutcome
+		select {
+		case outcome = <-outCh:
+		case <-cronCtx.Done():
+			return nil, fmt.Errorf("cron job %s timed out after %s", job.Name, jobTimeout)
+		}
 		if outcome.Err != nil {
 			return nil, outcome.Err
 		}
 
@@ -3,13 +3,16 @@ package cmd
 import (
 	"github.com/nextlevelbuilder/goclaw/internal/agent"
 	"github.com/nextlevelbuilder/goclaw/internal/bus"
+	"github.com/nextlevelbuilder/goclaw/internal/cache"
 	"github.com/nextlevelbuilder/goclaw/internal/channels"
 	"github.com/nextlevelbuilder/goclaw/internal/config"
+	"github.com/nextlevelbuilder/goclaw/internal/eventbus"
 	"github.com/nextlevelbuilder/goclaw/internal/gateway"
 	"github.com/nextlevelbuilder/goclaw/internal/providers"
 	"github.com/nextlevelbuilder/goclaw/internal/skills"
 	"github.com/nextlevelbuilder/goclaw/internal/store"
 	"github.com/nextlevelbuilder/goclaw/internal/tools"
+	"github.com/nextlevelbuilder/goclaw/internal/vault"
 )
 
 // gatewayDeps holds shared dependencies used across the extracted gateway setup functions.
@@ -24,6 +27,9 @@ type gatewayDeps struct {
 	agentRouter      *agent.Router
 	toolsReg         *tools.Registry
 	skillsLoader     *skills.Loader // optional: enables skill creation in evolution approval
+	permCache        *cache.PermissionCache // nil if no tenant store; closed on shutdown to stop sweep goroutines
+	enrichProgress   *vault.EnrichProgress  // nil if enrichment worker not registered
 	workspace        string
 	dataDir          string
+	domainBus        eventbus.DomainEventBus
 }
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ func buildEnsureUserProfile(as store.AgentStore) agent.EnsureUserProfileFunc {`
`30`	`30`	`// isNew=true seeds all files; isNew=false only seeds if user has zero files`
`31`	`31`	`// (avoids re-seeding BOOTSTRAP.md after auto-cleanup on server restart).`
`32`	`32`	`func buildSeedUserFiles(as store.AgentStore) agent.SeedUserFilesFunc {`
`33`		`- return func(ctx context.Context, agentID uuid.UUID, userID, agentType string, isNew bool) error {`
`34`		`- _, err := bootstrap.SeedUserFiles(ctx, as, agentID, userID, agentType, !isNew)`
	`33`	`+ return func(ctx context.Context, agentID uuid.UUID, userID, agentType string, isNew bool, channelMeta *bootstrap.ChannelMeta) error {`
	`34`	`+ _, err := bootstrap.SeedUserFiles(ctx, as, agentID, userID, agentType, !isNew, channelMeta)`
`35`	`35`	`return err`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,12 @@ func processNormalMessage(`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
	`111`	`+ // Set session label for Pancake channels: "Pancake:{SenderName}:{PageName}"`
	`112`	`+ if msg.Metadata["pancake_mode"] != "" {`
	`113`	`+ label := buildPancakeSessionLabel(msg.Metadata["display_name"], msg.Metadata["page_name"])`
	`114`	`+ deps.SessStore.SetLabel(ctx, sessionKey, label)`
	`115`	`+ }`
	`116`	`+`
`111`	`117`	`// Auto-collect channel contacts for the contact selector.`
`112`	`118`	`// Skip internal senders (system:, notification:, teammate:, ticker:, session_send_tool).`
`113`	`119`	`if deps.ContactCollector != nil && msg.SenderID != "" && !bus.IsInternalSender(msg.SenderID) {`