Batuhan/cleanup 8

README.md

@@ -6,7 +6,7 @@ Batteries included - one click setup (for [Beeper Plus](https://www.beeper.com/p
 
 Coming soon to Beeper Desktop as an experiment. Join the [Developer Community](beeper://connect) on [Matrix](https://matrix.to/#/#beeper-developers:beeper.com?via=beeper.com) for early access.
 
-Connect all your chats with one click and manage your inbox with agents. Supports image generation, reminders, web search, and memory. Create basic AI Chats to talk to models with no tools and customizable system prompt.
+Connect all your chats with one click and manage your inbox with agents. Supports image generation, reminders, web search, and memory. Create direct model chats for simple conversations or agent chats for richer workflows.
 
 Made by humans using agentic coding.
 
@@ -20,7 +20,7 @@ Experimental Matrix ↔ AI bridge for Beeper, built on top of [mautrix/bridgev2]
 - Per-model chats (each model shows up as its own contact)
 - Streaming responses
 - Multimodal input (images, PDFs, audio, video) when supported by the model
-- Per-room settings (model, temperature, system prompt, context limits, tools)
+- Ghost-based chat targeting for models and agents
 - Login flows for Beeper, Magic Proxy, or custom (BYOK)
 - OpenClaw-style memory search (stored in the bridge DB)
 

docs/matrix-ai-matrix-spec-v1.md

@@ -31,7 +31,7 @@ This document specifies a Matrix transport profile for real-time AI:
   - primary: ephemeral events (`com.beeper.ai.stream_event` with AI SDK `UIMessageChunk`)
   - fallback: debounced `m.replace` timeline edits when ephemeral delivery is unavailable
 - `com.beeper.ai.*` timeline projection events (tool call/result, compaction status, etc).
-- `com.beeper.ai.*` state events (room settings/capabilities).
+- standard Matrix room features for capability advertising.
 - Tool approvals (MCP approvals + selected builtin tools).
 - Auxiliary `com.beeper.ai*` keys used for routing/metadata.
 
@@ -82,9 +82,6 @@ Authoritative identifiers are defined in `pkg/matrixevents/matrixevents.go`.
 | `m.room.message` | message | timeline | Canonical assistant message carrier (`com.beeper.ai`) | [Canonical](#canonical) |
 | `com.beeper.ai.stream_event` | ephemeral | ephemeral | Streaming `UIMessageChunk` deltas | [Streaming](#streaming) |
 | `com.beeper.ai.compaction_status` | message | timeline | Context compaction lifecycle/status | [Projections](#projection-compaction) |
-| `com.beeper.ai.room_capabilities` | state | state | Producer-controlled capabilities and effective settings | [State](#state-room-capabilities) |
-| `com.beeper.ai.room_settings` | state | state | User-editable room settings | [State](#state-room-settings) |
-| `com.beeper.ai.model_capabilities` | state | state | Per-model capabilities (e.g. supported features) | — |
 | `com.beeper.ai.agents` | state | state | Agent definitions for the room | — |
 
 ### Content Keys (Inside Standard Events)
@@ -288,56 +285,7 @@ Example:
 
 <a id="state"></a>
 ## State Events
-State events broadcast room configuration and capabilities.
-
-<a id="state-room-capabilities"></a>
-### `com.beeper.ai.room_capabilities`
-Producer-controlled capabilities and effective settings.
-
-Fields (see `RoomCapabilitiesEventContent` in `pkg/connector/events.go`):
-- `capabilities?: ModelCapabilities`
-- `available_tools?: ToolInfo[]`
-- `reasoning_effort_options?: { value: string, label: string }[]`
-- `provider?: string`
-- `effective_settings?: object`
-
-Example:
-```json
-{
-  "capabilities": {
-    "supports_reasoning": true,
-    "supports_tool_calling": true
-  },
-  "available_tools": [
-    {"name": "web_search", "display_name": "Web Search", "type": "provider", "enabled": true, "available": true}
-  ],
-  "provider": "beeper"
-}
-```
-
-<a id="state-room-settings"></a>
-### `com.beeper.ai.room_settings`
-User-editable room settings.
-
-Fields (see `RoomSettingsEventContent` in `pkg/connector/events.go`):
-- `model?: string`
-- `system_prompt?: string`
-- `temperature?: number`
-- `max_context_messages?: number`
-- `max_completion_tokens?: number`
-- `reasoning_effort?: string`
-- `agent_id?: string`
-- `emit_thinking?: boolean`
-- `emit_tool_args?: boolean`
-
-Example:
-```json
-{
-  "model": "openai/gpt-5",
-  "temperature": 0.7,
-  "agent_id": "boss"
-}
-```
+This bridge no longer uses custom room state for editable AI configuration. Room target selection is determined by ghost identity and membership, while room-level capability advertising uses standard Matrix room features.
 
 <a id="approvals"></a>
 ## Tool Approvals

docs/msc/com.beeper.mscXXXX-commands.md

@@ -8,7 +8,7 @@ This is a profile document, not a new MSC. It specifies which commands ai-bridge
 
 ## Motivation
 
-Text-based bot commands (`!ai model gpt-4o`, `!ai reset`) have several problems:
+Text-based bot commands (`!ai status`, `!ai reset`) have several problems:
 
 - **Undiscoverable:** Users must read documentation or type `!ai help` to learn available commands. There is no in-client autocomplete or parameter hinting.
 - **Fragile parsing:** Free-text command parsing leads to ambiguous inputs and poor error messages. Typed parameters eliminate this class of bugs.
@@ -36,22 +36,6 @@ The bot MUST broadcast one state event per command when it joins a room. The `st
 ```
 
 ```json
-{
-  "type": "org.matrix.msc4391.command_description",
-  "state_key": "model",
-  "content": {
-    "description": "Get or set the AI model",
-    "arguments": {
-      "model_id": {
-        "description": "Model identifier (e.g. gpt-4o, claude-sonnet)",
-        "required": false,
-        "type": "string"
-      }
-    }
-  }
-}
-```
-
 ### Structured Invocation
 
 When a client sends a command, it MUST include the `org.matrix.msc4391.command` field in the message content:
@@ -61,12 +45,10 @@ When a client sends a command, it MUST include the `org.matrix.msc4391.command`
   "type": "m.room.message",
   "content": {
     "msgtype": "m.text",
-    "body": "!ai model gpt-4o",
+    "body": "!ai status",
     "org.matrix.msc4391.command": {
-      "command": "model",
-      "arguments": {
-        "model_id": "gpt-4o"
-      }
+      "command": "status",
+      "arguments": {}
     }
   }
 }
@@ -80,19 +62,10 @@ Commands broadcast by ai-bridge:
 
 | Command | Description | Arguments |
 |---------|-------------|-----------|
+| `new` | Create a new chat of the same type | `agent?: string` |
 | `status` | Show current session status | — |
-| `model` | Get or set the AI model | `model_id?: string` |
 | `reset` | Start a new session/thread | — |
 | `stop` | Abort current run and clear queue | — |
-| `think` | Get or set thinking level | `level?: off\|minimal\|low\|medium\|high\|xhigh` |
-| `verbose` | Get or set verbosity | `level?: off\|on\|full` |
-| `reasoning` | Get or set reasoning visibility | `level?: off\|on\|low\|medium\|high\|xhigh` |
-| `elevated` | Get or set elevated access | `level?: off\|on\|ask\|full` |
-| `activation` | Set group activation policy | `policy: mention\|always` |
-| `send` | Allow/deny sending messages | `mode: on\|off\|inherit` |
-| `queue` | Inspect or configure message queue | `action?: status\|reset\|<mode>` |
-| `whoami` | Show your Matrix user ID | — |
-| `last-heartbeat` | Show last heartbeat event | — |
 
 Dynamic commands from integrations and modules are also broadcast as state events.
 
@@ -104,7 +77,7 @@ When both are present, the structured `org.matrix.msc4391.command` field takes p
 
 ## Security Considerations
 
-- **Command authorization:** The bot SHOULD check room power levels before executing commands that modify room or session state. Commands like `reset`, `model`, and `elevated` affect all users in the room.
+- **Command authorization:** The bot SHOULD check room power levels before executing commands that modify room or session state.
 - **Argument validation:** The bot MUST validate structured arguments against the published schema before execution. Malformed arguments MUST be rejected with an error message.
 
 ## Unstable Prefix

pkg/connector/agent_activity.go

@@ -74,7 +74,7 @@ func (oc *AIClient) lastActivePortal(agentID string) *bridgev2.Portal {
 	portal := oc.portalByRoomID(context.Background(), id.RoomID(room))
 	// Guard against stale mappings when a room's agent assignment changes.
 	if portal != nil {
-		if meta := portalMeta(portal); meta != nil && normalizeAgentID(meta.AgentID) != normalizeAgentID(agentID) {
+		if meta := portalMeta(portal); meta != nil && normalizeAgentID(resolveAgentID(meta)) != normalizeAgentID(agentID) {
 			return nil
 		}
 	}

pkg/connector/agent_display.go

@@ -53,9 +53,6 @@ func (oc *AIClient) agentDefaultModel(agent *agents.AgentDefinition) string {
 	if agent == nil {
 		return oc.effectiveModel(nil)
 	}
-	if override := oc.agentModelOverride(agent.ID); override != "" {
-		return ResolveAlias(override)
-	}
 	if agent.Model.Primary != "" {
 		return ResolveAlias(agent.Model.Primary)
 	}

pkg/connector/agentstore.go

@@ -522,13 +522,12 @@ func (b *BossStoreAdapter) CreateRoom(ctx context.Context, room tools.RoomData)
 		return "", fmt.Errorf("failed to get created portal: %w", err)
 	}
 
-	// Apply custom name and system prompt if provided
+	// Apply custom room name if provided.
 	pm := portalMeta(portal)
 	originalName := portal.Name
 	originalNameSet := portal.NameSet
 	originalTitle := pm.Title
 	originalTitleGenerated := pm.TitleGenerated
-	originalSystemPrompt := pm.SystemPrompt
 
 	if room.Name != "" {
 		pm.Title = room.Name
@@ -538,12 +537,6 @@ func (b *BossStoreAdapter) CreateRoom(ctx context.Context, room tools.RoomData)
 			resp.PortalInfo.Name = &room.Name
 		}
 	}
-	if room.SystemPrompt != "" {
-		pm.SystemPrompt = room.SystemPrompt
-		// Note: portal.Topic is NOT set to SystemPrompt - they are separate concepts
-		// Topic is for display only, SystemPrompt is for LLM context
-	}
-
 	// Create the Matrix room
 	if err := portal.CreateMatrixRoom(ctx, b.store.client.UserLogin, resp.PortalInfo); err != nil {
 		cleanupPortal(ctx, b.store.client, portal, "failed to create Matrix room")
@@ -562,13 +555,6 @@ func (b *BossStoreAdapter) CreateRoom(ctx context.Context, room tools.RoomData)
 			pm.TitleGenerated = originalTitleGenerated
 		}
 	}
-	if room.SystemPrompt != "" {
-		if err := b.store.client.setRoomSystemPromptNoSave(ctx, portal, room.SystemPrompt); err != nil {
-			b.store.client.log.Warn().Err(err).Msg("Failed to set room system prompt")
-			pm.SystemPrompt = originalSystemPrompt
-		}
-	}
-
 	if err := portal.Save(ctx); err != nil {
 		return "", fmt.Errorf("failed to save room overrides: %w", err)
 	}
@@ -597,29 +583,18 @@ func (b *BossStoreAdapter) ModifyRoom(ctx context.Context, roomID string, update
 		if err != nil {
 			return fmt.Errorf("agent '%s' not found: %w", updates.AgentID, err)
 		}
-		pm.AgentID = agent.ID
-		pm.Model = ""
-		modelID := b.store.client.effectiveModel(pm)
-		pm.Capabilities = getModelCapabilities(modelID, b.store.client.findModelInfo(modelID))
 		portal.OtherUserID = agentUserID(agent.ID)
+		pm.ResolvedTarget = resolveTargetFromGhostID(portal.OtherUserID)
+		modelID := b.store.client.effectiveModel(pm)
 		agentName := b.store.client.resolveAgentDisplayName(ctx, agent)
 		b.store.client.ensureAgentGhostDisplayName(ctx, agent.ID, modelID, agentName)
 	}
-	if updates.SystemPrompt != "" {
-		pm.SystemPrompt = updates.SystemPrompt
-		// Note: portal.Topic is NOT set to SystemPrompt - they are separate concepts
-	}
 
 	if updates.Name != "" && portal.MXID != "" {
 		if err := b.store.client.setRoomName(ctx, portal, updates.Name); err != nil {
 			b.store.client.log.Warn().Err(err).Msg("Failed to set Matrix room name")
 		}
 	}
-	if updates.SystemPrompt != "" && portal.MXID != "" {
-		if err := b.store.client.setRoomSystemPrompt(ctx, portal, updates.SystemPrompt); err != nil {
-			b.store.client.log.Warn().Err(err).Msg("Failed to set room system prompt")
-		}
-	}
 
 	return portal.Save(ctx)
 }
@@ -645,7 +620,7 @@ func (b *BossStoreAdapter) ListRooms(ctx context.Context) ([]tools.RoomData, err
 		rooms = append(rooms, tools.RoomData{
 			ID:      roomID,
 			Name:    name,
-			AgentID: pm.AgentID,
+			AgentID: resolveAgentID(pm),
 		})
 	}