mattermost
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 1 deletion b/‎.gitignore‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Makefile‎
Lines changed: 1 addition & 1 deletion b/‎Makefile‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎api/api.go‎
Lines changed: 64 additions & 19 deletions b/‎api/api.go‎
Lines changed: 64 additions & 19 deletions
diff --git a/‎api/api_admin.go‎
Lines changed: 18 additions & 20 deletions b/‎api/api_admin.go‎
Lines changed: 18 additions & 20 deletions
diff --git a/‎api/api_admin_test.go‎
Lines changed: 1 addition & 1 deletion b/‎api/api_admin_test.go‎
Lines changed: 1 addition & 1 deletion
@@ -51,4 +51,4 @@ specs/
 
 opencode.json
 
-.planning/
+.planning
@@ -444,7 +444,7 @@ i18n-extract: i18n-extract-webapp i18n-extract-server
 
 .PHONY: i18n-extract-webapp
 i18n-extract-webapp:
-	cd webapp && $(NPM) run i18n-extract -- --out-file src/i18n/en.json --id-interpolation-pattern '[sha512:contenthash:base64:8]' --format simple src/index.tsx src/components/**/*.{ts,tsx}
+	cd webapp && $(NPM) run i18n-extract -- --out-file src/i18n/en.json --id-interpolation-pattern '[sha512:contenthash:base64:8]' --format simple src/index.tsx 'src/components/**/*.{ts,tsx}'
 
 .PHONY: i18n-extract-server
 i18n-extract-server:
 
@@ -67,6 +67,17 @@ type ConfigStore interface {
 	SaveConfig(cfg config.Config) error
 }
 
+// AgentStore provides CRUD access to user-created agents in the database.
+type AgentStore interface {
+	CreateAgent(cfg *llm.BotConfig) error
+	GetAgent(id string) (*llm.BotConfig, error)
+	ListAgents() ([]*llm.BotConfig, error)
+	ListAgentsByCreator(creatorID string) ([]*llm.BotConfig, error)
+	CountActiveAgents() (int, error)
+	UpdateAgent(cfg *llm.BotConfig) error
+	DeleteAgent(id string) error
+}
+
 // ConfigUpdater updates the in-memory plugin configuration.
 type ConfigUpdater interface {
 	Update(cfg *config.Config)
@@ -77,6 +88,11 @@ type ClusterNotifier interface {
 	PublishConfigUpdate() error
 }
 
+// ClusterAgentNotifier broadcasts agent update events to other cluster nodes.
+type ClusterAgentNotifier interface {
+	PublishAgentUpdate() error
+}
+
 // API represents the HTTP API functionality for the plugin
 type API struct {
 	bots                  *bots.MMBots
@@ -99,8 +115,10 @@ type API struct {
 	mcpHandlers           *mcpserver.PluginMCPHandlers
 	llmUpstreamHTTPClient *http.Client
 	configStore           ConfigStore
+	agentStore            AgentStore
 	configUpdater         ConfigUpdater
 	clusterNotifier       ClusterNotifier
+	clusterAgentNotifier  ClusterAgentNotifier
 	getSearchInitError    func() string
 	customPromptsStore    *customprompts.Store
 }
@@ -126,8 +144,10 @@ func New(
 	mcpHandlers *mcpserver.PluginMCPHandlers,
 	llmUpstreamHTTPClient *http.Client,
 	configStore ConfigStore,
+	agentStore AgentStore,
 	configUpdater ConfigUpdater,
 	clusterNotifier ClusterNotifier,
+	clusterAgentNotifier ClusterAgentNotifier,
 	getSearchInitError func() string,
 	customPromptsStore *customprompts.Store,
 ) *API {
@@ -152,8 +172,10 @@ func New(
 		mcpHandlers:           mcpHandlers,
 		llmUpstreamHTTPClient: llmUpstreamHTTPClient,
 		configStore:           configStore,
+		agentStore:            agentStore,
 		configUpdater:         configUpdater,
 		clusterNotifier:       clusterNotifier,
+		clusterAgentNotifier:  clusterAgentNotifier,
 		getSearchInitError:    getSearchInitError,
 		customPromptsStore:    customPromptsStore,
 	}
@@ -212,6 +234,22 @@ func (a *API) ServeHTTP(c *plugin.Context, w http.ResponseWriter, r *http.Reques
 	router.PUT("/mcp/user-preferences", a.handlePutUserPreferences)
 	router.DELETE("/mcp/oauth/:serverName", a.handleDeleteUserMCPOAuth)
 
+	// Agent routes — authenticated. Free-tier instances (no multi-LLM license)
+	// can CRUD up to one self-service agent; the quota is enforced inside
+	// handleCreateAgent so reads, updates, deletes, and avatar uploads remain
+	// available even after a license downgrade.
+	agentRouter := router.Group("/agents")
+	agentRouter.POST("", a.handleCreateAgent)
+	agentRouter.GET("", a.handleListAgents)
+	// Register /models/fetch before /:agentid routes so "models" is never captured as :agentid.
+	agentRouter.POST("/models/fetch", a.handleFetchModelsForService)
+	agentRouter.GET("/:agentid", a.handleGetAgent)
+	agentRouter.PUT("/:agentid", a.handleUpdateAgent)
+	agentRouter.DELETE("/:agentid", a.handleDeleteAgent)
+	agentRouter.POST("/:agentid/avatar", a.handleUploadAgentAvatar)
+
+	router.GET("/services", a.handleListServices)
+
 	// Raw search endpoint returns enriched semantic search results without LLM processing.
 	// Used by the MCP server for external search callbacks.
 	router.POST("/search/raw", a.handleRawSearch)
@@ -295,8 +333,11 @@ func (a *API) metricsMiddleware(c *gin.Context) {
 }
 
 func (a *API) aiBotRequired(c *gin.Context) {
-	// We should integreate LLM here
 	botUsername := c.Query("botUsername")
+	if botUsername == "" {
+		botUsername = a.config.GetDefaultBotName()
+	}
+
 	bot := a.bots.GetBotByUsernameOrFirst(botUsername)
 	if bot == nil {
 		c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("failed to get bot: %s", botUsername))
@@ -351,15 +392,17 @@ func (a *API) handleGetAIThreads(c *gin.Context) {
 }
 
 type AIBotInfo struct {
-	ID                 string                 `json:"id"`
-	DisplayName        string                 `json:"displayName"`
-	Username           string                 `json:"username"`
-	LastIconUpdate     int64                  `json:"lastIconUpdate"`
-	DMChannelID        string                 `json:"dmChannelID"`
-	ChannelAccessLevel llm.ChannelAccessLevel `json:"channelAccessLevel"`
-	ChannelIDs         []string               `json:"channelIDs"`
-	UserAccessLevel    llm.UserAccessLevel    `json:"userAccessLevel"`
-	UserIDs            []string               `json:"userIDs"`
+	ID                    string                 `json:"id"`
+	DisplayName           string                 `json:"displayName"`
+	Username              string                 `json:"username"`
+	LastIconUpdate        int64                  `json:"lastIconUpdate"`
+	DMChannelID           string                 `json:"dmChannelID"`
+	ChannelAccessLevel    llm.ChannelAccessLevel `json:"channelAccessLevel"`
+	ChannelIDs            []string               `json:"channelIDs"`
+	UserAccessLevel       llm.UserAccessLevel    `json:"userAccessLevel"`
+	UserIDs               []string               `json:"userIDs"`
+	EnabledMCPTools       []llm.EnabledMCPTool   `json:"enabledMCPTools"`
+	AutoEnableNewMCPTools bool                   `json:"autoEnableNewMCPTools"`
 }
 
 type AIBotsResponse struct {
@@ -392,15 +435,17 @@ func (a *API) getAIBotsForUser(userID string) ([]AIBotInfo, error) {
 		}
 
 		bots = append(bots, AIBotInfo{
-			ID:                 bot.GetMMBot().UserId,
-			DisplayName:        bot.GetMMBot().DisplayName,
-			Username:           bot.GetMMBot().Username,
-			LastIconUpdate:     bot.GetMMBot().LastIconUpdate,
-			DMChannelID:        dmChannelID,
-			ChannelAccessLevel: bot.GetConfig().ChannelAccessLevel,
-			ChannelIDs:         bot.GetConfig().ChannelIDs,
-			UserAccessLevel:    bot.GetConfig().UserAccessLevel,
-			UserIDs:            bot.GetConfig().UserIDs,
+			ID:                    bot.GetMMBot().UserId,
+			DisplayName:           bot.GetMMBot().DisplayName,
+			Username:              bot.GetMMBot().Username,
+			LastIconUpdate:        bot.GetMMBot().LastIconUpdate,
+			DMChannelID:           dmChannelID,
+			ChannelAccessLevel:    bot.GetConfig().ChannelAccessLevel,
+			ChannelIDs:            bot.GetConfig().ChannelIDs,
+			UserAccessLevel:       bot.GetConfig().UserAccessLevel,
+			UserIDs:               bot.GetConfig().UserIDs,
+			EnabledMCPTools:       bot.GetConfig().EnabledMCPTools,
+			AutoEnableNewMCPTools: bot.GetConfig().AutoEnableNewMCPTools,
 		})
 		if bot.GetMMBot().Username == defaultBotName {
 			bots[0], bots[i] = bots[i], bots[0]
 
@@ -242,28 +242,26 @@ func (a *API) handleGetMCPTools(c *gin.Context) {
 		Servers: make([]MCPServerInfo, 0, len(mcpConfig.Servers)+1),
 	}
 
-	// Discover tools from embedded server
-	{
-		embeddedServer := a.mcpClientManager.GetEmbeddedServer()
-		if embeddedServer != nil {
-			serverInfo := MCPServerInfo{
-				Name:  mcp.EmbeddedServerName,
-				URL:   mcp.EmbeddedClientKey,
-				Tools: []MCPToolInfo{},
-				Error: nil,
-			}
-
-			// Try to discover tools from embedded server
-			tools, err := a.discoverEmbeddedServerTools(c.Request.Context(), userID, mcpConfig.EmbeddedServer, embeddedServer)
-			if err != nil {
-				errMsg := err.Error()
-				serverInfo.Error = &errMsg
-			} else {
-				serverInfo.Tools = tools
-			}
+	embeddedServer := a.mcpClientManager.GetEmbeddedServer()
+	if embeddedServer != nil {
+		serverInfo := MCPServerInfo{
+			Name:  mcp.EmbeddedServerName,
+			URL:   mcp.EmbeddedClientKey,
+			Tools: []MCPToolInfo{},
+			Error: nil,
+		}
 
-			response.Servers = append(response.Servers, serverInfo)
+		// Embedded MCP is always available after PR #617, even if older configs still
+		// have the legacy toggle stored as false.
+		tools, err := a.discoverEmbeddedServerTools(c.Request.Context(), userID, mcpConfig.EmbeddedServer, embeddedServer)
+		if err != nil {
+			errMsg := err.Error()
+			serverInfo.Error = &errMsg
+		} else {
+			serverInfo.Tools = tools
 		}
+
+		response.Servers = append(response.Servers, serverInfo)
 	}
 
 	// Discover tools from each configured remote server
 
@@ -34,7 +34,7 @@ func setupAdminTestEnvironment(t *testing.T) (*API, *plugintest.API) {
 	cfg := &testConfigImpl{}
 	noopMetrics := &metrics.NoopMetrics{}
 
-	api := New(nil, nil, nil, nil, nil, client, noopMetrics, nil, cfg, nil, nil, nil, nil, nil, nil, &mockMCPClientManager{}, nil, nil, nil, nil, nil, nil, nil)
+	api := New(nil, nil, nil, nil, nil, client, noopMetrics, nil, cfg, nil, nil, nil, nil, nil, nil, &mockMCPClientManager{}, nil, nil, nil, nil, nil, nil, nil, nil, nil)
 
 	return api, mockAPI
 }
Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,4 @@ specs/`
`51`	`51`
`52`	`52`	`opencode.json`
`53`	`53`
`54`		`-.planning/`
	`54`	`+.planning`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func setupAdminTestEnvironment(t testing.T) (API, *plugintest.API) {`
`34`	`34`	`cfg := &testConfigImpl{}`
`35`	`35`	`noopMetrics := &metrics.NoopMetrics{}`
`36`	`36`
`37`		`- api := New(nil, nil, nil, nil, nil, client, noopMetrics, nil, cfg, nil, nil, nil, nil, nil, nil, &mockMCPClientManager{}, nil, nil, nil, nil, nil, nil, nil)`
	`37`	`+ api := New(nil, nil, nil, nil, nil, client, noopMetrics, nil, cfg, nil, nil, nil, nil, nil, nil, &mockMCPClientManager{}, nil, nil, nil, nil, nil, nil, nil, nil, nil)`
`38`	`38`
`39`	`39`	`return api, mockAPI`
`40`	`40`	`}`