feat: v0.6.0 — read build_stream log instead of dropping it (#2)

DSM emits a readable plaintext build log over the build_stream HTTP body (one short status line per step) and closes the connection when the build is done. The 0.2.5 implementation sent the request and dropped the body unread, leaving users with nothing more than a BUILD_FAILED polling status and no actionable diagnostic. DsmClient.trigger_build_stream now consumes the body line-by-line and returns the collected log as a string. Wall-clock budget of 210 s (under the Claude Desktop ~4 min ceiling); on timeout the partial log is returned with a "[build_stream: timeout — stream still open server-side]" marker so callers know the build continues server-side. Per-chunk ReadTimeout is treated the same way. JSON error envelope, transport-error mapping (M-4), and SID-scrubbed HTTP-error formatting are unchanged. redeploy_project and create_project now parse the returned log via _parse_build_stream_log (any line containing "Error response from daemon:" or ending in " Error" counts as a failure). On a failed log the tools abort immediately, surface the daemon line(s) in the result (e.g. "Error response from daemon: manifest for nginx:9.9.9 not found: manifest unknown"), and skip the polling step. The BUILD_FAILED polling guard (M-5) stays as a second safety net for late failures where the stream was clean but the container exited after start. No new MCP tool: the build log is a live stream and cannot be re-fetched after the build ends, so it is surfaced during redeploy_project / create_project rather than exposed as a standalone get_project_build_log call. Minor version bump because redeploy_project and create_project return materially different strings on a failed build and exit earlier in the failure path. Signatures unchanged. Tests: streamed-log collection, daemon-error log, header ReadTimeout marker, per-chunk ReadTimeout partial log, wall-clock budget truncation, _parse_build_stream_log unit tests, redeploy/create end- to-end behavior with a failing log. Closes #2 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-18 13:58:55 +02:00
parent 18fe063691
commit 036429e9bf
8 changed files with 441 additions and 54 deletions
@@ -210,6 +210,7 @@ def make_stateful_redeploy_mock(
    initial_status: str,
    stop_raises=None,
    build_stream_raises=None,
+    build_stream_log: str = "",
 ):
    """Create a stateful client mock for redeploy tests.

@@ -235,6 +236,7 @@ def make_stateful_redeploy_mock(
        if build_stream_raises:
            raise build_stream_raises
        build_done = True  # After build_stream, polling returns RUNNING
+        return build_stream_log

    client.request.side_effect = mock_request
    client.trigger_build_stream = AsyncMock(side_effect=mock_trigger_build_stream)
@@ -346,6 +348,7 @@ async def test_redeploy_poll_timeout():
    async def mock_build_stream(project_id):
        nonlocal build_done
        build_done = True
+        return ""

    client.request.side_effect = mock_request
    client.trigger_build_stream = AsyncMock(side_effect=mock_build_stream)
@@ -374,7 +377,7 @@ async def test_redeploy_unknown_status_returns_error():
        return {}

    client.request.side_effect = mock_request
-    client.trigger_build_stream = AsyncMock()
+    client.trigger_build_stream = AsyncMock(return_value="")
    tools = make_projects_tools(client)

    result = await tools["redeploy_project"]("myapp", confirmed=True)
@@ -435,6 +438,111 @@ async def test_redeploy_build_stream_error_on_stopped_project_keeps_old_workarou
    assert "was stopped before this error" not in result


+# ──────────────────────────────────────────────────────────────────────
+#  Issue #2: surface build_stream daemon errors directly
+# ──────────────────────────────────────────────────────────────────────
+
+
+def test_parse_build_stream_log_extracts_errors_and_info():
+    """The helper splits a streamed build log into error and info lines."""
+    from mcp_synology_container.modules.projects import _parse_build_stream_log
+
+    log = (
+        "Container vault Pulling\n"
+        "nginx Error\n"
+        "Error response from daemon: manifest for nginx:9.9.9 not found: "
+        "manifest unknown\n"
+        "\n"
+        "Container vault Running\n"
+    )
+
+    errors, info = _parse_build_stream_log(log)
+
+    assert errors == [
+        "nginx Error",
+        ("Error response from daemon: manifest for nginx:9.9.9 not found: manifest unknown"),
+    ]
+    assert info == ["Container vault Pulling", "Container vault Running"]
+
+
+def test_parse_build_stream_log_clean_log_no_errors():
+    from mcp_synology_container.modules.projects import _parse_build_stream_log
+
+    log = "Container vault Running\nContainer vault-db Running\n"
+    errors, info = _parse_build_stream_log(log)
+
+    assert errors == []
+    assert info == ["Container vault Running", "Container vault-db Running"]
+
+
+@pytest.mark.asyncio
+async def test_redeploy_surfaces_build_stream_daemon_error():
+    """build_stream log containing 'Error response from daemon:' aborts redeploy
+    with that line visible — and skips the polling step entirely."""
+    client, calls = make_stateful_redeploy_mock(
+        "RUNNING",
+        build_stream_log=(
+            "nginx Error\n"
+            "Error response from daemon: manifest for nginx:9.9.9-nonexistent "
+            "not found: manifest unknown\n"
+        ),
+    )
+    tools = make_projects_tools(client)
+
+    with patch("mcp_synology_container.modules.projects.asyncio.sleep"):
+        result = await tools["redeploy_project"]("myapp", confirmed=True)
+
+    assert "Build failed" in result
+    assert "Error response from daemon: manifest for nginx:9.9.9-nonexistent" in result
+    assert "redeploy aborted" in result
+    assert "redeployed successfully" not in result
+
+    # Recovery hint must appear because the project was stopped first.
+    assert "was stopped before this error" in result
+
+    # The polling step must NOT run — build_stream errors short-circuit.
+    methods = [m for _, m in calls]
+    list_calls = [m for m in methods if m == "list"]
+    assert len(list_calls) == 1  # only the initial _find_project lookup
+
+
+@pytest.mark.asyncio
+async def test_redeploy_clean_log_proceeds_to_polling():
+    """A clean build_stream log keeps the original happy-path behavior."""
+    client, calls = make_stateful_redeploy_mock(
+        "RUNNING",
+        build_stream_log="Container myapp Pulling\nContainer myapp Running\n",
+    )
+    tools = make_projects_tools(client)
+
+    with patch("mcp_synology_container.modules.projects.asyncio.sleep"):
+        result = await tools["redeploy_project"]("myapp", confirmed=True)
+
+    assert "redeployed successfully" in result
+
+
+@pytest.mark.asyncio
+async def test_create_project_surfaces_build_stream_daemon_error():
+    """build_stream log with daemon error → registered-but-failed-to-build hint."""
+    client, calls = make_create_project_client(
+        build_stream_log=(
+            "web Error\n"
+            "Error response from daemon: manifest for nginx:0.0.0-bad not found: "
+            "manifest unknown\n"
+        ),
+    )
+    tools = make_projects_tools(client)
+
+    with patch("mcp_synology_container.modules.projects.asyncio.sleep"):
+        result = await tools["create_project"]("newapp", SIMPLE_COMPOSE, confirmed=True)
+
+    assert "Build failed" in result
+    assert "Error response from daemon: manifest for nginx:0.0.0-bad" in result
+    assert "is registered but failed to build" in result
+    assert "redeploy_project" in result
+    assert "created and started successfully" not in result
+
+
 # ──────────────────────────────────────────────────────────────────────
 #  M-5: polling exits early on BUILD_FAILED / ERROR
 # ──────────────────────────────────────────────────────────────────────
@@ -501,6 +609,7 @@ async def test_redeploy_surfaces_build_failed_with_hint():
    async def mock_build_stream(project_id):
        nonlocal build_done
        build_done = True
+        return ""  # Clean stream log — failure surfaces via polling.

    client.request.side_effect = mock_request
    client.trigger_build_stream = AsyncMock(side_effect=mock_build_stream)
@@ -539,6 +648,7 @@ def make_create_project_client(
    create_folder_raises: Exception | None = None,
    create_project_raises: Exception | None = None,
    build_stream_raises: Exception | None = None,
+    build_stream_log: str = "",
    project_id: str = "uuid-new",
    final_status: str = "RUNNING",
 ):
@@ -588,6 +698,7 @@ def make_create_project_client(
        calls.append(("SYNO.Docker.Project", "build_stream", {"id": pid}))
        if build_stream_raises:
            raise build_stream_raises
+        return build_stream_log

    client.request.side_effect = mock_request
    client.post_request.side_effect = mock_post_request