create-windy 0.3.18 → 0.3.19

package/dist/cli.js

@@ -7368,6 +7368,11 @@ var recipes = [
     id: "starter-0.3.17-to-0.3.18",
     from: "0.3.17",
     to: "0.3.18"
+  },
+  {
+    id: "starter-0.3.18-to-0.3.19",
+    from: "0.3.18",
+    to: "0.3.19"
   }
 ];
 function resolveRecipeChain(sourceVersion, targetVersion) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-windy",
-  "version": "0.3.18",
+  "version": "0.3.19",
   "description": "创建单组织、单租户、私有部署优先的 Windy 企业 Dashboard Starter",
   "type": "module",
   "bin": {

package/template/.windy-template.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
-  "templateCommit": "f1470acc1588deb087d3144a76b0729affed0988",
-  "generatorVersion": "0.3.18",
+  "templateCommit": "45fdbe8e2a55dff118933af58a60976e9bfe318c",
+  "generatorVersion": "0.3.19",
   "modules": [
     {
       "name": "system",

package/template/apps/agent-server/src/southwind_agent_server/adk_debug.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import asyncio
 import json
 import os
 import uuid
@@ -15,6 +16,8 @@ from .config import normalize_base_url
 MAX_QUESTION_LENGTH = 4_000
 MAX_VISIBLE_EVENTS = 64
 MAX_EVENT_FRAME_BYTES = 64 * 1024
+DEFAULT_RESULT_POLL_TIMEOUT_SECONDS = 60.0
+DEFAULT_RESULT_POLL_INTERVAL_SECONDS = 0.5
 
 
 @dataclass(frozen=True)
@@ -99,11 +102,19 @@ class CanonicalRunDebugClient:
         bearer_token: str,
         *,
         transport: httpx.AsyncBaseTransport | None = None,
+        result_poll_timeout_seconds: float = DEFAULT_RESULT_POLL_TIMEOUT_SECONDS,
+        result_poll_interval_seconds: float = DEFAULT_RESULT_POLL_INTERVAL_SECONDS,
     ) -> None:
         self._operation_key = operation_key
         self._base_url = normalize_base_url(base_url)
         self._bearer_token = bearer_token.strip()
         self._transport = transport
+        if not 0 <= result_poll_timeout_seconds <= 120:
+            raise ValueError("result_poll_timeout_seconds 必须在 0 到 120 秒之间")
+        if not 0 < result_poll_interval_seconds <= 1:
+            raise ValueError("result_poll_interval_seconds 必须大于 0 且不超过 1 秒")
+        self._result_poll_timeout_seconds = result_poll_timeout_seconds
+        self._result_poll_interval_seconds = result_poll_interval_seconds
         if not self._bearer_token:
             raise RuntimeError("ADK_DEBUG_PLATFORM_TOKEN 未配置，拒绝启动真实调试 Run")
 
@@ -142,13 +153,35 @@ class CanonicalRunDebugClient:
             )
             run_id = read_run_id(started)
             events = await collect_compact_events(self._events(client, run_id))
-            result = await client.get(
-                f"api/agent/runs/{run_id}/result",
-                params={"operationKey": self._operation_key},
-            )
+            try:
+                async with asyncio.timeout(self._result_poll_timeout_seconds):
+                    while True:
+                        result = await client.get(
+                            f"api/agent/runs/{run_id}/result",
+                            params={"operationKey": self._operation_key},
+                        )
+                        if result.is_success:
+                            break
+                        try:
+                            error = result.json()
+                        except json.JSONDecodeError:
+                            error = None
+                        if (
+                            result.status_code != 409
+                            or not isinstance(error, dict)
+                            or error.get("code") != "RUN_CONFLICT"
+                            or error.get("retryable") is not True
+                        ):
+                            raise RuntimeError("平台 Agent Run 永久失败或结果读取失败")
+                        await asyncio.sleep(self._result_poll_interval_seconds)
+            except TimeoutError as error:
+                raise RuntimeError("平台 Agent Run 结果等待超时") from error
+        answer = read_text_output(result, run_id)
+        if not any(event.get("type") == "run.completed" for event in events):
+            events = [*events[: MAX_VISIBLE_EVENTS - 1], {"type": "run.completed"}]
         return {
             "runId": run_id,
-            "answer": read_text_output(result, run_id),
+            "answer": answer,
             "events": events,
         }
 

package/template/apps/agent-server/tests/test_adk_debug_result_polling.py

@@ -0,0 +1,139 @@
+from __future__ import annotations
+
+import asyncio
+
+import httpx
+import pytest
+
+from southwind_agent_server.adk_debug import CanonicalRunDebugClient
+
+OPERATION_KEY = "customer.copilot.global"
+
+
+async def test_client_waits_for_result_after_stream_closes() -> None:
+    result_attempts = 0
+    started_runs = 0
+
+    async def handler(request: httpx.Request) -> httpx.Response:
+        nonlocal result_attempts, started_runs
+        if request.url.path == "/api/agent/runs":
+            started_runs += 1
+            return httpx.Response(200, json={"runId": "run_race"})
+        if request.url.path.endswith("/events"):
+            return httpx.Response(
+                200,
+                content=(
+                    b'event: run.started\ndata: {"sequence":1,"type":"run.started"}\n\n'
+                ),
+            )
+        if request.url.path.endswith("/result"):
+            result_attempts += 1
+            if result_attempts < 3:
+                return httpx.Response(
+                    409,
+                    json={"code": "RUN_CONFLICT", "retryable": True},
+                )
+            return httpx.Response(
+                200,
+                json={
+                    "runId": "run_race",
+                    "status": "completed",
+                    "output": {"text": "稍后可读"},
+                },
+            )
+        raise AssertionError(request.url)
+
+    client = CanonicalRunDebugClient(
+        OPERATION_KEY,
+        "https://platform.test",
+        "developer-token",
+        transport=httpx.MockTransport(handler),
+        result_poll_interval_seconds=0.001,
+    )
+
+    result = await client.run("验证竞态")
+
+    assert result["answer"] == "稍后可读"
+    events = result["events"]
+    assert isinstance(events, list) and {"type": "run.completed"} in events
+    assert started_runs == 1
+    assert result_attempts == 3
+
+
+@pytest.mark.parametrize(
+    ("payload", "timeout_seconds", "delay_seconds", "message"),
+    [
+        (
+            {
+                "code": "RUN_CANCELLED",
+                "message": "secret-upstream-body",
+                "retryable": False,
+            },
+            5,
+            0,
+            "永久失败",
+        ),
+        (
+            {
+                "code": "RUN_CONFLICT",
+                "message": "Agent Run 尚未完成",
+                "retryable": True,
+            },
+            0.01,
+            0,
+            "等待超时",
+        ),
+        (
+            {
+                "code": "RUN_CONFLICT",
+                "message": "slow-secret-upstream-body",
+                "retryable": True,
+            },
+            0.01,
+            0.05,
+            "等待超时",
+        ),
+    ],
+)
+async def test_client_bounds_result_polling_and_hides_error_content(
+    payload: dict[str, object],
+    timeout_seconds: float,
+    delay_seconds: float,
+    message: str,
+) -> None:
+    requests: list[httpx.Request] = []
+
+    async def handler(request: httpx.Request) -> httpx.Response:
+        requests.append(request)
+        if request.url.path == "/api/agent/runs":
+            return httpx.Response(200, json={"runId": "run_terminal"})
+        if request.url.path.endswith("/events"):
+            return httpx.Response(
+                200,
+                content=(
+                    b"event: run.completed\ndata: "
+                    b'{"sequence":1,"type":"run.completed"}\n\n'
+                ),
+            )
+        if request.url.path.endswith("/result"):
+            await asyncio.sleep(delay_seconds)
+            return httpx.Response(409, json=payload)
+        raise AssertionError(request.url)
+
+    client = CanonicalRunDebugClient(
+        OPERATION_KEY,
+        "https://platform.test",
+        "developer-token",
+        transport=httpx.MockTransport(handler),
+        result_poll_timeout_seconds=timeout_seconds,
+        result_poll_interval_seconds=0.001,
+    )
+
+    with pytest.raises(RuntimeError, match=message) as failure:
+        await client.run("验证结果失败")
+
+    error_message = str(failure.value)
+    assert "secret-upstream-body" not in error_message
+    assert "slow-secret-upstream-body" not in error_message
+    assert sum(request.url.path == "/api/agent/runs" for request in requests) == 1
+    assert sum(request.url.path.endswith("/result") for request in requests) >= 1

package/template/docs/platform/agent-runtime.md

@@ -240,6 +240,8 @@ Operation Key 与真实开发数据用户注入 Windy-owned `docker-compose.agen
   不连接业务 Repository 或 Tool Host；
 - 正式 Server 仍签发 Actor、Scope 和短时 Execution Grant，Agent Server 仍按
   `allowedToolKeys` 执行并审计；
+- SSE 先于结果持久化结束时，Adapter 最多再等待 60 秒并每 500ms 读取同一个 Run
+  的结果；只重试明确标记为可重试的 `RUN_CONFLICT`，不会重新创建 Run；
 - 事件摘要最多 64 条，单个 SSE frame 最大 64 KiB；流式 `output.delta` 只显示计数，
   客户端边读边压缩，不先把完整事件流保存在内存。