flowent 0.0.6 → 0.0.7

package/backend/tests/unit/routes/test_roles_routes.py

@@ -175,15 +175,17 @@ def test_create_role_filters_assistant_only_tools(monkeypatch):
                     "create_workflow",
                     "delete_workflow",
                     "list_workflows",
-                    "mcp__flowent__list_workflows",
                     "manage_settings",
                 ],
+                excluded_tools=["fetch"],
             )
         )
     )
 
     assert result["included_tools"] == ["read"]
+    assert result["excluded_tools"] == ["fetch"]
     assert settings.roles[0].included_tools == ["read"]
+    assert settings.roles[0].excluded_tools == ["fetch"]
 
 
 def test_create_role_rejects_duplicate_name(monkeypatch):
@@ -284,15 +286,17 @@ def test_update_role_filters_assistant_only_tools(monkeypatch):
                     "create_workflow",
                     "delete_workflow",
                     "list_workflows",
-                    "mcp__flowent__list_workflows",
                     "manage_roles",
                 ],
+                excluded_tools=["fetch"],
             ),
         )
     )
 
     assert result["included_tools"] == ["read"]
+    assert result["excluded_tools"] == ["fetch"]
     assert settings.roles[0].included_tools == ["read"]
+    assert settings.roles[0].excluded_tools == ["fetch"]
 
 
 def test_update_role_rejects_duplicate_name(monkeypatch):

package/backend/tests/unit/routes/test_settings_routes.py

@@ -140,7 +140,6 @@ def test_get_settings_bootstrap_returns_related_resources(monkeypatch):
                     "excluded_tools": [],
                 }
             ],
-            "mcp_servers": [],
         },
         "providers": [
             {
@@ -1108,24 +1107,6 @@ def test_update_settings_rejects_invalid_assistant_allow_network(monkeypatch):
     assert excinfo.value.detail == "assistant.allow_network must be a boolean"
 
 
-def test_update_settings_rejects_removed_assistant_mcp_servers(monkeypatch):
-    settings = Settings(
-        roles=[RoleConfig(name="Steward", system_prompt="Default assistant role.")]
-    )
-
-    monkeypatch.setattr("flowent.routes.settings.get_settings", lambda: settings)
-
-    with pytest.raises(HTTPException) as excinfo:
-        asyncio.run(
-            update_settings(
-                UpdateSettingsRequest(assistant={"mcp_servers": ["filesystem"]}),
-            )
-        )
-
-    assert excinfo.value.status_code == 400
-    assert excinfo.value.detail == "Unknown assistant fields: mcp_servers"
-
-
 def test_update_settings_rejects_unknown_leader_role(monkeypatch):
     settings = Settings(roles=[RoleConfig(name="Conductor", system_prompt="Default.")])
 

package/backend/tests/unit/settings/test_settings_roles.py

@@ -415,56 +415,6 @@ def test_load_settings_defaults_provider_retry_429_delay_seconds(monkeypatch, tm
     assert persisted["providers"][0]["retry_429_delay_seconds"] == 0
 
 
-def test_load_settings_drops_removed_exit_tool_from_roles(monkeypatch, tmp_path):
-    settings_file = tmp_path / "settings.json"
-    settings_file.write_text(
-        json.dumps(
-            {
-                "event_log": {"timestamp_format": "absolute"},
-                "model": {"active_provider_id": "", "active_model": ""},
-                "providers": [],
-                "roles": [
-                    {
-                        "name": "Worker",
-                        "system_prompt": "Do work.",
-                        "included_tools": ["read", "exit", "exec"],
-                        "excluded_tools": ["exit", "fetch"],
-                    }
-                ],
-            }
-        ),
-        encoding="utf-8",
-    )
-
-    monkeypatch.setattr(settings_module, "_SETTINGS_FILE", settings_file)
-    monkeypatch.setattr(settings_module, "_cached_settings", None)
-
-    loaded = settings_module.load_settings()
-
-    assert loaded.roles == [
-        RoleConfig(
-            name="Worker",
-            description="Do work.",
-            system_prompt="Do work.",
-            included_tools=["read", "exec"],
-            excluded_tools=["fetch"],
-        )
-    ]
-
-    persisted = json.loads(settings_file.read_text(encoding="utf-8"))
-    assert persisted["roles"] == [
-        {
-            "name": "Worker",
-            "description": "Do work.",
-            "system_prompt": "Do work.",
-            "model": None,
-            "model_params": None,
-            "included_tools": ["read", "exec"],
-            "excluded_tools": ["fetch"],
-        }
-    ]
-
-
 def test_load_settings_drops_assistant_only_tools_from_custom_roles(
     monkeypatch,
     tmp_path,
@@ -485,7 +435,9 @@ def test_load_settings_drops_assistant_only_tools_from_custom_roles(
                             "create_workflow",
                             "delete_workflow",
                             "list_workflows",
-                            "mcp__flowent__list_workflows",
+                            "mcp__external__search_notes",
+                            "mcp__external__summarize",
+                            "mcp__external__classify",
                             "manage_settings",
                         ],
                     }

package/backend/tests/unit/test_cli.py

@@ -59,17 +59,6 @@ def test_access_reset_command_clears_persisted_access_code(
     assert not is_access_configured(reloaded_settings.access)
 
 
-def test_help_output_no_longer_lists_mcp_command(capsys):
-    with pytest.raises(SystemExit) as exc:
-        main(["--help"])
-
-    assert exc.value.code == 0
-    output = capsys.readouterr().out
-
-    assert "access" in output
-    assert "mcp" not in output
-
-
 def test_version_short_option_matches_version_output(capsys):
     with pytest.raises(SystemExit) as exc:
         main(["-v"])
@@ -97,17 +86,6 @@ def test_server_options_accept_npm_wrapper_aliases(monkeypatch):
     }
 
 
-def test_removed_mcp_command_is_rejected(capsys):
-    with pytest.raises(SystemExit) as exc:
-        main(["mcp", "serve"])
-
-    assert exc.value.code == 2
-    error_output = capsys.readouterr().err
-
-    assert "invalid choice" in error_output
-    assert "'mcp'" in error_output
-
-
 def test_cli_sets_app_data_dir_env_before_dispatch(monkeypatch, tmp_path, capsys):
     monkeypatch.delenv(APP_DATA_DIR_ENV_VAR, raising=False)
     called: list[str] = []

package/backend/tests/unit/test_state_sqlite_storage.py

@@ -1,13 +1,8 @@
 import base64
 import sqlite3
-import time
 
 import flowent.settings as settings_module
-from flowent.agent import Agent
 from flowent.image_assets import create_image_asset
-from flowent.mcp_service import MCPDiscoverySnapshot, MCPToolDescriptor, mcp_service
-from flowent.models import NodeConfig, NodeType
-from flowent.settings import MCPServerConfig, Settings
 
 _ONE_PIXEL_PNG = base64.b64decode(
     "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+aF9sAAAAASUVORK5CYII="
@@ -49,111 +44,44 @@ def test_create_image_asset_persists_metadata_in_state_sqlite(monkeypatch, tmp_p
     assert row["original_name"] == "pixel.png"
 
 
-def test_mcp_service_restores_persisted_snapshot_and_activity_after_runtime_clear(
-    monkeypatch,
-    tmp_path,
-):
+def test_state_schema_removes_retired_connection_tables(monkeypatch, tmp_path):
     settings_file = tmp_path / "settings.json"
     settings_file.write_text("{}", encoding="utf-8")
     monkeypatch.setattr(settings_module, "_SETTINGS_FILE", settings_file)
     monkeypatch.setattr(settings_module, "_cached_settings", None)
-    mcp_service.reset()
-    now = time.time()
 
+    db_path = tmp_path / "state.sqlite"
+    connection = sqlite3.connect(db_path)
     try:
-        mcp_service._set_snapshot(
-            MCPDiscoverySnapshot(
-                server_name="filesystem",
-                transport="stdio",
-                status="connected",
-                auth_status="unsupported",
-                last_refresh_result="success",
-            )
-        )
-        mcp_service._record_activity(
-            server_name="filesystem",
-            action="refresh",
-            actor_node_id=None,
-            tab_id=None,
-            started_at=now - 2.0,
-            ended_at=now,
-            result="success",
-            summary="Capabilities refreshed",
+        connection.executescript(
+            """
+            CREATE TABLE mcp_snapshots (id TEXT PRIMARY KEY);
+            CREATE TABLE mcp_activities (id TEXT PRIMARY KEY);
+            """
         )
-
-        mcp_service.clear_runtime_state()
-
-        restored_snapshot = mcp_service._get_snapshot("filesystem")
-        restored_activities = mcp_service.list_activities(server_name="filesystem")
-
-        assert restored_snapshot is not None
-        assert restored_snapshot.status == "connected"
-        assert restored_snapshot.last_refresh_result == "success"
-        assert len(restored_activities) == 1
-        assert restored_activities[0].server_name == "filesystem"
-        assert restored_activities[0].summary == "Capabilities refreshed"
     finally:
-        mcp_service.reset()
-
+        connection.close()
 
-def test_mcp_service_filters_workflow_management_tools_for_non_assistant(
-    monkeypatch,
-    tmp_path,
-):
-    settings_file = tmp_path / "settings.json"
-    settings_file.write_text("{}", encoding="utf-8")
-    monkeypatch.setattr(settings_module, "_SETTINGS_FILE", settings_file)
-    monkeypatch.setattr(settings_module, "_cached_settings", None)
-    monkeypatch.setattr(
-        "flowent.mcp_service.get_settings",
-        lambda: Settings(
-            mcp_servers=[
-                MCPServerConfig(
-                    name="flowent",
-                    transport="stdio",
-                )
-            ]
-        ),
+    create_image_asset(
+        _ONE_PIXEL_PNG,
+        mime_type="image/png",
+        original_name="pixel.png",
     )
-    mcp_service.reset()
 
+    connection = sqlite3.connect(db_path)
     try:
-        mcp_service._set_snapshot(
-            MCPDiscoverySnapshot(
-                server_name="flowent",
-                transport="stdio",
-                status="connected",
-                auth_status="unsupported",
-                tools=[
-                    MCPToolDescriptor(
-                        server_name="flowent",
-                        tool_name="list_workflows",
-                        fully_qualified_id="mcp__flowent__list_workflows",
-                    ),
-                    MCPToolDescriptor(
-                        server_name="flowent",
-                        tool_name="search_notes",
-                        fully_qualified_id="mcp__flowent__search_notes",
-                    ),
-                ],
-            )
-        )
-        worker = Agent(NodeConfig(node_type=NodeType.AGENT), uuid="worker")
-        assistant = Agent(NodeConfig(node_type=NodeType.ASSISTANT), uuid="assistant")
-
-        worker_tools = {
-            descriptor.fully_qualified_id
-            for descriptor in mcp_service.list_agent_dynamic_tools(worker)
-        }
-        assistant_tools = {
-            descriptor.fully_qualified_id
-            for descriptor in mcp_service.list_agent_dynamic_tools(assistant)
-        }
-
-        assert worker_tools == {"mcp__flowent__search_notes"}
-        assert assistant_tools == {
-            "mcp__flowent__list_workflows",
-            "mcp__flowent__search_notes",
+        existing_tables = {
+            row[0]
+            for row in connection.execute(
+                """
+                SELECT name
+                FROM sqlite_master
+                WHERE type = 'table'
+                """
+            ).fetchall()
         }
     finally:
-        mcp_service.reset()
+        connection.close()
+
+    assert "mcp_snapshots" not in existing_tables
+    assert "mcp_activities" not in existing_tables

package/backend/tests/unit/test_workspace_store.py

@@ -38,7 +38,6 @@ def test_workspace_store_normalizes_relative_write_dirs_on_load(
                     }
                 ],
                 "edges": [],
-                "blueprints": [],
             }
         ),
         encoding="utf-8",
@@ -103,7 +102,6 @@ def test_workspace_store_prefers_legacy_workspace_data_when_state_db_is_still_em
                     }
                 ],
                 "edges": [],
-                "blueprints": [],
             }
         ),
         encoding="utf-8",
@@ -157,7 +155,6 @@ def test_workspace_store_does_not_overwrite_state_db_with_legacy_workspace_data(
                     }
                 ],
                 "edges": [],
-                "blueprints": [],
             }
         ),
         encoding="utf-8",

package/backend/tests/unit/tools/test_create_agent_tool.py

@@ -362,38 +362,6 @@ def test_create_agent_rejects_node_level_permissions(monkeypatch, tmp_path):
     }
 
 
-def test_create_agent_rejects_removed_connect_to_creator_parameter(monkeypatch):
-    monkeypatch.setattr(
-        "flowent.settings.get_settings",
-        lambda: Settings(roles=[RoleConfig(name="Worker", system_prompt="Do work.")]),
-    )
-    tab = create_tab(title="Task")
-
-    owner = Agent(
-        NodeConfig(
-            node_type=NodeType.AGENT,
-            role_name="Conductor",
-            tab_id=tab.id,
-            tools=["create_agent"],
-        ),
-        uuid=tab.leader_id,
-    )
-
-    result = json.loads(
-        CreateAgentTool().execute(
-            owner,
-            {
-                "role_name": "Worker",
-                "connect_to_creator": "yes",
-            },
-        )
-    )
-
-    assert result == {
-        "error": "create_agent no longer supports connect_to_creator; use placement"
-    }
-
-
 def test_create_agent_tool_schema_exposes_workflow_placement_options():
     assert CreateAgentTool.parameters == {
         "type": "object",

package/backend/tests/unit/tools/test_manage_prompts_tool.py

@@ -10,7 +10,7 @@ def test_manage_prompts_get_returns_current_prompt(monkeypatch):
     agent = Agent(NodeConfig(node_type=NodeType.ASSISTANT, tools=["manage_prompts"]))
     settings = Settings(
         custom_prompt="Be concise.",
-        custom_post_prompt="Stay routed.",
+        custom_post_prompt="Summarize decisions before the next step.",
     )
 
     monkeypatch.setattr("flowent.settings.get_settings", lambda: settings)
@@ -19,7 +19,7 @@ def test_manage_prompts_get_returns_current_prompt(monkeypatch):
 
     assert result == {
         "custom_prompt": "Be concise.",
-        "custom_post_prompt": "Stay routed.",
+        "custom_post_prompt": "Summarize decisions before the next step.",
     }
 
 
@@ -39,17 +39,17 @@ def test_manage_prompts_update_saves_custom_prompt(monkeypatch):
             {
                 "action": "update",
                 "custom_prompt": "Always prefer terse answers.",
-                "custom_post_prompt": "Only route with @target.",
+                "custom_post_prompt": "Summarize decisions before the next step.",
             },
         )
     )
 
     assert result == {
         "custom_prompt": "Always prefer terse answers.",
-        "custom_post_prompt": "Only route with @target.",
+        "custom_post_prompt": "Summarize decisions before the next step.",
     }
     assert settings.custom_prompt == "Always prefer terse answers."
-    assert settings.custom_post_prompt == "Only route with @target."
+    assert settings.custom_post_prompt == "Summarize decisions before the next step."
     assert saved == [settings]
 
 
@@ -90,28 +90,3 @@ def test_manage_prompts_update_allows_custom_post_prompt_only(monkeypatch):
     }
     assert settings.custom_prompt == "Keep this."
     assert settings.custom_post_prompt == "Append this after history."
-
-
-def test_manage_prompts_update_accepts_legacy_post_prompt_alias(monkeypatch):
-    agent = Agent(NodeConfig(node_type=NodeType.ASSISTANT, tools=["manage_prompts"]))
-    settings = Settings(custom_prompt="Keep this.", custom_post_prompt="")
-
-    monkeypatch.setattr("flowent.settings.get_settings", lambda: settings)
-    monkeypatch.setattr("flowent.settings.save_settings", lambda current: None)
-
-    result = json.loads(
-        ManagePromptsTool().execute(
-            agent,
-            {
-                "action": "update",
-                "post_prompt": "Append this after history.",
-            },
-        )
-    )
-
-    assert result == {
-        "custom_prompt": "Keep this.",
-        "custom_post_prompt": "Append this after history.",
-    }
-    assert settings.custom_prompt == "Keep this."
-    assert settings.custom_post_prompt == "Append this after history."

package/backend/tests/unit/tools/test_tool_registry.py

@@ -3,17 +3,6 @@ from flowent.models import NodeConfig, NodeType
 from flowent.tools import build_tool_registry
 
 
-class _FakeMCPService:
-    def __init__(self, descriptors):
-        self._descriptors = descriptors
-
-    def list_agent_dynamic_tools(self, agent):
-        return list(self._descriptors)
-
-    def list_discovered_tools(self):
-        return list(self._descriptors)
-
-
 def test_empty_tools_list_grants_minimum_tools():
     agent = Agent(NodeConfig(node_type=NodeType.AGENT, tools=[]))
 
@@ -42,7 +31,7 @@ def test_tool_registry_merges_explicit_allow_list_with_minimum_tools():
     ]
 
 
-def test_tool_registry_registers_connect_and_removes_create_root():
+def test_tool_registry_registers_management_and_workflow_tools():
     tool_names = [tool.name for tool in build_tool_registry().list_tools()]
 
     assert "create_workflow" in tool_names
@@ -52,7 +41,6 @@ def test_tool_registry_registers_connect_and_removes_create_root():
     assert "connect" in tool_names
     assert "send" in tool_names
     assert "list_workflows" in tool_names
-    assert "create_root" not in tool_names
     assert "manage_providers" in tool_names
     assert "manage_roles" in tool_names
     assert "manage_settings" in tool_names
@@ -120,41 +108,42 @@ def test_tool_registry_filters_assistant_only_tools_for_workflow_nodes():
     ]
 
 
-def test_tool_registry_filters_assistant_only_mcp_tools_for_workflow_nodes(
-    monkeypatch,
-):
-    from flowent.mcp_service import MCPToolDescriptor
-
-    workflow_tool = MCPToolDescriptor(
-        server_name="flowent",
-        tool_name="list_workflows",
-        fully_qualified_id="mcp__flowent__list_workflows",
-    )
-    regular_tool = MCPToolDescriptor(
-        server_name="flowent",
-        tool_name="search_notes",
-        fully_qualified_id="mcp__flowent__search_notes",
-    )
-    fake_service = _FakeMCPService([workflow_tool, regular_tool])
-    monkeypatch.setattr("flowent.mcp_service.mcp_service", fake_service)
+def test_tool_registry_ignores_mcp_prefixed_tools_for_workflow_nodes():
     agent = Agent(
         NodeConfig(
             node_type=NodeType.AGENT,
             role_name="Worker",
             tools=[
-                "mcp__flowent__list_workflows",
-                "mcp__flowent__search_notes",
+                "mcp__external__search_notes",
+                "mcp__external__lookup",
+            ],
+        )
+    )
+
+    tools = build_tool_registry().get_tools_for_agent(agent)
+
+    assert "mcp__external__search_notes" not in {tool.name for tool in tools}
+    assert "mcp__external__lookup" not in {tool.name for tool in tools}
+
+
+def test_tool_registry_ignores_mcp_prefixed_tools_for_assistant():
+    agent = Agent(
+        NodeConfig(
+            node_type=NodeType.ASSISTANT,
+            tools=[
+                "mcp__external__summarize",
+                "mcp__external__lookup",
             ],
         )
     )
 
     tools = build_tool_registry().get_tools_for_agent(agent)
 
-    assert "mcp__flowent__list_workflows" not in {tool.name for tool in tools}
-    assert "mcp__flowent__search_notes" in {tool.name for tool in tools}
+    assert "mcp__external__summarize" not in {tool.name for tool in tools}
+    assert "mcp__external__lookup" not in {tool.name for tool in tools}
 
 
-def test_build_tools_for_role_filters_assistant_only_mcp_tools(monkeypatch):
+def test_build_tools_for_role_filters_mcp_prefixed_tools(monkeypatch):
     from flowent.graph_service import build_tools_for_role
     from flowent.settings import RoleConfig, Settings
 
@@ -165,7 +154,7 @@ def test_build_tools_for_role_filters_assistant_only_mcp_tools(monkeypatch):
                 RoleConfig(
                     name="Worker",
                     system_prompt="Do work.",
-                    included_tools=["mcp__flowent__list_workflows", "read"],
+                    included_tools=["mcp__external__search_notes", "read"],
                 )
             ]
         ),
@@ -173,12 +162,28 @@ def test_build_tools_for_role_filters_assistant_only_mcp_tools(monkeypatch):
 
     tools = build_tools_for_role(
         "Worker",
-        requested_tools=["mcp__flowent__delete_workflow", "mcp__flowent__search_notes"],
+        requested_tools=[
+            "mcp__external__lookup",
+            "mcp__external__summarize",
+            "mcp__external__classify",
+            "mcp__external__search_notes",
+        ],
     )
 
-    assert "mcp__flowent__list_workflows" not in tools
-    assert "mcp__flowent__delete_workflow" not in tools
-    assert "mcp__flowent__search_notes" in tools
+    assert "mcp__external__lookup" not in tools
+    assert "mcp__external__summarize" not in tools
+    assert "mcp__external__classify" not in tools
+    assert "mcp__external__search_notes" not in tools
+
+
+def test_list_agent_visible_tool_descriptors_excludes_external_tools():
+    from flowent.tools import list_agent_visible_tool_descriptors
+
+    tool_names = {
+        descriptor["name"] for descriptor in list_agent_visible_tool_descriptors()
+    }
+
+    assert all(not tool_name.startswith("mcp__") for tool_name in tool_names)
 
 
 def test_tool_registry_shows_management_tools_in_agent_visible_list():

package/backend/uv.lock

@@ -286,7 +286,7 @@ wheels = [
 
 [[package]]
 name = "flowent"
-version = "0.0.6"
+version = "0.0.7"
 source = { editable = "." }
 dependencies = [
     { name = "curl-cffi" },