create-windy 0.8.1 → 0.8.2

package/dist/cli.js

@@ -33,7 +33,7 @@ var __toESM = (mod, isNodeMode, target) => {
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __require = import.meta.require;
 
-// ../../node_modules/cli-width/index.js
+// ../../node_modules/.bun/cli-width@4.1.0/node_modules/cli-width/index.js
 var require_cli_width = __commonJS((exports, module2) => {
   module2.exports = cliWidth;
   function normalizeOpts(options) {
@@ -73,7 +73,7 @@ var require_cli_width = __commonJS((exports, module2) => {
   }
 });
 
-// ../../node_modules/mute-stream/lib/index.js
+// ../../node_modules/.bun/mute-stream@3.0.0/node_modules/mute-stream/lib/index.js
 var require_lib = __commonJS((exports, module2) => {
   var Stream = __require("stream");
 
@@ -4677,7 +4677,7 @@ function isMissing6(error) {
 import { createInterface as createInterface2 } from "readline/promises";
 import { stdin, stdout } from "process";
 
-// ../../node_modules/@inquirer/core/dist/lib/key.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/key.js
 var keybindings = ["emacs", "vim"];
 var keybindingLookup = new Set(keybindings);
 function isKeybinding(value) {
@@ -4694,7 +4694,7 @@ var isDownKey = (key, keybindings2 = []) => key.name === "down" || keybindings2.
 var isSpaceKey = (key) => key.name === "space";
 var isNumberKey = (key) => "1234567890".includes(key.name);
 var isEnterKey = (key) => key.name === "enter" || key.name === "return";
-// ../../node_modules/@inquirer/core/dist/lib/errors.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/errors.js
 class AbortPromptError extends Error {
   name = "AbortPromptError";
   message = "Prompt was aborted";
@@ -4720,10 +4720,10 @@ class HookError extends Error {
 class ValidationError extends Error {
   name = "ValidationError";
 }
-// ../../node_modules/@inquirer/core/dist/lib/use-state.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/use-state.js
 import { AsyncResource as AsyncResource2 } from "async_hooks";
 
-// ../../node_modules/@inquirer/core/dist/lib/hook-engine.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/hook-engine.js
 import { AsyncLocalStorage, AsyncResource } from "async_hooks";
 var hookStorage = new AsyncLocalStorage;
 function createStore(rl) {
@@ -4828,7 +4828,7 @@ var effectScheduler = {
   }
 };
 
-// ../../node_modules/@inquirer/core/dist/lib/use-state.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/use-state.js
 function isFactory(value) {
   return typeof value === "function";
 }
@@ -4849,7 +4849,7 @@ function useState(defaultValue) {
   });
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/use-effect.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/use-effect.js
 function useEffect(cb, depArray) {
   withPointer((pointer) => {
     const oldDeps = pointer.get();
@@ -4861,10 +4861,10 @@ function useEffect(cb, depArray) {
   });
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/theme.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/theme.js
 import { styleText } from "util";
 
-// ../../node_modules/@inquirer/figures/dist/index.js
+// ../../node_modules/.bun/@inquirer+figures@2.0.7/node_modules/@inquirer/figures/dist/index.js
 import process2 from "process";
 function isUnicodeSupported() {
   if (!process2.platform.startsWith("win")) {
@@ -5153,7 +5153,7 @@ var figures = shouldUseMain ? mainSymbols : fallbackSymbols;
 var dist_default = figures;
 var replacements = Object.entries(specialMainSymbols);
 
-// ../../node_modules/@inquirer/core/dist/lib/theme.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/theme.js
 var defaultTheme = {
   prefix: {
     idle: styleText("blue", "?"),
@@ -5181,7 +5181,7 @@ function getDefaultTheme() {
   };
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/make-theme.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/make-theme.js
 function isPlainObject(value) {
   if (typeof value !== "object" || value === null)
     return false;
@@ -5209,7 +5209,7 @@ function makeTheme(...themes) {
   return deepMerge(...themesToMerge);
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/use-prefix.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/use-prefix.js
 function usePrefix({ status = "idle", theme }) {
   const [showLoader, setShowLoader] = useState(false);
   const [tick, setTick] = useState(0);
@@ -5239,7 +5239,7 @@ function usePrefix({ status = "idle", theme }) {
   const iconName = status === "loading" ? "idle" : status;
   return typeof prefix === "string" ? prefix : prefix[iconName] ?? prefix["idle"];
 }
-// ../../node_modules/@inquirer/core/dist/lib/use-memo.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/use-memo.js
 function useMemo(fn, dependencies) {
   return withPointer((pointer) => {
     const prev = pointer.get();
@@ -5251,12 +5251,12 @@ function useMemo(fn, dependencies) {
     return prev.value;
   });
 }
-// ../../node_modules/@inquirer/core/dist/lib/use-ref.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/use-ref.js
 function useRef(val) {
   return useState({ current: val })[0];
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/use-keypress.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/use-keypress.js
 function useKeypress(userHandler) {
   const signal = useRef(userHandler);
   signal.current = userHandler;
@@ -5274,10 +5274,10 @@ function useKeypress(userHandler) {
     };
   }, []);
 }
-// ../../node_modules/@inquirer/core/dist/lib/utils.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/utils.js
 var import_cli_width = __toESM(require_cli_width(), 1);
 
-// ../../node_modules/fast-string-truncated-width/dist/utils.js
+// ../../node_modules/.bun/fast-string-truncated-width@3.0.3/node_modules/fast-string-truncated-width/dist/utils.js
 var getCodePointsLength = (() => {
   const SURROGATE_PAIR_RE = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g;
   return (input) => {
@@ -5296,7 +5296,7 @@ var isWideNotCJKTNotEmoji = (x) => {
   return x === 8987 || x === 9001 || x >= 12272 && x <= 12287 || x >= 12289 && x <= 12350 || x >= 12441 && x <= 12543 || x >= 12549 && x <= 12591 || x >= 12593 && x <= 12686 || x >= 12688 && x <= 12771 || x >= 12783 && x <= 12830 || x >= 12832 && x <= 12871 || x >= 12880 && x <= 19903 || x >= 65040 && x <= 65049 || x >= 65072 && x <= 65106 || x >= 65108 && x <= 65126 || x >= 65128 && x <= 65131 || x >= 127488 && x <= 127490 || x >= 127504 && x <= 127547 || x >= 127552 && x <= 127560 || x >= 131072 && x <= 196605 || x >= 196608 && x <= 262141;
 };
 
-// ../../node_modules/fast-string-truncated-width/dist/index.js
+// ../../node_modules/.bun/fast-string-truncated-width@3.0.3/node_modules/fast-string-truncated-width/dist/index.js
 var ANSI_RE = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]|\u001b\]8;[^;]*;.*?(?:\u0007|\u001b\u005c)/y;
 var CONTROL_RE = /[\x00-\x08\x0A-\x1F\x7F-\x9F]{1,1000}/y;
 var CJKT_WIDE_RE = /(?:(?![\uFF61-\uFF9F\uFF00-\uFFEF])[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}\p{Script=Tangut}]){1,1000}/yu;
@@ -5395,7 +5395,7 @@ var getStringTruncatedWidth = (input, truncationOptions = {}, widthOptions = {})
 };
 var dist_default2 = getStringTruncatedWidth;
 
-// ../../node_modules/fast-string-width/dist/index.js
+// ../../node_modules/.bun/fast-string-width@3.0.2/node_modules/fast-string-width/dist/index.js
 var NO_TRUNCATION2 = {
   limit: Infinity,
   ellipsis: "",
@@ -5406,7 +5406,7 @@ var fastStringWidth = (input, options = {}) => {
 };
 var dist_default3 = fastStringWidth;
 
-// ../../node_modules/fast-wrap-ansi/lib/main.js
+// ../../node_modules/.bun/fast-wrap-ansi@0.2.2/node_modules/fast-wrap-ansi/lib/main.js
 var ESC = "\x1B";
 var CSI = "\x9B";
 var END_CODE = 39;
@@ -5618,7 +5618,7 @@ function wrapAnsi(string, columns, options) {
 `);
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/utils.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/utils.js
 function breakLines(content, width) {
   return content.split(`
 `).flatMap((line) => wrapAnsi(line, width, { trim: false, wordWrap: false }).split(`
@@ -5629,7 +5629,7 @@ function readlineWidth() {
   return import_cli_width.default({ defaultWidth: 80, output: readline().output });
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/pagination/use-pagination.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/pagination/use-pagination.js
 function usePointerPosition({ active, renderedItems, pageSize, loop }) {
   const state = useRef({
     lastPointer: active,
@@ -5695,12 +5695,12 @@ function usePagination({ items, active, renderItem, pageSize, loop = true }) {
   return pageBuffer.filter((line) => typeof line === "string").join(`
 `);
 }
-// ../../node_modules/@inquirer/core/dist/lib/create-prompt.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/create-prompt.js
 var import_mute_stream = __toESM(require_lib(), 1);
 import * as readline2 from "readline";
 import { AsyncResource as AsyncResource3 } from "async_hooks";
 
-// ../../node_modules/signal-exit/dist/mjs/signals.js
+// ../../node_modules/.bun/signal-exit@4.1.0/node_modules/signal-exit/dist/mjs/signals.js
 var signals = [];
 signals.push("SIGHUP", "SIGINT", "SIGTERM");
 if (process.platform !== "win32") {
@@ -5710,7 +5710,7 @@ if (process.platform === "linux") {
   signals.push("SIGIO", "SIGPOLL", "SIGPWR", "SIGSTKFLT");
 }
 
-// ../../node_modules/signal-exit/dist/mjs/index.js
+// ../../node_modules/.bun/signal-exit@4.1.0/node_modules/signal-exit/dist/mjs/index.js
 var processOk = (process3) => !!process3 && typeof process3 === "object" && typeof process3.removeListener === "function" && typeof process3.emit === "function" && typeof process3.reallyExit === "function" && typeof process3.listeners === "function" && typeof process3.kill === "function" && typeof process3.pid === "number" && typeof process3.on === "function";
 var kExitEmitter = Symbol.for("signal-exit emitter");
 var global = globalThis;
@@ -5908,10 +5908,10 @@ var {
   unload
 } = signalExitWrap(processOk(process3) ? new SignalExit(process3) : new SignalExitFallback);
 
-// ../../node_modules/@inquirer/core/dist/lib/screen-manager.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/screen-manager.js
 import { stripVTControlCharacters } from "util";
 
-// ../../node_modules/@inquirer/ansi/dist/index.js
+// ../../node_modules/.bun/@inquirer+ansi@2.0.7/node_modules/@inquirer/ansi/dist/index.js
 var ESC2 = "\x1B[";
 var cursorLeft = ESC2 + "G";
 var cursorHide = ESC2 + "?25l";
@@ -5927,7 +5927,7 @@ var cursorTo = (x, y) => {
 var eraseLine = ESC2 + "2K";
 var eraseLines = (lines) => lines > 0 ? (eraseLine + cursorUp(1)).repeat(lines - 1) + eraseLine + cursorLeft : "";
 
-// ../../node_modules/@inquirer/core/dist/lib/screen-manager.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/screen-manager.js
 var height = (content) => content.split(`
 `).length;
 var lastLine = (content) => content.split(`
@@ -5993,7 +5993,7 @@ class ScreenManager {
   }
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/promise-polyfill.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/promise-polyfill.js
 class PromisePolyfill extends Promise {
   static withResolver() {
     let resolve6;
@@ -6006,7 +6006,7 @@ class PromisePolyfill extends Promise {
   }
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/create-prompt.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/create-prompt.js
 import path from "path";
 var nativeSetImmediate = globalThis.setImmediate;
 function getCallSites() {
@@ -6117,7 +6117,7 @@ function createPrompt(view) {
   };
   return prompt;
 }
-// ../../node_modules/@inquirer/core/dist/lib/Separator.js
+// ../../node_modules/.bun/@inquirer+core@11.2.1+7cb241fc07b679d9/node_modules/@inquirer/core/dist/lib/Separator.js
 import { styleText as styleText2 } from "util";
 class Separator {
   separator = styleText2("dim", Array.from({ length: 15 }).join(dist_default.line));
@@ -6131,7 +6131,7 @@ class Separator {
     return Boolean(choice && typeof choice === "object" && "type" in choice && choice.type === "separator");
   }
 }
-// ../../node_modules/@inquirer/checkbox/dist/index.js
+// ../../node_modules/.bun/@inquirer+checkbox@5.2.1+7cb241fc07b679d9/node_modules/@inquirer/checkbox/dist/index.js
 import { styleText as styleText3 } from "util";
 var checkboxTheme = {
   icon: {
@@ -8529,7 +8529,8 @@ var recipes = [
     from: "0.7.0",
     to: "0.8.0"
   },
-  { id: "starter-0.8.0-to-0.8.1", from: "0.8.0", to: "0.8.1" }
+  { id: "starter-0.8.0-to-0.8.1", from: "0.8.0", to: "0.8.1" },
+  { id: "starter-0.8.1-to-0.8.2", from: "0.8.1", to: "0.8.2" }
 ];
 function resolveRecipeChain(sourceVersion, targetVersion) {
   if (compareVersions2(sourceVersion, minimumSupportedUpdateVersion) < 0) {

package/package.json

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

package/template/.windy-template.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
-  "templateCommit": "066d8018c0ec0c82fbf01d26013b3b303aaa9c22",
-  "generatorVersion": "0.8.1",
+  "templateCommit": "7c00e145cc8fef9f4c6ec621e8740e3c01f7cc2d",
+  "generatorVersion": "0.8.2",
   "modules": [
     {
       "name": "system",

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

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
+from dataclasses import dataclass, replace
 
 from .attempt_context_projection import (
     AttemptContextPreparation,
@@ -15,6 +15,7 @@ from .contracts import JsonValue, LongSessionContext
 from .engine import EngineRunRequest, PreparedArtifact
 from .openai_provider import OpenAiCompatibleProvider
 from .provider_governance import GovernedAttempt, ProviderRequestGovernance
+from .provider_output_guidance import tool_output_messages
 
 
 @dataclass(frozen=True)
@@ -64,6 +65,13 @@ async def govern_provider_attempt(
                 )
             ),
         )
+        if governed.tools:
+            governed = replace(
+                governed,
+                messages=tool_output_messages(
+                    governed.messages, governed.output_schema
+                ),
+            )
         provider_request = provider.request_body(
             governed.messages,
             governed.tools,

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

@@ -14,6 +14,7 @@ from .config import (
 from .contracts import AgentErrorCode, JsonValue, RuntimeToolDefinition
 from .engine import SafeEngineError
 from .multimodal import response_format
+from .provider_output_guidance import tool_output_messages
 from .report_types import UsageFacts
 from .vision_probe import probe_vision
 
@@ -97,6 +98,9 @@ class OpenAiCompatibleProvider:
         output_schema: dict[str, JsonValue] | None = None,
         max_output_tokens: int | None = None,
     ) -> bytes:
+        structured = response_format(output_schema_key, output_schema)
+        if tools:
+            messages = tool_output_messages(messages, output_schema)
         payload: dict[str, JsonValue] = {
             "model": self.config.model,
             "messages": cast(JsonValue, messages),
@@ -105,8 +109,7 @@ class OpenAiCompatibleProvider:
         }
         if tools:
             payload["tools"] = [tool_schema(tool) for tool in tools]
-        structured = response_format(output_schema_key, output_schema)
-        if structured is not None:
+        if structured is not None and not tools:
             payload["response_format"] = structured
         if max_output_tokens is not None:
             payload["max_tokens"] = max_output_tokens

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

@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+import json
+
+from .contracts import JsonValue
+from .engine import SafeEngineError
+
+
+def tool_output_messages(
+    messages: list[dict[str, JsonValue]],
+    output_schema: dict[str, JsonValue] | None,
+) -> list[dict[str, JsonValue]]:
+    """Merge already-governed schema guidance without moving Context source ordinals."""
+    if output_schema is None:
+        return messages
+    if not messages or messages[0].get("role") != "system":
+        raise SafeEngineError(
+            "INVALID_INPUT", "工具结构化输出缺少系统指令", retryable=False
+        )
+    instructions = messages[0].get("content")
+    if not isinstance(instructions, str):
+        raise SafeEngineError(
+            "INVALID_INPUT", "工具结构化输出指令无效", retryable=False
+        )
+    guidance = (
+        "\n\n需要工具时，只通过 API 的 function calling 调用已提供的工具，"
+        "不要在正文中模拟工具调用。工具处理完成后的最终回复必须是符合以下 "
+        "JSON Schema 的单个 JSON 值，不含 Markdown 围栏或额外说明；"
+        "工具调用阶段不受最终 JSON 格式限制。\n"
+        + json.dumps(output_schema, ensure_ascii=False, separators=(",", ":"))
+    )
+    if instructions.endswith(guidance):
+        return messages
+    return [{**messages[0], "content": instructions + guidance}, *messages[1:]]

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

@@ -124,11 +124,22 @@ class AgentStructuredLogHandler(logging.Handler):
 
 
 def configure_agent_logging() -> None:
-    """Attach once to package loggers; keep Uvicorn's own access logs separate."""
+    """Use one package sink without closing handlers shared with Uvicorn."""
     logger = logging.getLogger("southwind_agent_server")
-    if not any(
-        isinstance(handler, AgentStructuredLogHandler) for handler in logger.handlers
-    ):
-        logger.addHandler(AgentStructuredLogHandler())
+    structured = next(
+        (
+            handler
+            for handler in logger.handlers
+            if isinstance(handler, AgentStructuredLogHandler)
+        ),
+        None,
+    )
+    if structured is None:
+        structured = AgentStructuredLogHandler()
+    for handler in logger.handlers[:]:
+        if handler is not structured:
+            logger.removeHandler(handler)
+    if structured not in logger.handlers:
+        logger.addHandler(structured)
     logger.setLevel(logging.INFO)
     logger.propagate = False

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

@@ -4,6 +4,8 @@ import logging
 from importlib import import_module
 from typing import TextIO, cast
 
+import pytest
+
 from southwind_agent_server.structured_logging import (
     MAX_LOG_BYTES,
     AgentStructuredLogHandler,
@@ -103,3 +105,38 @@ def test_stdout_failure_does_not_interrupt_runtime() -> None:
         }
     )
     handler.emit(record)
+
+
+def test_bootstrap_removes_borrowed_sink_without_closing_uvicorn(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    stream = io.StringIO()
+    legacy_stream = io.StringIO()
+    legacy = logging.StreamHandler(legacy_stream)
+    structured = AgentStructuredLogHandler(stream)
+    logger = logging.getLogger("southwind_agent_server")
+    uvicorn = logging.getLogger("uvicorn")
+    monkeypatch.setattr(logger, "handlers", [legacy, structured])
+    monkeypatch.setattr(logger, "level", logging.INFO)
+    monkeypatch.setattr(logger, "propagate", False)
+    monkeypatch.setattr(uvicorn, "handlers", [legacy])
+    monkeypatch.setattr(uvicorn, "level", logging.INFO)
+    monkeypatch.setattr(uvicorn, "propagate", False)
+    closed: list[bool] = []
+    monkeypatch.setattr(legacy, "close", lambda: closed.append(True))
+
+    configure_agent_logging()
+    configure_agent_logging()
+    assert logger.handlers == [structured]
+    assert uvicorn.handlers == [legacy]
+    assert not closed
+    try:
+        raise ValueError("secret-exception")
+    except ValueError:
+        logger.exception("Agent Run 恢复轮询失败，将继续重试")
+    assert len(stream.getvalue().splitlines()) == 1
+    assert json.loads(stream.getvalue())["errorCode"] == "AGENT_RUN_RECOVERY_FAILED"
+    assert legacy_stream.getvalue() == ""
+    assert "secret-exception" not in stream.getvalue()
+    uvicorn.warning("independent-server-warning")
+    assert "independent-server-warning" in legacy_stream.getvalue()

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

@@ -0,0 +1,347 @@
+from __future__ import annotations
+
+import hashlib
+import json
+import sqlite3
+from dataclasses import replace
+from pathlib import Path
+from typing import cast
+
+import httpx
+import pytest
+
+from southwind_agent_server.attempt_context import govern_provider_attempt
+from southwind_agent_server.attempt_context_projection import (
+    AttemptContextPreparation,
+    governed_envelope,
+)
+from southwind_agent_server.context_message_digest import canonical_json_digest
+from southwind_agent_server.context_version_port import (
+    PreparedContext,
+    PreparedSource,
+    UnavailableContextVersionPort,
+)
+from southwind_agent_server.contracts import JsonValue, ProviderFieldPolicy
+from southwind_agent_server.engine import (
+    EngineCompleted,
+    EngineRunRequest,
+    SafeEngineError,
+    ToolCompleted,
+)
+from southwind_agent_server.openai_engine import OpenAiCompatibleEngineAdapter
+from southwind_agent_server.tool_host import ToolHostClient
+from tests.openai_provider_test_support import (
+    create_provider,
+    governance,
+    runtime_request,
+    sse_response,
+)
+
+SCHEMA: dict[str, JsonValue] = {
+    "type": "object",
+    "properties": {"total": {"type": "integer"}},
+    "required": ["total"],
+    "additionalProperties": False,
+}
+
+
+def structured_request() -> EngineRunRequest:
+    request = runtime_request("business.records.list")
+    return replace(
+        request,
+        output_schema_key="business.answer.v1",
+        output_schema=SCHEMA,
+        provider_data_policy=request.provider_data_policy.model_copy(
+            update={
+                "envelope_fields": [
+                    *request.provider_data_policy.envelope_fields,
+                    ProviderFieldPolicy(
+                        field="output-schema",
+                        classification="internal",
+                        dlp_action="redact",
+                    ),
+                ]
+            }
+        ),
+    )
+
+
+def test_tool_payload_uses_schema_guidance_without_mutation_or_duplicate() -> None:
+    provider = create_provider(httpx.MockTransport(lambda _: httpx.Response(500)))
+    request = runtime_request("business.records.list")
+    messages: list[dict[str, JsonValue]] = [{"role": "system", "content": "原指令"}]
+    body = provider.request_body(messages, request.allowed_tools, "answer.v1", SCHEMA)
+    payload = json.loads(body)
+    assert "response_format" not in payload
+    assert payload["tools"][0]["function"]["name"] == "business.records.list"
+    assert payload["messages"][0]["content"].startswith("原指令\n\n")
+    assert (
+        json.dumps(SCHEMA, ensure_ascii=False, separators=(",", ":"))
+        in payload["messages"][0]["content"]
+    )
+    assert messages[0]["content"] == "原指令"
+    assert (
+        provider.request_body(
+            payload["messages"], request.allowed_tools, "answer.v1", SCHEMA
+        )
+        == body
+    )
+    plain = json.loads(provider.request_body(messages, (), "answer.v1", SCHEMA))
+    assert plain["messages"] == messages
+    assert plain["response_format"]["json_schema"]["strict"] is True
+
+
+@pytest.mark.parametrize("final", ['{"total":1}', '{"total":"1"}', "```json\n{}\n```"])
+async def test_real_function_round_keeps_strict_final_schema(final: str) -> None:
+    turns = 0
+    calls = 0
+
+    async def provider_handler(request: httpx.Request) -> httpx.Response:
+        nonlocal turns
+        turns += 1
+        body = json.loads(request.content)
+        assert "response_format" not in body
+        assert '"required":["total"]' in body["messages"][0]["content"]
+        if turns == 1:
+            return sse_response(
+                [
+                    {
+                        "choices": [
+                            {
+                                "delta": {
+                                    "tool_calls": [
+                                        {
+                                            "index": 0,
+                                            "id": "call_1",
+                                            "function": {
+                                                "name": "business.records.list",
+                                                "arguments": "{}",
+                                            },
+                                        }
+                                    ]
+                                }
+                            }
+                        ]
+                    }
+                ]
+            )
+        assert body["messages"][-1]["role"] == "tool"
+        return sse_response([{"choices": [{"delta": {"content": final}}]}])
+
+    async def tool_handler(request: httpx.Request) -> httpx.Response:
+        nonlocal calls
+        calls += 1
+        assert json.loads(request.content)["executionGrant"] == "grant_1"
+        return httpx.Response(200, json={"value": {"total": 1}})
+
+    engine = OpenAiCompatibleEngineAdapter(
+        create_provider(httpx.MockTransport(provider_handler)),
+        ToolHostClient("internal-token", transport=httpx.MockTransport(tool_handler)),
+        governance(),
+    )
+    request = structured_request()
+    if final == '{"total":1}':
+        signals = [signal async for signal in engine.execute(request)]
+        assert any(isinstance(signal, ToolCompleted) for signal in signals)
+        assert isinstance(signals[-1], EngineCompleted)
+        assert signals[-1].output == {"total": 1}
+    else:
+        with pytest.raises(SafeEngineError) as denied:
+            _ = [signal async for signal in engine.execute(request)]
+        assert denied.value.code == "OUTPUT_VALIDATION_FAILED"
+    assert turns == 2 and calls == 1
+
+
+async def test_text_tool_call_is_not_executable() -> None:
+    async def provider_handler(_: httpx.Request) -> httpx.Response:
+        return sse_response(
+            [
+                {
+                    "choices": [
+                        {
+                            "delta": {
+                                "content": (
+                                    '{"tool_calls":[{"name":"business.records.list",'
+                                    '"arguments":{}}]}'
+                                )
+                            }
+                        }
+                    ]
+                }
+            ]
+        )
+
+    async def tool_handler(_: httpx.Request) -> httpx.Response:
+        pytest.fail("正文中的工具调用不得执行")
+
+    engine = OpenAiCompatibleEngineAdapter(
+        create_provider(httpx.MockTransport(provider_handler)),
+        ToolHostClient("internal-token", transport=httpx.MockTransport(tool_handler)),
+        governance(),
+    )
+    with pytest.raises(SafeEngineError) as denied:
+        _ = [signal async for signal in engine.execute(structured_request())]
+    assert denied.value.code == "OUTPUT_VALIDATION_FAILED"
+
+
+async def test_governed_guidance_matches_audit_and_context_bytes(
+    tmp_path: Path,
+) -> None:
+    request = structured_request()
+    request = replace(
+        request, output_schema={**SCHEMA, "description": "password=secret"}
+    )
+    provider = create_provider(httpx.MockTransport(lambda _: httpx.Response(500)))
+    audit_path = str(tmp_path / "audit.sqlite3")
+    messages: list[dict[str, JsonValue]] = [
+        {"role": "system", "content": request.instructions},
+        {"role": "user", "content": "历史来源"},
+        {"role": "user", "content": request.user_prompt},
+    ]
+    prepared = await govern_provider_attempt(
+        UnavailableContextVersionPort(),
+        governance(audit_path),
+        provider,
+        request,
+        1,
+        None,
+        messages,
+    )
+    payload = json.loads(prepared.provider_request)
+    assert payload["messages"] == prepared.governed.messages
+    assert "password=secret" not in prepared.provider_request.decode()
+    assert "[REDACTED]" in payload["messages"][0]["content"]
+    with sqlite3.connect(audit_path) as connection:
+        assert connection.execute(
+            "select sent_bytes, decision from provider_attempt_audit"
+        ).fetchone() == (len(prepared.provider_request), "redact")
+    source = PreparedSource(
+        "business", "session", "source-1", "v1", 1, "a" * 64, {}, "历史来源", "user"
+    )
+    envelope = governed_envelope(
+        AttemptContextPreparation(
+            PreparedContext("preparation-1", (source,)), messages, 1
+        ),
+        request.run_id,
+        "attempt-1",
+        prepared.governed.messages,
+        prepared.provider_request,
+        provider.config.deployment_key,
+        provider.config.model,
+        request.prompt_version,
+        (),
+    )
+    entries = cast(list[dict[str, JsonValue]], envelope["messages"])
+    assert entries[0]["content"] == payload["messages"][0]["content"]
+    assert (
+        cast(list[dict[str, JsonValue]], entries[1]["origins"])[0]["sourceId"]
+        == "source-1"
+    )
+    provider_fields = cast(dict[str, JsonValue], envelope["provider"])
+    assert (
+        provider_fields["requestDigest"]
+        == hashlib.sha256(prepared.provider_request).hexdigest()
+    )
+    assert provider_fields["outputSchemaDigest"] == hashlib.sha256(b"null").hexdigest()
+    assert entries[0]["digest"] == canonical_json_digest(payload["messages"][0])
+    assert entries[0]["digest"] != canonical_json_digest(cast(JsonValue, messages[0]))
+
+
+async def test_schema_guidance_still_requires_output_schema_authorization() -> None:
+    request = structured_request()
+    request = replace(
+        request,
+        provider_data_policy=runtime_request(
+            "business.records.list"
+        ).provider_data_policy,
+    )
+    with pytest.raises(SafeEngineError) as denied:
+        await govern_provider_attempt(
+            UnavailableContextVersionPort(),
+            governance(),
+            create_provider(httpx.MockTransport(lambda _: httpx.Response(500))),
+            request,
+            1,
+            None,
+            [{"role": "system", "content": "指令"}],
+        )
+    assert denied.value.code == "FORBIDDEN"
+
+
+async def test_schema_guidance_counts_toward_input_token_budget() -> None:
+    calls = 0
+
+    async def handler(_: httpx.Request) -> httpx.Response:
+        nonlocal calls
+        calls += 1
+        return sse_response([])
+
+    provider = create_provider(httpx.MockTransport(handler))
+    request = structured_request()
+    messages: list[dict[str, JsonValue]] = [
+        {"role": "system", "content": request.instructions},
+        {"role": "user", "content": request.user_prompt},
+    ]
+    original_bytes = len(provider.request_body(messages, request.allowed_tools))
+    assert original_bytes < 1024
+    request = replace(
+        request,
+        output_schema={**SCHEMA, "description": "业务结果字段说明。" * 100},
+        limits=request.limits.model_copy(update={"max_input_tokens": original_bytes}),
+    )
+    engine = OpenAiCompatibleEngineAdapter(
+        provider, ToolHostClient("internal-token"), governance()
+    )
+    with pytest.raises(SafeEngineError) as denied:
+        _ = [signal async for signal in engine.execute(request)]
+    assert denied.value.code == "BUDGET_EXCEEDED"
+    assert calls == 0
+
+
+async def test_tool_schema_respects_model_attempt_limit() -> None:
+    calls = 0
+
+    async def handler(_: httpx.Request) -> httpx.Response:
+        nonlocal calls
+        calls += 1
+        return sse_response(
+            [
+                {
+                    "choices": [
+                        {
+                            "delta": {
+                                "tool_calls": [
+                                    {
+                                        "index": 0,
+                                        "id": "call_1",
+                                        "function": {
+                                            "name": "business.records.list",
+                                            "arguments": "{}",
+                                        },
+                                    }
+                                ]
+                            }
+                        }
+                    ]
+                }
+            ]
+        )
+
+    request = structured_request()
+    request = replace(
+        request, limits=request.limits.model_copy(update={"max_model_attempts": 1})
+    )
+    engine = OpenAiCompatibleEngineAdapter(
+        create_provider(httpx.MockTransport(handler)),
+        ToolHostClient(
+            "internal-token",
+            transport=httpx.MockTransport(
+                lambda _: httpx.Response(200, json={"value": {"total": 1}})
+            ),
+        ),
+        governance(),
+    )
+    with pytest.raises(SafeEngineError) as denied:
+        _ = [signal async for signal in engine.execute(request)]
+    assert denied.value.code == "BUDGET_EXCEEDED"
+    assert calls == 1

package/template/docs/architecture/log-governance-implementation.md

@@ -1,6 +1,7 @@
 # 结构化运行日志技术实现
 
-状态：SDK、平台适配与利剑四条链的本地定向联调已实现；正式发布/升级及集中查询/告警平台未验收。
+状态：SDK 与 E1 已随 Windy `0.8.1` 正式发布，利剑完成官方更新和正式 SDK 四条链定向联调；
+完整隔离执行、真实 Provider、生产采集留存及集中查询/告警平台未验收。
 对应业务方案见
 [日志治理方案](./log-governance-plan.md)。
 
@@ -75,5 +76,21 @@
 容器依赖层安装和已有静态失败在利剑最终文档分别记录。
 候选 SDK 用真实本地归档消费，没有改 `.windy` 元数据或手改版本号冒充正式升级。
 
-本轮完成日志契约与四条真实适配链的本地定向联调；未完成真实 Provider/完整 Agent 部署、正式
-Windy 发布和 `windy update` 事务、生产采集留存、集中查询或告警验收。这些不能由定向检查替代。
+## 正式发布与利剑升级
+
+2026-10-01 核验 `create-windy@0.8.1`、`@southwind-ai/shared@0.3.1` 已在 npm 发布，
+`create-windy-v0.8.1` tag 指向 `066d8018c0ec0c82fbf01d26013b3b303aaa9c22`。
+[发布记录](https://github.com/RayJason/windy-platform/releases/tag/create-windy-v0.8.1) 已附
+candidate/published evidence、distribution manifest 与 checksum；两次发布核验均成功。
+利剑官方更新账本绑定同一 SHA 和 `0.8.1`，当前使用正常的
+`@southwind-ai/shared/structured-log`，已删除候选别名及归档。详细更新及验收记录在利剑
+`docs/operations/windy-logging-integration.md`。
+
+未完成 E2—E4 集成发布、真实 Provider/完整 Agent 部署、生产采集留存、集中查询或告警验收。
+日志 SDK 正式接入不能当作完整 Agent 能力已经交付的证据。
+
+利剑合并验收另发现旧 Bootstrap 借用 Uvicorn Handler 后再追加 SDK 会形成双出口。
+`configure_agent_logging()` 已回馈上游：保留唯一现存结构化 Handler，移除包级其它 Handler 引用，
+不关闭与 Uvicorn 共享的 Handler；重复初始化保留原实例和 Stream。5 项适配定向检查通过。
+该修复是 `0.8.1` 发布后的源码补丁，没有改写发布版本；利剑同时修复旧 Bootstrap 调用点，并用
+真实 Uvicorn 配置先于 ASGI 导入的回归检查证明单条 JSON 输出及独立访问日志仍有效。

package/template/docs/architecture/log-governance-plan.md

@@ -1,7 +1,7 @@
 # 日志治理方案
 
-状态：运行日志 SDK、平台适配及利剑四条链的本地定向联调已实现；正式发布、下游升级与部署留存
-另行验收。集中管理界面尚未实施。
+状态：运行日志 SDK 和平台适配随 Windy `0.8.1` 正式发布，利剑已通过官方更新接入并完成四条链
+定向联调。部署留存与真实 Provider 另行验收；集中管理界面尚未实施。
 
 ## 业务需求先行
 

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

@@ -52,6 +52,24 @@ Provider 调用前会执行：
 Tool 调用继续由 Windy Server 执行。Agent Server 只收到 opaque Execution Grant；每次 Tool
 都重新校验当前权限、Scope、审批和 receipt，不把 Run 创建时的权限快照当长期授权。
 
+### Tool 与结构化业务结果
+
+需要先查询业务数据再返回结构化结果的 Operation，同时保留真实 function calling 与最终
+JSON Schema 验证。为兼容同时发送 `tools` 和 `response_format` 时只生成正文的 Provider，
+存在 Tool 时请求只发送 `tools`，把经过授权和 DLP 的输出 Schema 及最终 JSON 指导合并到
+首条系统指令；没有 Tool 时继续发送严格 `response_format: json_schema`。这是默认序列化
+规则，无新增配置。正文中的工具名称或伪造调用不执行，只有协议中的 `tool_calls` 执行。
+
+合并不增加消息、移动 Context 来源序号或放宽 Guard。治理后的同一消息用于 Context 提交、
+输入预算和实际出网请求；Schema 指导也计入 Provider Context 与保守 Token 预算、出网审计
+字节数。`maxInputBytes` 继续约束原始输入和 Artifact，原有输出预算与有界 Tool 轮次继续生效。
+最终回复仍必须通过严格 Schema 验证，
+不接受 Markdown 围栏或额外字段；Provider 未生成合规结果时返回 `OUTPUT_VALIDATION_FAILED`。
+
+Context 的首条指令摘要与 `requestDigest` 覆盖完整、脱敏后的 Schema 指导。兼容请求没有
+`response_format`，因此 `outputSchemaDigest` 是实际空字段的摘要；它不能单独用来恢复
+输出 Schema。首条指令的来源与版本规则保持不变，业务来源仍按原始序号追踪。
+
 ## 配置
 
 选择 `system.agent` 的项目在本机 `.env` 配置：