flowent 0.1.1 → 0.1.3

package/backend/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flowent"
-version = "0.1.1"
+version = "0.1.3"
 description = "A workflow orchestration platform for multi-agent collaboration."
 readme = "README.md"
 authors = [

package/backend/src/flowent/agent.py

@@ -23,7 +23,7 @@ from flowent.tools import (
     ToolResult,
     new_tool_item,
     parse_tool_arguments,
-    run_tool,
+    run_tool_async,
     tool_specs,
 )
 
@@ -39,6 +39,7 @@ Use tools deliberately:
 - Search files when you need to find definitions, references, or related behavior.
 - Apply structured patches for file edits.
 - Run shell commands for diagnostics, builds, tests, and operations that require the local environment.
+- When a shell command needs to write outside the current workspace, declare each needed writable directory with sandbox_permissions set to with_additional_permissions and additional_permissions.file_system.write.
 - Search the web only when current external information is needed.
 - Update the plan when a task has multiple meaningful steps.
 
@@ -109,6 +110,8 @@ async def run_agent_stream(
     | None = None,
     extra_tool_specs: Sequence[Mapping[str, object]] | None = None,
     extra_tool_title: Callable[[str], str | None] | None = None,
+    tool_runner: Callable[[str, dict[str, object], ToolContext], Awaitable[ToolResult]]
+    | None = None,
     web_searcher: Callable[[str], Sequence[dict[str, str]]] | None = None,
 ) -> AsyncIterator[AgentStreamEvent]:
     conversation: list[Mapping[str, object]] = [
@@ -244,15 +247,22 @@ async def run_agent_stream(
                     if extra_tool_runner is not None
                     else None
                 )
-                result = (
-                    extra_result
-                    if isinstance(extra_result, ToolResult)
-                    else run_tool(
-                        tool_call.name,
-                        arguments,
-                        ToolContext(cwd=cwd, web_searcher=web_searcher),
+                result = extra_result if isinstance(extra_result, ToolResult) else None
+                if result is None:
+                    context = ToolContext(cwd=cwd, web_searcher=web_searcher)
+                    result = await (
+                        tool_runner(
+                            tool_call.name,
+                            arguments,
+                            context,
+                        )
+                        if tool_runner is not None
+                        else run_tool_async(
+                            tool_call.name,
+                            arguments,
+                            context,
+                        )
                     )
-                )
                 result_content = result.content
                 logger.debug(
                     "Tool call finished name=%s id=%s ok=%s",

package/backend/src/flowent/main.py

@@ -1,13 +1,15 @@
+import asyncio
 import json
 import logging
 import os
 from collections.abc import AsyncIterator
 from contextlib import asynccontextmanager
+from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Literal
 from uuid import uuid4
 
-from fastapi import FastAPI, HTTPException
+from fastapi import FastAPI, HTTPException, Query
 from fastapi.responses import FileResponse, StreamingResponse
 from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel, ConfigDict
@@ -27,6 +29,7 @@ from flowent.llm import (
 from flowent.logging import TRACE_LEVEL, ensure_logging_configured
 from flowent.mcp import McpManager, McpTransport
 from flowent.mcp_import import McpImportDiscovery, discover_imported_mcp_servers
+from flowent.permissions import WritablePathDecision, run_tool_with_path_permissions
 from flowent.sandbox import ensure_sandbox_available
 from flowent.skills import (
     discover_skills,
@@ -44,7 +47,9 @@ from flowent.storage import (
     StoredTelegramBot,
     StoredTelegramSession,
     StoredToolItem,
+    StoredWritablePath,
 )
+from flowent.tools import ToolContext
 
 logger = logging.getLogger("flowent.main")
 
@@ -78,6 +83,12 @@ class WorkspaceRespondRequest(BaseModel):
     content: str
 
 
+class WorkspaceRunResponse(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    run_id: str
+
+
 class WorkspaceCompactResponse(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
@@ -115,10 +126,61 @@ class McpImportPreviewRequest(BaseModel):
     source: Literal["claude_code", "codex"]
 
 
+class WritablePathRequest(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    path: str
+
+
+class WritablePathListResponse(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    writable_paths: list[StoredWritablePath]
+
+
+class WorkspacePermissionDecisionRequest(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    decision: Literal["allow_once", "always_allow", "deny"]
+    id: str
+
+
+@dataclass
+class PendingWorkspacePermission:
+    future: asyncio.Future[WritablePathDecision]
+    path: Path
+
+
+@dataclass
+class WorkspaceRun:
+    condition: asyncio.Condition
+    discard_on_cancel: bool = False
+    events: list[tuple[int, str, dict[str, object]]] = field(default_factory=list)
+    id: str = field(default_factory=lambda: str(uuid4()))
+    is_done: bool = False
+    pending_permissions: dict[str, PendingWorkspacePermission] = field(
+        default_factory=dict
+    )
+    task: asyncio.Task[None] | None = None
+
+    @property
+    def latest_event_index(self) -> int:
+        return self.events[-1][0] if self.events else 0
+
+
 def stream_event(event: str, data: dict[str, object]) -> str:
     return f"event: {event}\ndata: {json.dumps(data)}\n\n"
 
 
+def append_or_replace_message(
+    messages: list[StoredMessage], message: StoredMessage
+) -> list[StoredMessage]:
+    return [
+        *(current for current in messages if current.id != message.id),
+        message,
+    ]
+
+
 def frontend_static_directory() -> Path:
     configured_directory = os.environ.get("FLOWENT_STATIC_DIR")
     if configured_directory:
@@ -200,6 +262,13 @@ def workspace_chat_messages(
     return chat_messages
 
 
+def normalized_request_path(path: str, cwd: Path) -> Path:
+    raw_path = Path(path).expanduser()
+    if not raw_path.is_absolute():
+        raw_path = cwd / raw_path
+    return raw_path.resolve(strict=False)
+
+
 def compact_prompt_messages(
     messages: list[StoredMessage],
     compacted_context: str,
@@ -239,6 +308,8 @@ def create_app(
     store = StateStore()
     mcp_manager = McpManager(store=store, transport=mcp_transport)
     telegram_bot_manager: TelegramBotManager | None = None
+    workspace_runs: dict[str, WorkspaceRun] = {}
+    active_workspace_run_id: str | None = None
 
     static_dir = frontend_static_directory().resolve(strict=False)
     logger.debug("Flowent app created serve_frontend=%s", serve_frontend)
@@ -312,6 +383,7 @@ def create_app(
             author="assistant",
             content=assistant_content,
             id=assistant_id,
+            status="completed",
             thinking=assistant_thinking,
             tools=list(assistant_tools.values()),
         )
@@ -352,7 +424,18 @@ def create_app(
     @app.get("/api/state")
     async def app_state() -> StoredState:
         state = store.read_state()
+        active_run = (
+            workspace_runs.get(active_workspace_run_id)
+            if active_workspace_run_id
+            else None
+        )
         update: dict[str, object] = {
+            "active_run_event_index": active_run.latest_event_index
+            if active_run
+            else 0,
+            "active_run_id": active_run.id
+            if active_run and not active_run.is_done
+            else None,
             "mcp_servers": mcp_manager.servers_with_status(state.mcp_servers),
             "skills": discover_skills(Path.cwd(), store),
         }
@@ -461,67 +544,77 @@ def create_app(
     async def save_settings(settings: StoredSettings) -> StoredSettings:
         return store.save_settings(settings)
 
+    @app.post("/api/permissions/writable-paths")
+    async def save_writable_path(
+        request: WritablePathRequest,
+    ) -> StoredWritablePath:
+        return store.save_writable_path(
+            normalized_request_path(request.path, Path.cwd())
+        )
+
+    @app.delete("/api/permissions/writable-paths")
+    async def delete_writable_path(
+        request: WritablePathRequest,
+    ) -> WritablePathListResponse:
+        return WritablePathListResponse(
+            writable_paths=store.delete_writable_path(
+                normalized_request_path(request.path, Path.cwd())
+            )
+        )
+
+    @app.post("/api/workspace/permissions/approve")
+    async def approve_workspace_permission(
+        request: WorkspacePermissionDecisionRequest,
+    ) -> dict[str, bool]:
+        run = active_workspace_run()
+        if run is None:
+            raise HTTPException(status_code=404, detail="Request not found.")
+        pending = run.pending_permissions.pop(request.id, None)
+        if pending is None:
+            raise HTTPException(status_code=404, detail="Request not found.")
+        path = pending.path
+        if request.decision == "always_allow":
+            saved_path = store.save_writable_path(path)
+            path = Path(saved_path.path)
+        pending.future.set_result(
+            WritablePathDecision(decision=request.decision, path=path)
+        )
+        return {"ok": True}
+
     @app.put("/api/workspace/messages")
     async def save_workspace_messages(
         request: WorkspaceMessagesRequest,
     ) -> WorkspaceMessagesRequest:
+        nonlocal active_workspace_run_id
+        if not request.messages:
+            run = active_workspace_run()
+            if run is not None and run.task is not None and not run.task.done():
+                run.discard_on_cancel = True
+                run.task.cancel()
+                active_workspace_run_id = None
         return WorkspaceMessagesRequest(messages=store.save_messages(request.messages))
 
-    @app.post("/api/workspace/compact")
-    async def compact_workspace() -> WorkspaceCompactResponse:
-        logger.info("Workspace compact requested")
-        state = store.read_state()
-        connection = selected_connection(state)
-        compacted_context = store.read_compacted_context()
-        cwd = Path.cwd()
-
-        try:
-            summary = await complete_chat(
-                connection,
-                compact_prompt_messages(
-                    state.messages,
-                    compacted_context,
-                    runtime_context_messages(cwd),
-                ),
-                completion=chat_completion,
-            )
-        except HTTPException:
-            raise
-        except Exception as error:
-            logger.exception("Workspace compact failed")
-            raise HTTPException(
-                status_code=500,
-                detail="Context could not be compacted.",
-            ) from error
+    async def append_run_event(
+        run: WorkspaceRun, event: str, data: dict[str, object]
+    ) -> None:
+        async with run.condition:
+            run.events.append((run.latest_event_index + 1, event, data))
+            run.condition.notify_all()
 
-        marker = StoredMessage(
-            author="system",
-            content=COMPACTED_CONTEXT_MARKER,
-            id=str(uuid4()),
-        )
-        store.save_compacted_context(summary.content)
-        store.save_messages([*state.messages, marker])
-        logger.info(
-            "Workspace compact completed summary_length=%s", len(summary.content)
-        )
-        logger.log(TRACE_LEVEL, "Workspace compact summary=%r", summary.content)
-        return WorkspaceCompactResponse(message=marker)
+    def active_workspace_run() -> WorkspaceRun | None:
+        if active_workspace_run_id is None:
+            return None
+        return workspace_runs.get(active_workspace_run_id)
 
-    @app.post("/api/workspace/respond")
-    async def respond_to_workspace(
-        request: WorkspaceRespondRequest,
-    ) -> StreamingResponse:
-        logger.info(
-            "Workspace response requested content_length=%s", len(request.content)
-        )
-        logger.log(TRACE_LEVEL, "Workspace user content=%r", request.content)
+    def create_workspace_run(content: str) -> WorkspaceRun:
+        nonlocal active_workspace_run_id
         state = store.read_state()
         connection = selected_connection(state)
         cwd = Path.cwd()
 
         user_message = StoredMessage(
             author="user",
-            content=request.content,
+            content=content,
             id=str(uuid4()),
         )
         next_messages = [*state.messages, user_message]
@@ -534,14 +627,78 @@ def create_app(
             message.model_dump()
             for message in [
                 *runtime_context_messages(cwd),
-                *explicit_skill_messages(cwd, store, request.content),
+                *explicit_skill_messages(cwd, store, content),
                 *chat_messages,
             ]
         ]
+        run = WorkspaceRun(condition=asyncio.Condition())
+        workspace_runs[run.id] = run
+        active_workspace_run_id = run.id
 
-        async def response_stream() -> AsyncIterator[str]:
+        async def run_task() -> None:
+            nonlocal active_workspace_run_id
             assistant_tools: dict[str, StoredToolItem] = {}
+            assistant_message = StoredMessage(
+                author="assistant",
+                content="",
+                id=str(uuid4()),
+                status="running",
+            )
+            assistant_content = ""
+            assistant_thinking = ""
+
+            def persist_assistant(status: str = "running") -> None:
+                nonlocal next_messages, assistant_message
+                assistant_message = StoredMessage(
+                    author="assistant",
+                    content=assistant_content,
+                    id=assistant_message.id,
+                    status=status,
+                    thinking=assistant_thinking,
+                    tools=list(assistant_tools.values()),
+                )
+                next_messages = append_or_replace_message(
+                    next_messages, assistant_message
+                )
+                store.upsert_message(assistant_message)
+
             try:
+
+                async def request_writable_path(
+                    path: Path, reason: str
+                ) -> WritablePathDecision:
+                    permission_id = str(uuid4())
+                    future = asyncio.get_running_loop().create_future()
+                    run.pending_permissions[permission_id] = PendingWorkspacePermission(
+                        future=future,
+                        path=path,
+                    )
+                    await append_run_event(
+                        run,
+                        "permission_request",
+                        {
+                            "id": permission_id,
+                            "path": str(path),
+                            "reason": reason,
+                        },
+                    )
+                    return await future
+
+                async def tool_runner(
+                    name: str,
+                    arguments: dict[str, object],
+                    context: ToolContext,
+                ):
+                    return await run_tool_with_path_permissions(
+                        name,
+                        arguments,
+                        context,
+                        request_writable_path=request_writable_path,
+                        writable_paths=[
+                            Path(path.path) for path in store.read_writable_paths()
+                        ],
+                    )
+
                 async for event in run_agent_stream(
                     completion=chat_completion,
                     connection=connection,
@@ -550,13 +707,22 @@ def create_app(
                     extra_tool_specs=mcp_manager.tool_specs(),
                     extra_tool_title=mcp_manager.tool_title,
                     messages=request_messages,
+                    tool_runner=tool_runner,
                 ):
+                    if event.event == "start":
+                        event_id = event.data.get("id")
+                        if isinstance(event_id, str):
+                            assistant_message = assistant_message.model_copy(
+                                update={"id": event_id}
+                            )
+                            persist_assistant()
                     if event.event == "tool_start":
                         tool = event.data.get("tool")
                         if isinstance(tool, dict) and isinstance(tool.get("id"), str):
                             assistant_tools[tool["id"]] = StoredToolItem.model_validate(
                                 tool
                             )
+                            persist_assistant()
                     if event.event in {"tool_done", "tool_error"}:
                         tool_id = event.data.get("id")
                         if isinstance(tool_id, str) and tool_id in assistant_tools:
@@ -568,6 +734,13 @@ def create_app(
                                     **event.data,
                                 }
                             )
+                            persist_assistant()
+                    if event.event == "delta":
+                        assistant_content += str(event.data.get("content") or "")
+                        persist_assistant()
+                    if event.event == "thinking_delta":
+                        assistant_thinking += str(event.data.get("content") or "")
+                        persist_assistant()
                     logger.log(
                         TRACE_LEVEL,
                         "Workspace stream event=%s data=%r",
@@ -577,27 +750,148 @@ def create_app(
                     if event.event == "done":
                         message = event.data.get("message")
                         if isinstance(message, dict):
-                            next_messages.append(
-                                StoredMessage(
-                                    author="assistant",
-                                    content=str(message.get("content") or ""),
-                                    id=str(message.get("id") or uuid4()),
-                                    thinking=str(message.get("thinking") or ""),
-                                    tools=list(assistant_tools.values()),
-                                )
+                            assistant_content = str(
+                                message.get("content") or assistant_content
+                            )
+                            assistant_thinking = str(
+                                message.get("thinking") or assistant_thinking
                             )
-                            store.save_messages(next_messages)
-                    yield stream_event(event.event, event.data)
+                            persist_assistant("completed")
+                    await append_run_event(run, event.event, event.data)
+            except asyncio.CancelledError:
+                logger.info("Workspace run stopped")
+                if not run.discard_on_cancel:
+                    persist_assistant("interrupted")
+                    await append_run_event(
+                        run,
+                        "error",
+                        {"message": "Response stopped."},
+                    )
+                raise
             except Exception as error:
                 logger.exception("Workspace response failed")
-                yield stream_event(
+                persist_assistant("failed")
+                await append_run_event(
+                    run,
                     "error",
                     {"message": str(error) or "Message could not be sent."},
                 )
+            finally:
+                run.is_done = True
+                async with run.condition:
+                    run.condition.notify_all()
+                if active_workspace_run_id == run.id:
+                    active_workspace_run_id = None
+
+        run.task = asyncio.create_task(run_task())
+        return run
+
+    async def workspace_run_stream(
+        run: WorkspaceRun, after: int = 0
+    ) -> AsyncIterator[str]:
+        next_event_index = after + 1
+        while True:
+            async with run.condition:
+
+                def has_next_event(index: int = next_event_index) -> bool:
+                    return run.is_done or any(
+                        event_index >= index for event_index, _, _ in run.events
+                    )
+
+                await run.condition.wait_for(has_next_event)
+                events = [event for event in run.events if event[0] >= next_event_index]
+
+            for index, event, data in events:
+                next_event_index = index + 1
+                yield stream_event(event, data)
+                if event in {"done", "error"}:
+                    return
+
+            if run.is_done and not events:
                 return
 
+    @app.post("/api/workspace/runs")
+    async def start_workspace_run(
+        request: WorkspaceRespondRequest,
+    ) -> WorkspaceRunResponse:
+        logger.info("Workspace run requested content_length=%s", len(request.content))
+        logger.log(TRACE_LEVEL, "Workspace user content=%r", request.content)
+        run = create_workspace_run(request.content)
+        return WorkspaceRunResponse(run_id=run.id)
+
+    @app.get("/api/workspace/runs/{run_id}/stream")
+    async def stream_workspace_run(
+        run_id: str,
+        after: int = Query(default=0, ge=0),
+    ) -> StreamingResponse:
+        run = workspace_runs.get(run_id)
+        if run is None:
+            raise HTTPException(status_code=404, detail="Run not found.")
+        return StreamingResponse(
+            workspace_run_stream(run, after),
+            media_type="text/event-stream",
+        )
+
+    @app.post("/api/workspace/runs/{run_id}/stop")
+    async def stop_workspace_run(run_id: str) -> dict[str, bool]:
+        run = workspace_runs.get(run_id)
+        if run is None:
+            raise HTTPException(status_code=404, detail="Run not found.")
+        if run.task is not None and not run.task.done():
+            run.task.cancel()
+        return {"ok": True}
+
+    @app.post("/api/workspace/compact")
+    async def compact_workspace() -> WorkspaceCompactResponse:
+        logger.info("Workspace compact requested")
+        state = store.read_state()
+        connection = selected_connection(state)
+        compacted_context = store.read_compacted_context()
+        cwd = Path.cwd()
+
+        try:
+            summary = await complete_chat(
+                connection,
+                compact_prompt_messages(
+                    state.messages,
+                    compacted_context,
+                    runtime_context_messages(cwd),
+                ),
+                completion=chat_completion,
+            )
+        except HTTPException:
+            raise
+        except Exception as error:
+            logger.exception("Workspace compact failed")
+            raise HTTPException(
+                status_code=500,
+                detail="Context could not be compacted.",
+            ) from error
+
+        marker = StoredMessage(
+            author="system",
+            content=COMPACTED_CONTEXT_MARKER,
+            id=str(uuid4()),
+        )
+        store.save_compacted_context(summary.content)
+        store.save_messages([*state.messages, marker])
+        logger.info(
+            "Workspace compact completed summary_length=%s", len(summary.content)
+        )
+        logger.log(TRACE_LEVEL, "Workspace compact summary=%r", summary.content)
+        return WorkspaceCompactResponse(message=marker)
+
+    @app.post("/api/workspace/respond")
+    async def respond_to_workspace(
+        request: WorkspaceRespondRequest,
+    ) -> StreamingResponse:
+        logger.info(
+            "Workspace response requested content_length=%s", len(request.content)
+        )
+        logger.log(TRACE_LEVEL, "Workspace user content=%r", request.content)
+        run = create_workspace_run(request.content)
         return StreamingResponse(
-            response_stream(),
+            workspace_run_stream(run),
             media_type="text/event-stream",
         )