flowent 0.3.1 → 0.3.2

package/backend/pyproject.toml

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

package/backend/src/flowent/agent.py

@@ -25,6 +25,8 @@ from flowent.tools import (
     new_tool_item,
     parse_tool_arguments,
     run_tool_async,
+    text_tool_result,
+    tool_result_model_content,
     tool_specs,
 )
 
@@ -277,7 +279,12 @@ async def run_agent_stream(
                 arguments = parse_tool_arguments(tool_call.arguments)
             except Exception as error:
                 arguments = {}
-                result_content = str(error)
+                result = ToolResult(
+                    result=text_tool_result(str(error)),
+                    ok=False,
+                    title=tool_call.name or "Tool failed",
+                )
+                result_content = tool_result_model_content(result)
                 tool_item = new_tool_item(tool_call.name, arguments)
                 logger.debug("Tool call argument parse failed name=%s", tool_call.name)
                 logger.log(TRACE_LEVEL, "Tool start item=%r", tool_item)
@@ -292,10 +299,9 @@ async def run_agent_stream(
                     event="tool_error",
                     data={
                         "id": tool_item["id"],
-                        "content": result_content,
-                        "data": {},
+                        "result": result.result,
                         "status": "failed",
-                        "title": tool_call.name or "Tool failed",
+                        "title": result.title,
                     },
                 )
             else:
@@ -314,10 +320,12 @@ async def run_agent_stream(
                     if extra_tool_runner is not None
                     else None
                 )
-                result = extra_result if isinstance(extra_result, ToolResult) else None
-                if result is None:
+                tool_result: ToolResult | None = (
+                    extra_result if isinstance(extra_result, ToolResult) else None
+                )
+                if tool_result is None:
                     context = ToolContext(cwd=cwd, web_searcher=web_searcher)
-                    result = await (
+                    tool_result = await (
                         tool_runner(
                             tool_call.name,
                             arguments,
@@ -330,27 +338,26 @@ async def run_agent_stream(
                             context,
                         )
                     )
-                result_content = result.content
+                result_content = tool_result_model_content(tool_result)
                 logger.debug(
                     "Tool call finished name=%s id=%s ok=%s",
                     tool_call.name,
                     tool_item["id"],
-                    result.ok,
+                    tool_result.ok,
                 )
                 logger.log(
                     TRACE_LEVEL,
                     "Tool result id=%s result=%r",
                     tool_item["id"],
-                    result.model_dump(),
+                    tool_result.model_dump(),
                 )
                 yield AgentStreamEvent(
-                    event="tool_done" if result.ok else "tool_error",
+                    event="tool_done" if tool_result.ok else "tool_error",
                     data={
                         "id": tool_item["id"],
-                        "content": result.content,
-                        "data": result.data,
-                        "status": "success" if result.ok else "failed",
-                        "title": result.title,
+                        "result": tool_result.result,
+                        "status": "success" if tool_result.ok else "failed",
+                        "title": tool_result.title,
                     },
                 )
             conversation.append(tool_result_message(tool_call_id, result_content))

package/backend/src/flowent/mcp.py

@@ -662,11 +662,12 @@ class McpManager:
         content = mcp_result_content(result)
         server_name = self._server_names.get(server_id, server_id)
         return ToolResult(
-            content=content,
-            data={
+            result={
+                "type": "mcp",
+                "output": content,
                 "server": server_name,
                 "tool": tool_name,
-                "result": result,
+                "raw_result": result,
             },
             ok=not mcp_result_is_error(result),
             title=f"Calling {server_name}.{tool_name}",

package/backend/src/flowent/permissions.py

@@ -16,10 +16,13 @@ from flowent.shell import shell_invocation
 from flowent.tools import (
     ToolContext,
     ToolResult,
+    command_tool_result,
     number_argument,
     patch_title_from_result,
     run_tool_async,
+    text_tool_result,
     tool_failure_content,
+    tool_result_model_content,
 )
 
 SANDBOX_WITH_ADDITIONAL_PERMISSIONS = "with_additional_permissions"
@@ -66,7 +69,7 @@ def validate_additional_permissions(arguments: dict[str, object]) -> ToolResult
         return None
     if sandbox_permissions != SANDBOX_WITH_ADDITIONAL_PERMISSIONS:
         return ToolResult(
-            content=(
+            result=text_tool_result(
                 "additional_permissions requires sandbox_permissions to be "
                 "with_additional_permissions."
             ),
@@ -130,8 +133,10 @@ async def review_missing_write_paths(
         return (
             effective_paths,
             ToolResult(
-                content=approval_denial_content(decision),
-                data=review_data,
+                result=text_tool_result(
+                    approval_denial_content(decision),
+                    **review_data,
+                ),
                 ok=False,
                 title="Denied by reviewer",
             ),
@@ -196,7 +201,7 @@ async def run_shell_command_with_permissions(
         arguments, context, effective_paths
     )
     if approval_data is not None:
-        result = tool_result_with_data(result, approval_data)
+        result = tool_result_with_fields(result, approval_data)
     if result.ok or not is_likely_sandbox_denied_result(result):
         return result
     review_request = ApprovalReviewRequest(
@@ -210,13 +215,16 @@ async def run_shell_command_with_permissions(
     review_data = approval_result_data(review_request, decision)
     if decision.decision == "denied":
         return ToolResult(
-            content=approval_denial_content(decision),
-            data={**result.data, **review_data},
+            result=text_tool_result(
+                approval_denial_content(decision),
+                previous_result=result.result,
+                **review_data,
+            ),
             ok=False,
             title="Denied by reviewer",
         )
     retry_result = await shell_command_without_sandbox(arguments, context)
-    return tool_result_with_data(retry_result, review_data)
+    return tool_result_with_fields(retry_result, review_data)
 
 
 async def run_apply_patch_with_permissions(
@@ -244,7 +252,7 @@ async def run_apply_patch_with_permissions(
 
     result = await apply_patch_with_writable_paths(arguments, context, effective_paths)
     if approval_data is not None:
-        result = tool_result_with_data(result, approval_data)
+        result = tool_result_with_fields(result, approval_data)
     return result
 
 
@@ -268,18 +276,23 @@ async def apply_patch_with_writable_paths(
             input_text=patch,
         )
     except SandboxError as error:
-        return ToolResult(content=str(error), ok=False, title="Edit failed")
+        return ToolResult(
+            result=text_tool_result(str(error)), ok=False, title="Edit failed"
+        )
 
     if result.exit_code != 0:
         return ToolResult(
-            content=tool_failure_content(result),
+            result=text_tool_result(tool_failure_content(result)),
             ok=False,
             title="Edit failed",
         )
     data = json.loads(result.stdout or "{}")
     return ToolResult(
-        content=result.stdout,
-        data=data if isinstance(data, dict) else {},
+        result={
+            "type": "patch",
+            "output": result.stdout,
+            **(data if isinstance(data, dict) else {}),
+        },
         title=patch_title_from_result(data),
     )
 
@@ -297,27 +310,25 @@ async def shell_command_with_writable_paths(
         writable_roots=writable_paths,
     ).run_async(invocation.args, env=invocation.env, timeout_seconds=timeout_seconds)
     ok = result.exit_code == 0
-    content = result.stdout or result.stderr
     return ToolResult(
-        content=content,
-        data={
-            "command": command,
-            "exit_code": result.exit_code,
-            "stderr": result.stderr,
-            "stdout": result.stdout,
-        },
+        result=command_tool_result(
+            command=command,
+            exit_code=result.exit_code,
+            stderr=result.stderr,
+            stdout=result.stdout,
+        ),
         ok=ok,
         title=f"Ran {command}",
     )
 
 
 def is_likely_sandbox_denied_result(result: ToolResult) -> bool:
-    data = result.data
-    exit_code = int_result_field(data.get("exit_code"))
+    payload = result.result
+    exit_code = int_result_field(payload.get("exit_code"))
     if exit_code == 0:
         return False
     output = "\n".join(
-        str(data.get(name, "") or "") for name in ["stderr", "stdout"]
+        str(payload.get(name, "") or "") for name in ["stderr", "stdout", "output"]
     ).lower()
     return any(
         keyword in output
@@ -345,13 +356,17 @@ def int_result_field(value: object) -> int:
 
 
 def tool_failure_text(result: ToolResult) -> str:
-    stderr = str(result.data.get("stderr", "") or "").strip()
-    stdout = str(result.data.get("stdout", "") or "").strip()
-    content = result.content.strip()
+    payload = result.result
+    stderr = str(payload.get("stderr", "") or "").strip()
+    stdout = str(payload.get("stdout", "") or "").strip()
     parts: list[str] = []
-    for part in [stderr, stdout, content]:
+    for part in [stderr, stdout]:
         if part and part not in parts:
             parts.append(part)
+    if not parts:
+        content = tool_result_model_content(result).strip()
+        if content:
+            parts.append(content)
     return "\n".join(parts)
 
 
@@ -366,15 +381,13 @@ async def shell_command_without_sandbox(
         invocation.args, env=invocation.env, timeout_seconds=timeout_seconds
     )
     ok = result.exit_code == 0
-    content = result.stdout or result.stderr
     return ToolResult(
-        content=content,
-        data={
-            "command": command,
-            "exit_code": result.exit_code,
-            "stderr": result.stderr,
-            "stdout": result.stdout,
-        },
+        result=command_tool_result(
+            command=command,
+            exit_code=result.exit_code,
+            stderr=result.stderr,
+            stdout=result.stdout,
+        ),
         ok=ok,
         title=f"Ran {command}",
     )
@@ -403,7 +416,7 @@ def approval_result_data(
     }
 
 
-def tool_result_with_data(
-    result: ToolResult, extra_data: dict[str, object]
+def tool_result_with_fields(
+    result: ToolResult, extra_fields: dict[str, object]
 ) -> ToolResult:
-    return result.model_copy(update={"data": {**result.data, **extra_data}})
+    return result.model_copy(update={"result": {**result.result, **extra_fields}})

package/backend/src/flowent/state/models.py

@@ -151,8 +151,7 @@ class StoredToolItem(BaseModel):
     status: str
     title: str
     arguments: dict[str, object] | None = None
-    content: str | None = None
-    data: dict[str, object] | None = None
+    result: dict[str, object] | None = None
 
 
 class StoredThinkingOutputItem(BaseModel):

package/backend/src/flowent/state/schema.py

@@ -1,3 +1,4 @@
+import json
 import sqlite3
 
 
@@ -185,7 +186,122 @@ def migrate(connection: sqlite3.Connection) -> None:
             "ALTER TABLE workspace_context "
             "ADD COLUMN is_compacting INTEGER NOT NULL DEFAULT 0"
         )
+    if not migration_version_exists(connection, 2):
+        migrate_tool_result_items(connection)
+        connection.execute("INSERT INTO schema_migrations (version) VALUES (2)")
 
 
 def table_columns(connection: sqlite3.Connection, table: str) -> set[str]:
     return {row["name"] for row in connection.execute(f"PRAGMA table_info({table})")}
+
+
+def migration_version_exists(connection: sqlite3.Connection, version: int) -> bool:
+    return (
+        connection.execute(
+            "SELECT 1 FROM schema_migrations WHERE version = ?",
+            (version,),
+        ).fetchone()
+        is not None
+    )
+
+
+def migrate_tool_result_items(connection: sqlite3.Connection) -> None:
+    for row in connection.execute("SELECT id, tools, groups FROM messages"):
+        tools, tools_changed = migrate_tool_list(json.loads(row["tools"] or "[]"))
+        groups, groups_changed = migrate_tool_groups(json.loads(row["groups"] or "[]"))
+        if not tools_changed and not groups_changed:
+            continue
+        connection.execute(
+            "UPDATE messages SET tools = ?, groups = ? WHERE id = ?",
+            (
+                json.dumps(tools, ensure_ascii=False),
+                json.dumps(groups, ensure_ascii=False),
+                row["id"],
+            ),
+        )
+
+
+def migrate_tool_groups(groups: object) -> tuple[object, bool]:
+    if not isinstance(groups, list):
+        return groups, False
+    changed = False
+    next_groups: list[object] = []
+    for group in groups:
+        if not isinstance(group, dict):
+            next_groups.append(group)
+            continue
+        items = group.get("items")
+        if not isinstance(items, list):
+            next_groups.append(group)
+            continue
+        next_items: list[object] = []
+        for item in items:
+            if not isinstance(item, dict) or item.get("type") != "tool":
+                next_items.append(item)
+                continue
+            tool, tool_changed = migrate_tool_item(item.get("tool"))
+            changed = changed or tool_changed
+            next_items.append({**item, "tool": tool})
+        next_groups.append({**group, "items": next_items})
+    return next_groups, changed
+
+
+def migrate_tool_list(tools: object) -> tuple[object, bool]:
+    if not isinstance(tools, list):
+        return tools, False
+    changed = False
+    next_tools: list[object] = []
+    for tool in tools:
+        next_tool, tool_changed = migrate_tool_item(tool)
+        changed = changed or tool_changed
+        next_tools.append(next_tool)
+    return next_tools, changed
+
+
+def migrate_tool_item(tool: object) -> tuple[object, bool]:
+    if not isinstance(tool, dict):
+        return tool, False
+    if "content" not in tool and "data" not in tool:
+        return tool, False
+    legacy_content = tool.get("content")
+    legacy_data = tool.get("data")
+    result = tool.get("result")
+    if not isinstance(result, dict):
+        result = legacy_tool_result(legacy_content, legacy_data)
+    return (
+        {
+            key: value
+            for key, value in {**tool, "result": result}.items()
+            if key not in {"content", "data"}
+        },
+        True,
+    )
+
+
+def legacy_tool_result(content: object, data: object) -> dict[str, object]:
+    text = content if isinstance(content, str) else ""
+    payload = data if isinstance(data, dict) else {}
+    if {"command", "exit_code", "stderr", "stdout"}.issubset(payload):
+        return {
+            "type": "command",
+            "command": str(payload.get("command") or ""),
+            "exit_code": payload.get("exit_code"),
+            "stderr": str(payload.get("stderr") or ""),
+            "stdout": str(payload.get("stdout") or ""),
+            "output": text or str(payload.get("stdout") or payload.get("stderr") or ""),
+        }
+    if "server" in payload and "tool" in payload and "result" in payload:
+        return {
+            "type": "mcp",
+            "output": text,
+            "server": payload.get("server"),
+            "tool": payload.get("tool"),
+            "raw_result": payload.get("result"),
+        }
+    if "items" in payload:
+        return {"type": "plan", "output": text, **payload}
+    if "results" in payload and "query" in payload:
+        return {"type": "web_search", "output": text, **payload}
+    if "files" in payload:
+        return {"type": "patch", "output": text, **payload}
+    return {"type": "text", "text": text, **payload}