npm - flowent - Versions diffs - 0.1.4 → 0.1.5 - Mend

flowent 0.1.4 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (67) hide show

package/backend/src/flowent/static/index.html CHANGED Viewed

@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Flowent</title>
     <meta name="description" content="Flowent application" />
-    <script type="module" crossorigin src="/assets/index-DSniOrhL.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-BREidonU.css">
+    <script type="module" crossorigin src="/assets/index-dsDDsEym.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-Cl20cARb.css">
   </head>
   <body>
     <div id="root"></div>

package/backend/src/flowent/storage.py CHANGED Viewed

@@ -1,6 +1,7 @@
 import json
 import sqlite3
 from pathlib import Path
+from typing import Annotated, Literal
 from pydantic import BaseModel, ConfigDict, Field
@@ -75,15 +76,6 @@ class StoredWritablePath(BaseModel):
     path: str
-class StoredPermissionRequest(BaseModel):
-    model_config = ConfigDict(extra="forbid")
-    id: str
-    path: str
-    reason: str
-    tool_call_id: str | None = None
 class StoredProvider(BaseModel):
     model_config = ConfigDict(extra="forbid")
@@ -98,6 +90,7 @@ class StoredProvider(BaseModel):
 class StoredSettings(BaseModel):
     model_config = ConfigDict(extra="forbid")
+    agent_prompt: str = Field(default="", exclude_if=lambda value: value == "")
     reasoning_effort: ReasoningEffort = ReasoningEffort.DEFAULT
     selected_model: str
     selected_provider_id: str
@@ -115,11 +108,64 @@ class StoredToolItem(BaseModel):
     data: dict[str, object] | None = None
+class StoredThinkingOutputItem(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    content: str
+    id: str
+    type: Literal["thinking"]
+class StoredTextOutputItem(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    content: str
+    id: str
+    type: Literal["text"]
+class StoredErrorOutputItem(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    detail: str = Field(default="", exclude_if=lambda value: value == "")
+    id: str
+    message: str
+    title: str
+    type: Literal["error"]
+class StoredToolOutputItem(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    id: str
+    tool: StoredToolItem
+    type: Literal["tool"]
+StoredOutputItem = Annotated[
+    StoredThinkingOutputItem
+    | StoredTextOutputItem
+    | StoredErrorOutputItem
+    | StoredToolOutputItem,
+    Field(discriminator="type"),
+]
+class StoredAssistantOutputGroup(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+    id: str
+    items: list[StoredOutputItem]
 class StoredMessage(BaseModel):
     model_config = ConfigDict(extra="forbid")
     author: str
     content: str
+    groups: list[StoredAssistantOutputGroup] = Field(
+        default_factory=list, exclude_if=lambda value: value == []
+    )
     id: str
     status: str = Field(
         default="completed", exclude_if=lambda value: value == "completed"
@@ -150,7 +196,6 @@ class StoredState(BaseModel):
     mcp_servers: list[StoredMcpServer]
     messages: list[StoredMessage]
     providers: list[StoredProvider]
-    permission_requests: list[StoredPermissionRequest] = Field(default_factory=list)
     settings: StoredSettings
     skills: list[StoredSkill]
     telegram_bot: StoredTelegramBot
@@ -196,7 +241,7 @@ class StateStore:
             ]
             settings_row = connection.execute(
                 """
-                SELECT selected_provider_id, selected_model, reasoning_effort
+                SELECT selected_provider_id, selected_model, reasoning_effort, agent_prompt
                 FROM settings
                 WHERE id = 1
                 """
@@ -205,6 +250,10 @@ class StateStore:
                 StoredMessage(
                     author=row["author"],
                     content=row["content"],
+                    groups=[
+                        StoredAssistantOutputGroup.model_validate(group)
+                        for group in json.loads(row["groups"] or "[]")
+                    ],
                     id=row["id"],
                     status=row["status"],
                     thinking=row["thinking"],
@@ -215,7 +264,7 @@ class StateStore:
                 )
                 for row in connection.execute(
                     """
-                    SELECT id, author, content, tools, thinking, status
+                    SELECT id, author, content, tools, thinking, groups, status
                     FROM messages
                     ORDER BY position, id
                     """
@@ -227,6 +276,7 @@ class StateStore:
             messages=messages,
             providers=providers,
             settings=StoredSettings(
+                agent_prompt=settings_row["agent_prompt"] if settings_row else "",
                 reasoning_effort=settings_row["reasoning_effort"]
                 if settings_row
                 else ReasoningEffort.DEFAULT,
@@ -527,19 +577,22 @@ class StateStore:
                     id,
                     selected_provider_id,
                     selected_model,
-                    reasoning_effort
+                    reasoning_effort,
+                    agent_prompt
                 )
-                VALUES (1, ?, ?, ?)
+                VALUES (1, ?, ?, ?, ?)
                 ON CONFLICT(id) DO UPDATE SET
                     selected_provider_id = excluded.selected_provider_id,
                     selected_model = excluded.selected_model,
                     reasoning_effort = excluded.reasoning_effort,
+                    agent_prompt = excluded.agent_prompt,
                     updated_at = unixepoch()
                 """,
                 (
                     settings.selected_provider_id,
                     settings.selected_model,
                     settings.reasoning_effort.value,
+                    settings.agent_prompt,
                 ),
             )
         return settings
@@ -549,8 +602,17 @@ class StateStore:
             connection.execute("DELETE FROM messages")
             connection.executemany(
                 """
-                INSERT INTO messages (id, author, content, tools, thinking, status, position)
-                VALUES (?, ?, ?, ?, ?, ?, ?)
+                INSERT INTO messages (
+                    id,
+                    author,
+                    content,
+                    tools,
+                    thinking,
+                    groups,
+                    status,
+                    position
+                )
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?)
                 """,
                 [
                     (
@@ -564,6 +626,13 @@ class StateStore:
                             ]
                         ),
                         message.thinking,
+                        json.dumps(
+                            [
+                                group.model_dump(exclude_none=True)
+                                for group in message.groups
+                            ],
+                            ensure_ascii=False,
+                        ),
                         message.status,
                         position,
                     )
@@ -588,13 +657,23 @@ class StateStore:
                 position = position_row["position"]
             connection.execute(
                 """
-                INSERT INTO messages (id, author, content, tools, thinking, status, position)
-                VALUES (?, ?, ?, ?, ?, ?, ?)
+                INSERT INTO messages (
+                    id,
+                    author,
+                    content,
+                    tools,
+                    thinking,
+                    groups,
+                    status,
+                    position
+                )
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?)
                 ON CONFLICT(id) DO UPDATE SET
                     author = excluded.author,
                     content = excluded.content,
                     tools = excluded.tools,
                     thinking = excluded.thinking,
+                    groups = excluded.groups,
                     status = excluded.status,
                     position = excluded.position
                 """,
@@ -606,6 +685,13 @@ class StateStore:
                         [tool.model_dump(exclude_none=True) for tool in message.tools]
                     ),
                     message.thinking,
+                    json.dumps(
+                        [
+                            group.model_dump(exclude_none=True)
+                            for group in message.groups
+                        ],
+                        ensure_ascii=False,
+                    ),
                     message.status,
                     position,
                 ),
@@ -925,6 +1011,7 @@ class StateStore:
                 selected_provider_id TEXT NOT NULL DEFAULT '',
                 selected_model TEXT NOT NULL DEFAULT '',
                 reasoning_effort TEXT NOT NULL DEFAULT 'default',
+                agent_prompt TEXT NOT NULL DEFAULT '',
                 updated_at INTEGER NOT NULL DEFAULT (unixepoch())
             );
@@ -998,6 +1085,10 @@ class StateStore:
             connection.execute(
                 "ALTER TABLE messages ADD COLUMN status TEXT NOT NULL DEFAULT 'completed'"
             )
+        if "groups" not in columns:
+            connection.execute(
+                "ALTER TABLE messages ADD COLUMN groups TEXT NOT NULL DEFAULT '[]'"
+            )
         settings_columns = {
             row["name"] for row in connection.execute("PRAGMA table_info(settings)")
         }
@@ -1006,6 +1097,10 @@ class StateStore:
                 "ALTER TABLE settings "
                 "ADD COLUMN reasoning_effort TEXT NOT NULL DEFAULT 'default'"
             )
+        if "agent_prompt" not in settings_columns:
+            connection.execute(
+                "ALTER TABLE settings ADD COLUMN agent_prompt TEXT NOT NULL DEFAULT ''"
+            )
         workspace_context_columns = {
             row["name"]
             for row in connection.execute("PRAGMA table_info(workspace_context)")

package/backend/tests/__pycache__/conftest.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_agent_tools.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_approval.cpython-313-pytest-9.0.3.pyc ADDED Viewed

Binary file

package/backend/tests/__pycache__/test_channels.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_health.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_llm_providers.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_logging.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_mcp.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_patch.cpython-313-pytest-9.0.3.pyc ADDED Viewed

Binary file

package/backend/tests/__pycache__/test_permissions.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_persistence.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_skills.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_startup_requirements.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/__pycache__/test_workspace_chat.cpython-313-pytest-9.0.3.pyc CHANGED Viewed

Binary file

package/backend/tests/test_agent_tools.py CHANGED Viewed

@@ -11,7 +11,7 @@ from flowent.agent import FLOWENT_AGENT_SYSTEM_PROMPT, run_agent_stream
 from flowent.llm import ProviderConnection, ProviderFormat
 from flowent.main import create_app
 from flowent.sandbox import SandboxCommand, SandboxRunner
-from flowent.tools import ToolContext, run_tool
+from flowent.tools import ToolContext, ToolResult, run_tool
 def stream_events(content: str) -> list[dict[str, object]]:
@@ -249,6 +249,19 @@ def test_sandbox_command_omits_proc_mount_when_preflight_reports_permission_erro
     assert "--proc" not in command.args
+def test_sandbox_command_binds_writable_socket_path(tmp_path, monkeypatch) -> None:
+    socket_path = tmp_path / "docker.sock"
+    socket_path.touch()
+    runner = SandboxRunner(cwd=tmp_path, writable_roots=[socket_path])
+    monkeypatch.setattr("flowent.sandbox.sandbox_supports_proc_mount", lambda: False)
+    command = runner.build_command(["/bin/true"])
+    bind_index = command.args.index(str(socket_path))
+    assert command.args[bind_index - 1] == "--bind"
+    assert command.args[bind_index + 1] == str(socket_path)
 def test_sandbox_proc_preflight_does_not_hide_non_proc_errors(
     tmp_path, monkeypatch
 ) -> None:
@@ -901,6 +914,69 @@ def test_tool_failure_is_reported_and_agent_continues(tmp_path, monkeypatch) ->
     assert events[-1]["data"]["message"]["content"] == "I could not read it."
+@pytest.mark.anyio
+async def test_approval_denial_result_is_sent_to_agent(tmp_path) -> None:
+    captured_requests: list[dict[str, object]] = []
+    async def fake_completion(**request: object) -> object:
+        captured_requests.append(request)
+        async def chunks() -> object:
+            if len(captured_requests) == 1:
+                yield tool_call_chunk(
+                    "shell_command",
+                    {"command": "rm -rf /important"},
+                )
+            else:
+                yield text_chunk("I need explicit approval for that risk.")
+        return chunks()
+    async def denying_tool_runner(
+        name: str,
+        arguments: dict[str, object],
+        context: ToolContext,
+    ) -> ToolResult:
+        return ToolResult(
+            content=(
+                "Automatic approval review denied this action as high risk: "
+                "The command can delete broad data. The agent must not work around "
+                "this denial."
+            ),
+            ok=False,
+            title="Denied by reviewer",
+        )
+    events = [
+        event
+        async for event in run_agent_stream(
+            completion=fake_completion,
+            connection=ProviderConnection(
+                model="gpt-5.1",
+                name="Provider",
+                provider=ProviderFormat.OPENAI,
+                secret_reference="secret",
+            ),
+            cwd=tmp_path,
+            messages=[{"role": "user", "content": "Delete the important directory."}],
+            tool_runner=denying_tool_runner,
+        )
+    ]
+    assert len(captured_requests) == 2
+    assert captured_requests[1]["messages"][-1]["role"] == "tool"
+    assert "Automatic approval review denied this action" in str(
+        captured_requests[1]["messages"][-1]["content"]
+    )
+    assert "must not work around" in str(
+        captured_requests[1]["messages"][-1]["content"]
+    )
+    assert events[-2].data["content"] == "I need explicit approval for that risk."
+    assert events[-1].data["message"]["content"] == (
+        "I need explicit approval for that risk."
+    )
 def test_update_plan_outputs_plan_state(tmp_path) -> None:
     result = run_tool(
         "update_plan",