flowent 0.1.3 → 0.1.5

package/backend/tests/test_llm_providers.py

@@ -1,3 +1,5 @@
+import json
+
 import pytest
 
 from flowent.llm import (
@@ -8,10 +10,17 @@ from flowent.llm import (
     build_litellm_request,
     chunk_delta_reasoning,
     complete_chat,
+    normalize_system_messages,
     stream_chat,
 )
 
 
+def read_single_llm_request_diagnostic(tmp_path):
+    files = sorted((tmp_path / "logs" / "llm-requests").glob("llm-request-*.json"))
+    assert len(files) == 1
+    return json.loads(files[0].read_text())
+
+
 def test_supported_provider_formats_match_product_choices() -> None:
     assert [provider.value for provider in ProviderFormat] == [
         "openai",
@@ -137,6 +146,63 @@ async def test_complete_chat_uses_injected_litellm_completion() -> None:
     assert answer == ChatMessage(role="assistant", content="Here is the checklist.")
 
 
+@pytest.mark.anyio
+async def test_development_mode_writes_completion_request_diagnostic_file(
+    tmp_path, monkeypatch
+) -> None:
+    monkeypatch.setenv("FLOWENT_DATA_DIR", str(tmp_path))
+    monkeypatch.setenv("DEBUG", "true")
+
+    async def fake_completion(**request: object) -> dict[str, object]:
+        return {
+            "choices": [
+                {
+                    "message": {
+                        "content": "Here is the checklist.",
+                        "role": "assistant",
+                    },
+                }
+            ]
+        }
+
+    connection = ProviderConnection(
+        name="Responses",
+        provider=ProviderFormat.OPENAI_RESPONSES,
+        model="gpt-5.1",
+        secret_reference="sk-request-secret",
+    )
+    messages = [ChatMessage(role="user", content="Create a checklist.")]
+    tools = [
+        {
+            "type": "function",
+            "function": {
+                "name": "create_checklist",
+                "description": "Create a checklist.",
+            },
+        }
+    ]
+
+    await complete_chat(
+        connection,
+        messages,
+        completion=fake_completion,
+        tools=tools,
+    )
+
+    diagnostic = read_single_llm_request_diagnostic(tmp_path)
+
+    assert diagnostic == {
+        "base_url": None,
+        "litellm_model": "openai/gpt-5.1",
+        "messages": [{"content": "Create a checklist.", "role": "user"}],
+        "model": "gpt-5.1",
+        "provider": "openai_responses",
+        "reasoning_effort": "default",
+        "stream": False,
+        "tools": tools,
+    }
+
+
 @pytest.mark.anyio
 async def test_stream_chat_uses_litellm_streaming() -> None:
     captured_request: dict[str, object] = {}
@@ -169,3 +235,153 @@ async def test_stream_chat_uses_litellm_streaming() -> None:
     assert captured_request["stream"] is True
     assert captured_request["model"] == "openai/gpt-5.1"
     assert chunks == ["Here is ", "the checklist."]
+
+
+@pytest.mark.anyio
+async def test_development_mode_writes_one_streaming_request_diagnostic_file(
+    tmp_path, monkeypatch
+) -> None:
+    monkeypatch.setenv("FLOWENT_DATA_DIR", str(tmp_path))
+    monkeypatch.setenv("DEBUG", "true")
+
+    async def fake_completion(**request: object) -> object:
+        async def chunks() -> object:
+            yield {"choices": [{"delta": {"content": "Here is "}}]}
+            yield {"choices": [{"delta": {"content": "the checklist."}}]}
+
+        return chunks()
+
+    connection = ProviderConnection(
+        name="Responses",
+        provider=ProviderFormat.OPENAI_RESPONSES,
+        model="gpt-5.1",
+        secret_reference="sk-request-secret",
+    )
+
+    chunks = [
+        chunk
+        async for chunk in stream_chat(
+            connection,
+            [ChatMessage(role="user", content="Create a checklist.")],
+            completion=fake_completion,
+        )
+    ]
+    diagnostic = read_single_llm_request_diagnostic(tmp_path)
+
+    assert chunks == ["Here is ", "the checklist."]
+    assert diagnostic["stream"] is True
+
+
+@pytest.mark.anyio
+async def test_development_request_diagnostic_omits_api_key_and_secret_values(
+    tmp_path, monkeypatch
+) -> None:
+    monkeypatch.setenv("FLOWENT_DATA_DIR", str(tmp_path))
+    monkeypatch.setenv("DEBUG", "true")
+
+    async def fake_completion(**request: object) -> dict[str, object]:
+        return {
+            "choices": [
+                {
+                    "message": {
+                        "content": "Here is the checklist.",
+                        "role": "assistant",
+                    },
+                }
+            ]
+        }
+
+    connection = ProviderConnection(
+        name="Responses",
+        provider=ProviderFormat.OPENAI_RESPONSES,
+        model="gpt-5.1",
+        secret_reference="sk-provider-secret",
+    )
+    tools = [
+        {
+            "type": "function",
+            "function": {
+                "name": "create_checklist",
+                "description": "Uses api_key=sk-tool-secret when configured.",
+            },
+        }
+    ]
+
+    await complete_chat(
+        connection,
+        [ChatMessage(role="user", content="authorization=Bearer sk-message-secret")],
+        completion=fake_completion,
+        tools=tools,
+    )
+
+    rendered = next(
+        (tmp_path / "logs" / "llm-requests").glob("llm-request-*.json")
+    ).read_text()
+
+    assert "api_key" not in rendered
+    assert "sk-provider-secret" not in rendered
+    assert "sk-tool-secret" not in rendered
+    assert "sk-message-secret" not in rendered
+
+
+@pytest.mark.anyio
+async def test_non_development_mode_skips_request_diagnostic_file(
+    tmp_path, monkeypatch
+) -> None:
+    monkeypatch.setenv("FLOWENT_DATA_DIR", str(tmp_path))
+    monkeypatch.delenv("DEBUG", raising=False)
+
+    async def fake_completion(**request: object) -> dict[str, object]:
+        return {
+            "choices": [
+                {
+                    "message": {
+                        "content": "Here is the checklist.",
+                        "role": "assistant",
+                    },
+                }
+            ]
+        }
+
+    connection = ProviderConnection(
+        name="Responses",
+        provider=ProviderFormat.OPENAI_RESPONSES,
+        model="gpt-5.1",
+        secret_reference="sk-request-secret",
+    )
+
+    await complete_chat(
+        connection,
+        [ChatMessage(role="user", content="Create a checklist.")],
+        completion=fake_completion,
+    )
+
+    assert not (tmp_path / "logs" / "llm-requests").exists()
+
+
+def test_normalize_system_messages_keeps_multiple_system_messages_for_openai() -> None:
+    messages = [
+        {"role": "system", "content": "Base prompt."},
+        {"role": "system", "content": "Configured prompt."},
+        {"role": "user", "content": "Hello."},
+    ]
+
+    assert normalize_system_messages(messages, ProviderFormat.OPENAI) == messages
+
+
+def test_normalize_system_messages_converts_additional_system_messages_for_anthropic() -> (
+    None
+):
+    messages = [
+        {"role": "system", "content": "Base prompt."},
+        {"role": "system", "content": "Configured prompt."},
+        {"role": "system", "content": "Project prompt."},
+        {"role": "user", "content": "Hello."},
+    ]
+
+    assert normalize_system_messages(messages, ProviderFormat.ANTHROPIC) == [
+        {"role": "system", "content": "Base prompt."},
+        {"role": "user", "content": "Configured prompt."},
+        {"role": "user", "content": "Project prompt."},
+        {"role": "user", "content": "Hello."},
+    ]

package/backend/tests/test_logging.py

@@ -8,6 +8,7 @@ from flowent.logging import (
     configure_logging,
     ensure_logging_configured,
     redact_log_value,
+    sanitize_diagnostic_value,
 )
 
 
@@ -103,6 +104,35 @@ def test_logging_redacts_full_api_key_but_keeps_context(tmp_path, monkeypatch) -
     )
 
 
+def test_diagnostic_sanitizer_removes_secret_fields_and_values() -> None:
+    sanitized = sanitize_diagnostic_value(
+        {
+            "api_key": "sk-root-secret",
+            "messages": [
+                {
+                    "role": "user",
+                    "content": "authorization=Bearer sk-message-secret",
+                }
+            ],
+            "tools": [
+                {
+                    "function": {
+                        "name": "send_message",
+                        "description": "Needs api_key=sk-tool-secret.",
+                    }
+                }
+            ],
+        }
+    )
+
+    rendered = str(sanitized)
+
+    assert "api_key" not in rendered
+    assert "sk-root-secret" not in rendered
+    assert "sk-message-secret" not in rendered
+    assert "sk-tool-secret" not in rendered
+
+
 def test_direct_main_app_import_creates_data_log_file(tmp_path, monkeypatch) -> None:
     monkeypatch.setenv("FLOWENT_DATA_DIR", str(tmp_path))
     sys.modules.pop("flowent.main", None)

package/backend/tests/test_mcp.py

@@ -411,7 +411,10 @@ def test_disabled_mcp_server_does_not_connect_or_expose_tools(
     assert response.json()["status"] == "disabled"
 
 
-def test_enabled_mcp_server_connects_and_lists_tools(tmp_path, monkeypatch) -> None:
+@pytest.mark.anyio
+async def test_enabled_mcp_server_save_returns_starting_and_connects_in_background(
+    tmp_path, monkeypatch
+) -> None:
     monkeypatch.setenv("FLOWENT_DATA_DIR", str(tmp_path))
     transport = FakeMcpTransport()
     transport.tools_by_server["mcp-files"] = [
@@ -426,11 +429,20 @@ def test_enabled_mcp_server_connects_and_lists_tools(tmp_path, monkeypatch) -> N
     response = client.put("/api/mcp/servers", json=command_server_payload())
 
     assert response.status_code == 200
-    assert response.json()["status"] == "ready"
-    assert response.json()["tools"][0]["name"] == "read_file"
+    assert response.json()["status"] == "starting"
+    assert response.json()["tools"] == []
+    manager = client.app.state.mcp_manager
+    connected = await wait_for_status(
+        manager,
+        StoredMcpServer.model_validate(response.json()),
+        "ready",
+    )
+    assert connected.status == "ready"
+    assert connected.tools[0].name == "read_file"
 
 
-def test_mcp_connection_error_is_reported_in_state(tmp_path, monkeypatch) -> None:
+@pytest.mark.anyio
+async def test_mcp_connection_error_is_reported_in_state(tmp_path, monkeypatch) -> None:
     monkeypatch.setenv("FLOWENT_DATA_DIR", str(tmp_path))
     transport = FakeMcpTransport()
     transport.errors["mcp-files"] = "Command failed"
@@ -439,11 +451,19 @@ def test_mcp_connection_error_is_reported_in_state(tmp_path, monkeypatch) -> Non
     response = client.put("/api/mcp/servers", json=command_server_payload())
 
     assert response.status_code == 200
-    assert response.json()["status"] == "error"
-    assert response.json()["error"] == "Command failed"
+    assert response.json()["status"] == "starting"
+    manager = client.app.state.mcp_manager
+    errored = await wait_for_status(
+        manager,
+        StoredMcpServer.model_validate(response.json()),
+        "error",
+    )
+    assert errored.status == "error"
+    assert errored.error == "Command failed"
 
 
-def test_mcp_server_can_be_reconnected(tmp_path, monkeypatch) -> None:
+@pytest.mark.anyio
+async def test_mcp_server_can_be_reconnected(tmp_path, monkeypatch) -> None:
     monkeypatch.setenv("FLOWENT_DATA_DIR", str(tmp_path))
     transport = FakeMcpTransport()
     transport.tools_by_server["mcp-files"] = [
@@ -451,6 +471,13 @@ def test_mcp_server_can_be_reconnected(tmp_path, monkeypatch) -> None:
     ]
     client = TestClient(create_app(serve_frontend=False, mcp_transport=transport))
     client.put("/api/mcp/servers", json=command_server_payload())
+
+    connected = await wait_for_status(
+        client.app.state.mcp_manager,
+        StoredMcpServer.model_validate(command_server_payload()),
+        "ready",
+    )
+    assert connected.status == "ready"
     transport.tools_by_server["mcp-files"] = [
         {"inputSchema": {"type": "object"}, "name": "read_file"},
         {"inputSchema": {"type": "object"}, "name": "write_file"},
@@ -552,7 +579,8 @@ def test_mcp_server_delete_removes_saved_server_when_disconnect_fails(
     assert transport.disconnect_calls == ["mcp-files"]
 
 
-def test_ready_mcp_tools_are_included_in_workspace_request(
+@pytest.mark.anyio
+async def test_ready_mcp_tools_are_included_in_workspace_request(
     tmp_path, monkeypatch
 ) -> None:
     monkeypatch.setenv("FLOWENT_DATA_DIR", str(tmp_path / "data"))
@@ -583,6 +611,12 @@ def test_ready_mcp_tools_are_included_in_workspace_request(
     )
     configure_provider(client)
     client.put("/api/mcp/servers", json=command_server_payload())
+    connected = await wait_for_status(
+        client.app.state.mcp_manager,
+        StoredMcpServer.model_validate(command_server_payload()),
+        "ready",
+    )
+    assert connected.status == "ready"
 
     response = client.post("/api/workspace/respond", json={"content": "Read file"})
 
@@ -595,7 +629,8 @@ def test_ready_mcp_tools_are_included_in_workspace_request(
     assert mcp_tool_name("mcp-files", "read_file") in tool_names
 
 
-def test_mcp_tool_call_is_forwarded_and_result_returns_to_agent(
+@pytest.mark.anyio
+async def test_mcp_tool_call_is_forwarded_and_result_returns_to_agent(
     tmp_path, monkeypatch
 ) -> None:
     monkeypatch.setenv("FLOWENT_DATA_DIR", str(tmp_path / "data"))
@@ -632,6 +667,12 @@ def test_mcp_tool_call_is_forwarded_and_result_returns_to_agent(
     )
     configure_provider(client)
     client.put("/api/mcp/servers", json=command_server_payload())
+    connected = await wait_for_status(
+        client.app.state.mcp_manager,
+        StoredMcpServer.model_validate(command_server_payload()),
+        "ready",
+    )
+    assert connected.status == "ready"
 
     response = client.post("/api/workspace/respond", json={"content": "Use MCP"})
 
@@ -651,7 +692,10 @@ def test_mcp_tool_call_is_forwarded_and_result_returns_to_agent(
     assert events[3]["data"]["data"]["tool"] == "read_file"
 
 
-def test_mcp_tool_call_failure_is_reported_in_workspace(tmp_path, monkeypatch) -> None:
+@pytest.mark.anyio
+async def test_mcp_tool_call_failure_is_reported_in_workspace(
+    tmp_path, monkeypatch
+) -> None:
     monkeypatch.setenv("FLOWENT_DATA_DIR", str(tmp_path / "data"))
     captured_requests: list[dict[str, object]] = []
     transport = FakeMcpTransport()
@@ -686,6 +730,12 @@ def test_mcp_tool_call_failure_is_reported_in_workspace(tmp_path, monkeypatch) -
     )
     configure_provider(client)
     client.put("/api/mcp/servers", json=command_server_payload())
+    connected = await wait_for_status(
+        client.app.state.mcp_manager,
+        StoredMcpServer.model_validate(command_server_payload()),
+        "ready",
+    )
+    assert connected.status == "ready"
 
     response = client.post("/api/workspace/respond", json={"content": "Use MCP"})
 
@@ -720,3 +770,19 @@ async def test_mcp_server_reload_reconnects_saved_enabled_servers(
     assert connected.status == "ready"
     assert connected.tools[0].name == "read_file"
     assert transport.connect_calls[0].id == "mcp-files"
+
+
+@pytest.mark.anyio
+async def test_enabled_mcp_server_save_does_not_block_response(
+    tmp_path, monkeypatch
+) -> None:
+    monkeypatch.setenv("FLOWENT_DATA_DIR", str(tmp_path))
+    transport = FakeMcpTransport()
+    transport.sleep_on_connect.add("mcp-files")
+    client = TestClient(create_app(serve_frontend=False, mcp_transport=transport))
+
+    response = client.put("/api/mcp/servers", json=command_server_payload())
+
+    assert response.status_code == 200
+    assert response.json()["status"] == "starting"
+    assert response.json()["tools"] == []

package/backend/tests/test_patch.py

@@ -0,0 +1,112 @@
+import pytest
+
+from flowent.patch import PatchError, affected_paths, apply_patch
+
+
+def test_apply_patch_applies_context_hunk_with_interleaved_changes(tmp_path) -> None:
+    target = tmp_path / "notes.txt"
+    target.write_text("start\nalpha\nmiddle\nbeta\nend\n")
+    patch = """*** Begin Patch
+*** Update File: notes.txt
+@@
+ start
+-alpha
++one
+ middle
+-beta
++two
+ end
+*** End Patch
+"""
+
+    result = apply_patch(patch, tmp_path)
+
+    assert result == {"files": [{"path": str(target), "status": "modified"}]}
+    assert target.read_text() == "start\none\nmiddle\ntwo\nend\n"
+
+
+def test_apply_patch_reports_context_mismatch(tmp_path) -> None:
+    target = tmp_path / "notes.txt"
+    target.write_text("start\nalpha\nend\n")
+    patch = """*** Begin Patch
+*** Update File: notes.txt
+@@
+ missing
+-alpha
++beta
+ end
+*** End Patch
+"""
+
+    with pytest.raises(PatchError, match=r"Patch context was not found\."):
+        apply_patch(patch, tmp_path)
+
+    assert target.read_text() == "start\nalpha\nend\n"
+
+
+def test_apply_patch_applies_multiple_hunks_in_order(tmp_path) -> None:
+    target = tmp_path / "notes.txt"
+    target.write_text("first\nsame\nend first\nsecond\nsame\nend second\n")
+    patch = """*** Begin Patch
+*** Update File: notes.txt
+@@
+ first
+-same
++one
+ end first
+@@
+ second
+-same
++two
+ end second
+*** End Patch
+"""
+
+    apply_patch(patch, tmp_path)
+
+    assert target.read_text() == "first\none\nend first\nsecond\ntwo\nend second\n"
+
+
+def test_apply_patch_keeps_simple_contiguous_replacement(tmp_path) -> None:
+    target = tmp_path / "notes.txt"
+    target.write_text("alpha\nbeta\n")
+    patch = """*** Begin Patch
+*** Update File: notes.txt
+@@
+-alpha
+-beta
++ready
+*** End Patch
+"""
+
+    apply_patch(patch, tmp_path)
+
+    assert target.read_text() == "ready\n"
+
+
+def test_affected_paths_reads_structured_patch_write_targets(tmp_path) -> None:
+    patch = """*** Begin Patch
+*** Update File: notes.txt
+@@
+-alpha
++beta
+*** Add File: created.txt
++hello
+*** Delete File: old.txt
+*** Update File: before.txt
+*** Move to: after.txt
+@@
+-before
++after
+*** End Patch
+"""
+
+    paths = affected_paths(patch, tmp_path)
+
+    assert paths == [
+        (tmp_path / "notes.txt").resolve(strict=False),
+        (tmp_path / "created.txt").resolve(strict=False),
+        (tmp_path / "old.txt").resolve(strict=False),
+        (tmp_path / "before.txt").resolve(strict=False),
+        (tmp_path / "after.txt").resolve(strict=False),
+    ]