agentpool 2.2.3__py3-none-any.whl → 2.5.0__py3-none-any.whl

agentpool_server/acp_server/session_manager.py

@@ -87,20 +87,15 @@ class ACPSessionManager:
                 logger.warning("Session ID already exists", session_id=session_id)
                 msg = f"Session {session_id} already exists"
                 raise ValueError(msg)
-
             # Create and persist session data via pool's SessionManager
             data = SessionData(
                 session_id=session_id,
                 agent_name=default_agent_name,
-                conversation_id=f"conv_{session_id}",
+                conversation_id=session_id,
                 cwd=cwd,
-                metadata={
-                    "protocol": "acp",
-                    "mcp_server_count": len(mcp_servers) if mcp_servers else 0,
-                },
+                metadata={"protocol": "acp", "mcp_server_count": len(mcp_servers or [])},
             )
             await self.session_manager.save(data)
-
             # Create the ACP-specific runtime session
             session = ACPSession(
                 session_id=session_id,
@@ -115,26 +110,16 @@ class ACPSessionManager:
                 manager=self,
             )
             session.register_update_callback(self._on_commands_updated)
-
             # Initialize async resources
             await session.initialize()
-
             # Initialize MCP servers if any are provided
             await session.initialize_mcp_servers()
-
             self._active[session_id] = session
             logger.info("Created ACP session", session_id=session_id, agent=default_agent_name)
             return session_id
 
     def get_session(self, session_id: str) -> ACPSession | None:
-        """Get an active session by ID.
-
-        Args:
-            session_id: Session identifier
-
-        Returns:
-            ACPSession instance or None if not found
-        """
+        """Get an active session by ID."""
         return self._active.get(session_id)
 
     async def resume_session(
@@ -161,7 +146,6 @@ class ACPSessionManager:
             # Check if already active
             if session_id in self._active:
                 return self._active[session_id]
-
             # Try to load from pool's session store
             data = await self.session_manager.store.load(session_id)
             if data is None:
@@ -170,11 +154,8 @@ class ACPSessionManager:
 
             # Validate agent still exists
             if data.agent_name not in self._pool.all_agents:
-                logger.warning(
-                    "Session agent no longer exists",
-                    session_id=session_id,
-                    agent=data.agent_name,
-                )
+                msg = "Session agent no longer exists"
+                logger.warning(msg, session_id=session_id, agent=data.agent_name)
                 return None
 
             # Reconstruct ACP session
@@ -191,10 +172,8 @@ class ACPSessionManager:
                 manager=self,
             )
             session.register_update_callback(self._on_commands_updated)
-
             # Initialize async resources
             await session.initialize()
-
             self._active[session_id] = session
             logger.info("Resumed ACP session", session_id=session_id)
             return session
@@ -224,10 +203,8 @@ class ACPSessionManager:
             session_id: Session identifier
             agent_name: New agent name
         """
-        session = self._active.get(session_id)
-        if not session:
+        if not self._active.get(session_id):
             return
-
         # Load, update, and save session data
         data = await self.session_manager.store.load(session_id)
         if data:
@@ -267,11 +244,8 @@ class ACPSessionManager:
                 await session.close()
                 closed_count += 1
             except Exception:
-                logger.exception(
-                    "Error closing session during pool swap", session=session.session_id
-                )
-
-        logger.info("Closed all sessions for pool swap", count=closed_count)
+                logger.exception("Error closing session", session=session.session_id)
+        logger.info("Closed all sessions.", count=closed_count)
         return closed_count
 
     async def __aenter__(self) -> Self:

agentpool_server/agui_server/server.py

@@ -88,7 +88,9 @@ class AGUIServer(HTTPServer):
                 if pool_agent is None:
                     msg = f"Agent {agent_name!r} not found"
                     return JSONResponse({"error": msg}, status_code=404)
-                agentlet = await pool_agent.get_agentlet(None, pool_agent.model_name, str)
+                agentlet = await pool_agent.get_agentlet(
+                    model=pool_agent.model_name, output_type=str, input_provider=None
+                )
                 try:
                     # Use AGUIAdapter.dispatch_request() which handles the full
                     # AG-UI protocol: parsing request, running agent, streaming response

agentpool_server/mcp_server/server.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 from collections import defaultdict
 from typing import TYPE_CHECKING, Any
 
-from fastmcp import FastMCP
 from fastmcp.server.middleware.caching import ResponseCachingMiddleware
 from key_value.aio.stores.disk import DiskStore
 import mcp
@@ -22,6 +21,7 @@ if TYPE_CHECKING:
     from collections.abc import Awaitable, Callable
     from contextlib import AbstractAsyncContextManager
 
+    from fastmcp import FastMCP
     from mcp.server.lowlevel.server import LifespanResultT
     from pydantic import AnyUrl
 
@@ -71,6 +71,8 @@ class MCPServer(BaseServer):
             instructions: Instructions for server usage
             raise_exceptions: Whether to raise exceptions during server start
         """
+        from fastmcp import FastMCP
+
         from agentpool.resource_providers.pool import PoolResourceProvider
 
         super().__init__(pool, name=name, raise_exceptions=raise_exceptions)
@@ -129,7 +131,8 @@ class MCPServer(BaseServer):
                 idempotentHint=tool.hints.idempotent,
                 openWorldHint=tool.hints.open_world,
             )
-            self.fastmcp.tool(annotations=tool_annotations, task=True)(tool_handler)
+            # TODO: set task=True?
+            self.fastmcp.tool(annotations=tool_annotations)(tool_handler)
 
         self._tools_registered = True
         logger.info("Registered MCP tools", count=len(tools))

agentpool_server/opencode_server/ENDPOINTS.md

@@ -43,7 +43,7 @@ This document tracks the implementation status of OpenCode-compatible API endpoi
 | Status | Method | Path | Description |
 |--------|--------|------|-------------|
 | [x] | GET | `/config` | Get config info |
-| [ ] | PATCH | `/config` | Update config |
+| [x] | PATCH | `/config` | Update config |
 | [~] | GET | `/config/providers` | List providers and default models |
 
 ---
@@ -90,9 +90,9 @@ This document tracks the implementation status of OpenCode-compatible API endpoi
 | Status | Method | Path | Description |
 |--------|--------|------|-------------|
 | [x] | GET | `/session/{id}/message` | List messages in session |
-| [~] | POST | `/session/{id}/message` | Send message (wait for response) |
+| [x] | POST | `/session/{id}/message` | Send message (wait for response) |
 | [x] | GET | `/session/{id}/message/{messageID}` | Get message details |
-| [ ] | POST | `/session/{id}/prompt_async` | Send message async (no wait) |
+| [x] | POST | `/session/{id}/prompt_async` | Send message async (no wait) |
 | [x] | POST | `/session/{id}/command` | Execute slash command (MCP prompts) |
 | [x] | POST | `/session/{id}/shell` | Run shell command |
 
@@ -140,6 +140,7 @@ This document tracks the implementation status of OpenCode-compatible API endpoi
 | [x] | GET | `/formatter` | Get formatter status (stub) |
 | [~] | GET | `/mcp` | Get MCP server status |
 | [x] | POST | `/mcp` | Add MCP server dynamically |
+| [x] | GET | `/experimental/resource` | List MCP resources from connected servers |
 
 ---
 
@@ -171,12 +172,12 @@ This document tracks the implementation status of OpenCode-compatible API endpoi
 
 | Status | Method | Path | Description |
 |--------|--------|------|-------------|
-| [ ] | GET | `/pty` | List all PTY sessions |
-| [ ] | POST | `/pty` | Create a new PTY session |
-| [ ] | GET | `/pty/{ptyID}` | Get PTY session details |
-| [ ] | PATCH | `/pty/{ptyID}` | Update PTY session (resize, etc.) |
-| [ ] | DELETE | `/pty/{ptyID}` | Remove/kill PTY session |
-| [ ] | GET | `/pty/{ptyID}/connect` | Connect to PTY (WebSocket) |
+| [x] | GET | `/pty` | List all PTY sessions |
+| [x] | POST | `/pty` | Create a new PTY session |
+| [x] | GET | `/pty/{ptyID}` | Get PTY session details |
+| [x] | PATCH | `/pty/{ptyID}` | Update PTY session (resize, etc.) |
+| [x] | DELETE | `/pty/{ptyID}` | Remove/kill PTY session |
+| [x] | WS | `/pty/{ptyID}/connect` | Connect to PTY (WebSocket) |
 
 ### PTY SSE Event Types
 
@@ -234,7 +235,7 @@ All event types supported by the OpenCode protocol:
 | [-] | `global.disposed` | Global instance disposed (multi-project, not needed) |
 | [-] | `installation.updated` | Installation updated (auto-upgrade complete, not needed) |
 | [x] | `installation.update-available` | Update available (via `tui.toast.show` workaround) |
-| [ ] | `project.updated` | Project configuration updated |
+| [x] | `project.updated` | Project metadata updated |
 | [-] | `server.instance.disposed` | Server instance disposed (multi-project, not needed) |
 | [x] | `lsp.updated` | LSP server status updated |
 | [~] | `lsp.client.diagnostics` | LSP client diagnostics received |
@@ -247,10 +248,10 @@ All event types supported by the OpenCode protocol:
 | [ ] | `session.diff` | Session file diff updated |
 | [x] | `session.error` | Session encountered an error |
 | [x] | `message.updated` | Message created or updated |
-| [ ] | `message.removed` | Message removed |
+| [x] | `message.removed` | Message removed (during revert) |
 | [x] | `message.part.updated` | Message part (text, tool, etc.) updated |
-| [ ] | `message.part.removed` | Message part removed |
-| [x] | `permission.updated` | Tool permission requested (awaiting user response) |
+| [x] | `message.part.removed` | Message part removed (during revert) |
+| [x] | `permission.asked` | Tool permission requested (awaiting user response) |
 | [x] | `permission.replied` | Permission request resolved (user responded) |
 | [x] | `todo.updated` | Todo list item updated |
 | [ ] | `file.edited` | File was edited |
@@ -312,6 +313,44 @@ duty opencode
 
 ---
 
+## Tool Metadata Support - Complete OpenCode UI Coverage
+
+**These are ALL 11 tools registered in OpenCode's UI that use metadata for enhanced rendering:**
+
+| # | Tool | AgentPool | Metadata | UI Feature |
+|---|------|-----------|----------|------------|
+| 1 | `read` | ✅ **DONE** | `preview`, `truncated` | File preview, truncation badge |
+| 2 | `list` | ✅ **DONE** | `count`, `truncated` | File count, directory tree |
+| 3 | `glob` | ❌ **MISSING** | `count`, `truncated` | File count, pattern display |
+| 4 | `grep` | ✅ **DONE** | `matches`, `truncated` | Match count badge |
+| 5 | `webfetch` | ❌ **MISSING** | `url`, `format` | URL display |
+| 6 | `task` | ❌ **MISSING** | `summary`, `sessionId` | **Sub-agent tool list** |
+| 7 | `bash` | ✅ **DONE** | `output`, `exit`, `description` | Live output, exit code |
+| 8 | `edit` | ✅ **DONE** | `diff`, `filediff`, `diagnostics` | **Diff viewer**, LSP errors |
+| 9 | `write` | ⚠️ **PARTIAL** | `filePath`, `content`, (TODO: `diagnostics`) | Code viewer, LSP errors |
+| 10 | `todowrite` | ✅ **DONE** | `todos` | **Interactive checkboxes** |
+| 11 | `question` | ✅ **DONE** | `answers` | **Q&A display** |
+
+### Summary
+- **Total:** 11 OpenCode UI tools
+- **Implemented:** 6/11 (✅)
+- **Partial:** 1/11 (⚠️)
+- **Missing:** 4/11 (❌)
+
+### Missing Tools for 100% Coverage
+1. **`glob`** - File pattern matching (HIGH priority - complements grep)
+2. **`task`** - Sub-agent execution tracking (HIGH priority - delegation)
+3. **`webfetch`** - Web content fetching (LOW priority - external)
+4. **`write` diagnostics** - LSP integration (MEDIUM priority)
+
+### Other OpenCode Tools (Not UI-Rendered)
+These exist in OpenCode but don't have special UI treatment:
+- `plan`, `batch`, `multiedit`, `patch`, `lsp`, `skill`, `codesearch`, `websearch`
+
+See [`OPENCODE_UI_TOOLS_COMPLETE.md`](file:///home/phil65/dev/oss/agentpool/OPENCODE_UI_TOOLS_COMPLETE.md) for detailed metadata specs.
+
+---
+
 ## Tool UI Rendering
 
 The OpenCode TUI has special rendering for certain tool names. Tools must use these exact names
@@ -340,7 +379,7 @@ Some tools also use `props.metadata` for additional UI data:
 | Tool | Metadata Fields | Description |
 |------|-----------------|-------------|
 | `edit` | `filediff`, `diagnostics` | Diff data and LSP diagnostics |
-| `write` | `diagnostics` | LSP diagnostics for the written file |
+| `write` | `filePath`, `content` | File path and content for UI display (diagnostics TODO) |
 | `bash` | `command` | Fallback if `input.command` missing |
 | `task` | `summary`, `sessionId` | Child tool summary and session ID |
 

agentpool_server/opencode_server/OPENCODE_UI_TOOLS_COMPLETE.md

@@ -0,0 +1,202 @@
+# OpenCode Tools with UI Metadata Support - Complete List
+
+## ALL OpenCode Tools That Get Special UI Treatment
+
+These are **all** tools registered in OpenCode's UI (`message-part.tsx`) that use metadata for enhanced rendering:
+
+| # | Tool | AgentPool Status | Metadata Fields | UI Feature |
+|---|------|------------------|-----------------|------------|
+| 1 | `read` | ✅ **DONE** | `preview`, `truncated` | Shows file preview, truncation badge |
+| 2 | `list` | ✅ **DONE** | `count`, `truncated` | File count, directory tree |
+| 3 | `glob` | ❌ **MISSING** | `count`, `truncated` | File count, pattern display |
+| 4 | `grep` | ✅ **DONE** | `matches`, `truncated` | Match count badge |
+| 5 | `webfetch` | ❌ **MISSING** | `url`, `format` | URL display, format indicator |
+| 6 | `task` | ❌ **MISSING** | `summary`, `sessionId` | Sub-agent tool list, navigation |
+| 7 | `bash` | ✅ **DONE** | `output`, `exit`, `description` | Live output, exit code, command |
+| 8 | `edit` | ✅ **DONE** | `diff`, `filediff`, `diagnostics` | **Diff viewer**, LSP errors |
+| 9 | `write` | ⚠️ **PARTIAL** | `diagnostics`, `filepath`, `exists` | Code viewer, LSP errors |
+| 10 | `todowrite` | ✅ **DONE** | `todos` | **Interactive checkbox list** |
+| 11 | `question` | ✅ **DONE** | `answers` | **Q&A display** |
+
+---
+
+## Summary
+
+**Total OpenCode UI Tools:** 11  
+**Implemented:** 6 (✅)  
+**Partial:** 1 (⚠️)  
+**Missing:** 4 (❌)
+
+### ✅ Implemented (6/11)
+- `read`, `list`, `grep`, `bash`, `edit`, `todowrite`, `question`
+
+### ⚠️ Partial (1/11)
+- `write` - exists but missing diagnostics integration
+
+### ❌ Missing (4/11)
+1. **`glob`** - File pattern matching (like grep but for filenames)
+2. **`webfetch`** - Fetch web content
+3. **`task`** - Sub-agent execution with tool summary
+4. **`write` diagnostics** - Need LSP integration
+
+---
+
+## Detailed Metadata Specifications
+
+### 1. read ✅
+```typescript
+metadata: {
+  preview: string      // First 20 lines
+  truncated: boolean   // Was content cut off?
+}
+```
+
+### 2. list ✅
+```typescript
+metadata: {
+  count: number        // Total files/dirs
+  truncated: boolean   // Hit max limit?
+}
+```
+
+### 3. glob ❌ NOT IMPLEMENTED
+```typescript
+metadata: {
+  count: number        // Files matched
+  truncated: boolean   // Results limited?
+}
+```
+
+### 4. grep ✅
+```typescript
+metadata: {
+  matches: number      // Match count
+  truncated: boolean   // Results limited?
+}
+```
+
+### 5. webfetch ❌ NOT IMPLEMENTED
+```typescript
+metadata: {
+  url: string          // Target URL
+  format: string       // "markdown" | "html" | "text"
+  timeout?: number     // Request timeout
+}
+```
+
+### 6. task ❌ NOT IMPLEMENTED
+```typescript
+metadata: {
+  summary: Array<{     // Sub-agent's tool calls
+    id: string
+    tool: string
+    state: {
+      status: string
+      title?: string
+    }
+  }>
+  sessionId: string    // For navigation to sub-agent session
+}
+```
+
+### 7. bash ✅
+```typescript
+metadata: {
+  output: string       // Combined stdout+stderr
+  exit: number | null  // Exit code
+  description: string  // Command description
+}
+```
+
+### 8. edit ✅
+```typescript
+metadata: {
+  diff: string         // Unified diff format
+  filediff: {
+    file: string
+    before: string
+    after: string
+    additions: number
+    deletions: number
+  }
+  diagnostics: Record<string, Diagnostic[]>
+}
+```
+
+### 9. write ⚠️ PARTIAL
+```typescript
+metadata: {
+  diagnostics: Record<string, Diagnostic[]>  // ⚠️ Not implemented
+  filepath: string
+  exists: boolean      // Did file exist before?
+}
+```
+
+### 10. todowrite ✅
+```typescript
+metadata: {
+  todos: Array<{
+    content: string
+    status: "completed" | "pending" | "in_progress"
+  }>
+}
+```
+
+### 11. question ✅
+```typescript
+metadata: {
+  answers: Array<Array<string>>  // One array per question
+}
+```
+
+---
+
+## Implementation Priority
+
+### Must Have (P0) - Core Functionality
+- ✅ All filesystem tools: read, list, grep
+- ✅ Basic execution: bash
+- ✅ File editing: edit
+- ✅ Planning: todowrite
+- ✅ Interaction: question
+
+### Should Have (P1) - Enhanced Features
+- ❌ **`glob`** - File pattern search (HIGH - complements grep)
+- ❌ **`task`** - Sub-agent tracking (HIGH - important for delegation)
+- ⚠️ **`write` diagnostics** - LSP integration (MEDIUM)
+
+### Nice to Have (P2) - Optional
+- ❌ **`webfetch`** - Web content (LOW - external dependency)
+
+---
+
+## What's Missing vs OpenCode
+
+OpenCode has these additional tools that we don't implement:
+
+| OpenCode Tool | Purpose | Why Not in AgentPool? |
+|---------------|---------|----------------------|
+| `plan` | Plan management | We use `get_plan`/`set_plan` instead |
+| `todoread` | Read todos | Handled by `get_plan` |
+| `batch` | Parallel tool execution | Generic utility, not core |
+| `multiedit` | Multi-file edits | Advanced feature |
+| `patch` | Apply git patches | Git-specific |
+| `lsp` | LSP queries | We have LSP but not as a tool |
+| `skill` | Execute skills | OpenCode-specific |
+| `codesearch` | Semantic search | Advanced feature |
+| `websearch` | Web search | External service |
+
+**Note:** These are all valid tools but not part of the core UI metadata rendering system.
+
+---
+
+## Next Steps
+
+To achieve 100% OpenCode UI compatibility:
+
+1. **Implement `glob` tool** - File pattern matching with metadata
+2. **Implement `task` tool** - Sub-agent execution tracking
+3. **Add diagnostics to `write`** - LSP integration
+4. **Implement `webfetch`** - Web content fetching (optional)
+
+After these 4 implementations, we'll have **complete** OpenCode UI metadata support!

agentpool_server/opencode_server/__init__.py

@@ -17,11 +17,3 @@ Or programmatically:
     app = create_app(working_dir="/path/to/project")
     # Use with uvicorn or other ASGI server
 """
-
-from agentpool_server.opencode_server.server import (
-    OpenCodeServer,
-    create_app,
-    run_server,
-)
-
-__all__ = ["OpenCodeServer", "create_app", "run_server"]