create-windy 0.6.12 → 0.6.15

package/template/packages/storage/src/memory-blob-store.ts

@@ -5,6 +5,7 @@ import {
   type ArtifactRef,
   type BlobStore,
   type PutBlobInput,
+  type PutBlobOnceInput,
   type ReadableBlob,
   type StoredBlob,
 } from "./blob-store.js";
@@ -19,39 +20,25 @@ export class MemoryBlobStore implements BlobStore {
   private readonly blobs = new Map<ArtifactRef, MemoryBlob>();
 
   async put(input: PutBlobInput): Promise<StoredBlob> {
-    const chunks: Uint8Array[] = [];
-    const hash = createSha256Accumulator();
-    let byteSize = 0;
-    const reader = input.body.getReader();
-    while (true) {
-      const result = await reader.read();
-      if (result.done) break;
-      const copy = Uint8Array.from(result.value);
-      chunks.push(copy);
-      hash.update(copy);
-      byteSize += copy.byteLength;
-    }
-    if (
-      input.expectedByteSize !== undefined &&
-      input.expectedByteSize !== byteSize
-    ) {
-      throw new BlobStoreError("SIZE_MISMATCH", "Blob 大小与声明不一致");
-    }
-    const contentHash = hash.digest();
-    if (
-      input.expectedContentHash &&
-      input.expectedContentHash.value !== contentHash.value
-    ) {
-      throw new BlobStoreError("HASH_MISMATCH", "Blob SHA-256 与声明不一致");
-    }
-    const ref = artifactRef(`blob_${randomUUID().replaceAll("-", "")}`);
-    const blob: MemoryBlob = {
-      ref,
-      byteSize,
-      contentHash,
-      createdAt: new Date().toISOString(),
-      bytes: join(chunks, byteSize),
-    };
+    return this.write(
+      artifactRef(`blob_${randomUUID().replaceAll("-", "")}`),
+      input,
+    );
+  }
+
+  async putOnce(input: PutBlobOnceInput): Promise<StoredBlob> {
+    const ref = artifactRef(input.ref);
+    const existing = this.blobs.get(ref);
+    if (existing) return requireExactBlob(existing, input);
+    const candidate = await readBlob(ref, input);
+    const concurrent = this.blobs.get(ref);
+    if (concurrent) return requireExactBlob(concurrent, input);
+    this.blobs.set(ref, candidate);
+    return metadata(candidate);
+  }
+
+  private async write(ref: ArtifactRef, input: PutBlobInput) {
+    const blob = await readBlob(ref, input);
     this.blobs.set(ref, blob);
     return metadata(blob);
   }
@@ -84,6 +71,59 @@ export class MemoryBlobStore implements BlobStore {
   }
 }
 
+async function readBlob(
+  ref: ArtifactRef,
+  input: PutBlobInput,
+): Promise<MemoryBlob> {
+  const chunks: Uint8Array[] = [];
+  const hash = createSha256Accumulator();
+  let byteSize = 0;
+  const reader = input.body.getReader();
+  while (true) {
+    const result = await reader.read();
+    if (result.done) break;
+    const copy = Uint8Array.from(result.value);
+    chunks.push(copy);
+    hash.update(copy);
+    byteSize += copy.byteLength;
+  }
+  if (
+    input.expectedByteSize !== undefined &&
+    input.expectedByteSize !== byteSize
+  ) {
+    throw new BlobStoreError("SIZE_MISMATCH", "Blob 大小与声明不一致");
+  }
+  const contentHash = hash.digest();
+  if (
+    input.expectedContentHash &&
+    input.expectedContentHash.value !== contentHash.value
+  ) {
+    throw new BlobStoreError("HASH_MISMATCH", "Blob SHA-256 与声明不一致");
+  }
+  return {
+    ref,
+    byteSize,
+    contentHash,
+    createdAt: new Date().toISOString(),
+    bytes: join(chunks, byteSize),
+  };
+}
+
+function requireExactBlob(blob: MemoryBlob, input: PutBlobOnceInput) {
+  if (
+    blob.ref !== input.ref ||
+    blob.byteSize !== input.expectedByteSize ||
+    blob.contentHash.algorithm !== input.expectedContentHash.algorithm ||
+    blob.contentHash.value !== input.expectedContentHash.value
+  ) {
+    throw new BlobStoreError(
+      "BLOB_IDENTITY_CONFLICT",
+      `Blob 稳定坐标冲突：${input.ref}`,
+    );
+  }
+  return metadata(blob);
+}
+
 function metadata(blob: MemoryBlob): StoredBlob {
   const { bytes: _bytes, ...value } = blob;
   return { ...value, contentHash: { ...value.contentHash } };

package/template/packages/storage/src/upload-streams.test.ts

@@ -0,0 +1,31 @@
+import { expect, test } from "bun:test";
+import { abortAwareStream } from "./upload-streams.js";
+
+test("兼容 Bun 缺少 releaseLock 和 cancel 的请求流实现", async () => {
+  const bodyWithoutReleaseLock = {
+    getReader: () => ({
+      read: async () => ({ done: true, value: undefined }),
+      cancel: async () => undefined,
+    }),
+  } as unknown as ReadableStream<Uint8Array>;
+  const completed = abortAwareStream(
+    bodyWithoutReleaseLock,
+    new AbortController().signal,
+  ).getReader();
+
+  await expect(completed.read()).resolves.toEqual({
+    done: true,
+    value: undefined,
+  });
+
+  const bodyWithoutCancel = {
+    getReader: () => ({
+      read: async () => ({ done: true, value: undefined }),
+      releaseLock: () => undefined,
+    }),
+  } as unknown as ReadableStream<Uint8Array>;
+
+  await expect(
+    abortAwareStream(bodyWithoutCancel, new AbortController().signal).cancel(),
+  ).resolves.toBeUndefined();
+});

package/template/packages/storage/src/upload-streams.ts

@@ -22,7 +22,7 @@ export function abortAwareStream(
           const result = await raceAbort(source.read(), signal);
           if (result.done) {
             finished = true;
-            source.releaseLock();
+            releaseReader(source);
             controller.close();
             return;
           }
@@ -40,7 +40,7 @@ export function abortAwareStream(
           await cancelReader(reader, reason);
           return;
         }
-        await body.cancel(reason).catch(() => undefined);
+        await cancelStream(body, reason);
       },
     },
     { highWaterMark: 0 },
@@ -69,7 +69,7 @@ export function concatBlobStreams(
         }
         const result = await current.read();
         if (result.done) {
-          current.releaseLock();
+          releaseReader(current);
           current = undefined;
           continue;
         }
@@ -101,7 +101,7 @@ export function guardFileSignature(
           while (prefixSize < requiredBytes) {
             const result = await source.read();
             if (result.done) {
-              source.releaseLock();
+              releaseReader(source);
               controller.error(signatureError());
               return;
             }
@@ -126,7 +126,7 @@ export function guardFileSignature(
         }
         const result = await source.read();
         if (result.done) {
-          source.releaseLock();
+          releaseReader(source);
           controller.close();
         } else {
           controller.enqueue(result.value);
@@ -137,7 +137,7 @@ export function guardFileSignature(
           await cancelReader(reader, reason);
           return;
         }
-        await body.cancel(reason).catch(() => undefined);
+        await cancelStream(body, reason);
       },
     },
     { highWaterMark: 0 },
@@ -217,3 +217,17 @@ async function cancelReader(
     }
   }
 }
+
+async function cancelStream(
+  stream: ReadableStream<Uint8Array>,
+  reason?: unknown,
+): Promise<void> {
+  const cancel = stream.cancel;
+  if (typeof cancel !== "function") return;
+  await cancel.call(stream, reason).catch(() => undefined);
+}
+
+function releaseReader(reader: ReadableStreamDefaultReader<Uint8Array>): void {
+  const releaseLock = reader.releaseLock;
+  if (typeof releaseLock === "function") releaseLock.call(reader);
+}

package/template/apps/agent-server/adk_web_agents/__init__.py

@@ -1 +0,0 @@
-"""Developer-only ADK Web agents."""

package/template/apps/agent-server/adk_web_agents/canonical_debug/__init__.py

@@ -1 +0,0 @@
-"""Developer-only canonical Run bridge for ADK Web."""

package/template/apps/agent-server/adk_web_agents/canonical_debug/agent.py

@@ -1,145 +0,0 @@
-from __future__ import annotations
-
-import json
-from collections.abc import AsyncGenerator
-from typing import cast
-
-from google.adk.agents import LlmAgent
-from google.adk.models.base_llm import BaseLlm
-from google.adk.models.llm_request import LlmRequest
-from google.adk.models.llm_response import LlmResponse
-from google.adk.tools.tool_context import ToolContext
-from google.genai import types
-
-from southwind_agent_server.adk_debug import (
-    CanonicalRunDebugClient,
-    TextOperationDebugConfig,
-    load_text_operation_debug_config,
-)
-from southwind_agent_server.adk_debug_sessions import (
-    IMPORTED_SESSION_STATE_KEY,
-    ImportedDebugSessionReadOnlyError,
-)
-
-TOOL_NAME = "run_canonical_operation"
-PROJECT_OPERATION = load_text_operation_debug_config()
-
-
-async def run_canonical_operation(
-    question: str, tool_context: ToolContext
-) -> dict[str, object]:
-    """Run the project-selected text Operation through canonical platform APIs."""
-    ensure_debug_session_writable(tool_context.state.get(IMPORTED_SESSION_STATE_KEY))
-    if PROJECT_OPERATION is None:
-        raise RuntimeError("项目尚未选择可调试的文本 Operation")
-    return await CanonicalRunDebugClient.from_environment(
-        PROJECT_OPERATION.operation_key
-    ).run(question)
-
-
-def ensure_debug_session_writable(imported_marker: object) -> None:
-    if imported_marker is True:
-        raise ImportedDebugSessionReadOnlyError(
-            "导入的业务会话是实时只读投影；请新建本地会话继续提问"
-        )
-
-
-class CanonicalDebugLlm(BaseLlm):
-    """ADK dispatcher; real model and Tool execution stay in canonical Run."""
-
-    def __init__(self, operation: TextOperationDebugConfig | None) -> None:
-        super().__init__(model="windy-canonical-run-bridge")
-        self._operation = operation
-
-    async def generate_content_async(
-        self,
-        llm_request: LlmRequest,
-        stream: bool = False,
-    ) -> AsyncGenerator[LlmResponse, None]:
-        del stream
-        question, user_turn_index = latest_user_turn(llm_request)
-        tool_response = latest_tool_response(llm_request, user_turn_index)
-        if tool_response is not None:
-            yield text_response(render_result(tool_response))
-            return
-        if self._operation is None:
-            yield text_response(
-                "项目尚未在 apps/agent-server/project/adk-web-debug.json "
-                "选择真实文本 Operation。"
-            )
-            return
-        if not question:
-            yield text_response("请输入要交给真实 Agent Runtime 调试的业务问题。")
-            return
-        yield LlmResponse(
-            content=types.Content(
-                role="model",
-                parts=[
-                    types.Part(
-                        function_call=types.FunctionCall(
-                            name=TOOL_NAME,
-                            args={"question": question},
-                        )
-                    )
-                ],
-            ),
-            partial=False,
-        )
-
-
-def latest_user_turn(request: LlmRequest) -> tuple[str, int]:
-    for index in range(len(request.contents) - 1, -1, -1):
-        content = request.contents[index]
-        if content.role != "user":
-            continue
-        text = "".join(part.text or "" for part in content.parts or [])
-        if text.strip():
-            return text.strip(), index
-    return "", -1
-
-
-def latest_tool_response(
-    request: LlmRequest, user_turn_index: int
-) -> dict[str, object] | None:
-    if user_turn_index < 0:
-        return None
-    for content in reversed(request.contents[user_turn_index + 1 :]):
-        for part in content.parts or []:
-            response = part.function_response
-            if response and response.name == TOOL_NAME:
-                return cast(dict[str, object], response.response or {})
-    return None
-
-
-def render_result(value: dict[str, object]) -> str:
-    answer = value.get("answer")
-    run_id = value.get("runId")
-    events = value.get("events")
-    if not isinstance(answer, str) or not isinstance(run_id, str):
-        return "真实 Agent 调试 Run 返回了无效结果。"
-    trace = json.dumps(events if isinstance(events, list) else [], ensure_ascii=False)
-    return f"{answer}\n\n---\n调试 Run：{run_id}\n事件摘要：{trace}"
-
-
-def text_response(text: str) -> LlmResponse:
-    return LlmResponse(
-        content=types.Content(role="model", parts=[types.Part(text=text)]),
-        partial=False,
-    )
-
-
-def build_root_agent(
-    operation: TextOperationDebugConfig | None,
-) -> LlmAgent:
-    return LlmAgent(
-        name="canonical_debug",
-        model=CanonicalDebugLlm(operation),
-        instruction=(
-            "每个业务问题都必须经 run_canonical_operation 交给 canonical Run；"
-            "不得自行回答、不得访问数据库或绕过平台授权。"
-        ),
-        tools=[run_canonical_operation] if operation else [],
-    )
-
-
-root_agent = build_root_agent(PROJECT_OPERATION)

package/template/apps/agent-server/adk_web_agents/safe_debug/__init__.py

@@ -1,3 +0,0 @@
-from .agent import root_agent
-
-__all__ = ["root_agent"]

package/template/apps/agent-server/adk_web_agents/safe_debug/agent.py

@@ -1,40 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import AsyncGenerator
-
-from google.adk.agents import LlmAgent
-from google.adk.models.base_llm import BaseLlm
-from google.adk.models.llm_request import LlmRequest
-from google.adk.models.llm_response import LlmResponse
-from google.genai import types
-
-
-class SafeDebugLlm(BaseLlm):
-    async def generate_content_async(
-        self,
-        llm_request: LlmRequest,
-        stream: bool = False,
-    ) -> AsyncGenerator[LlmResponse, None]:
-        del llm_request, stream
-        text = (
-            "这是 Windy 的 ADK 开发调试 Agent。"
-            "它不连接业务 Repository、Tool Host 或模型 Provider，"
-            "不能代表生产业务 Operation。"
-        )
-        yield LlmResponse(
-            content=types.Content(
-                role="model",
-                parts=[types.Part(text=text)],
-            ),
-            partial=False,
-        )
-
-
-root_agent = LlmAgent(
-    name="safe_debug",
-    model=SafeDebugLlm(model="windy-safe-debug"),
-    instruction=(
-        "仅说明开发调试边界；不访问业务数据，不调用 Tool，不连接模型 Provider。"
-    ),
-    tools=[],
-)

package/template/apps/agent-server/adk_web_agents/services.py

@@ -1,25 +0,0 @@
-from __future__ import annotations
-
-from typing import Any
-
-from google.adk.cli.service_registry import get_service_registry
-
-from southwind_agent_server.adk_debug_sessions import (
-    WindyDebugSessionClientV1,
-    WindyDebugSessionServiceV1,
-)
-
-SESSION_SERVICE_URI = "windy-debug://v1"
-
-
-def create_windy_debug_session_service(
-    uri: str, **_kwargs: Any
-) -> WindyDebugSessionServiceV1:
-    if uri != SESSION_SERVICE_URI:
-        raise ValueError("Windy ADK debug session URI 版本不受支持")
-    return WindyDebugSessionServiceV1(WindyDebugSessionClientV1.from_environment())
-
-
-get_service_registry().register_session_service(
-    "windy-debug", create_windy_debug_session_service
-)

package/template/apps/agent-server/project/adk-web-debug.json

@@ -1,4 +0,0 @@
-{
-  "schemaVersion": 1,
-  "textOperation": null
-}