Merge branch 'stewardship/verified-pr-batch-3602-3621-owned' into stewardship/verified-pr-batch-3569-3578-owned

skills/continuous-learning-v2/scripts/test_parse_instinct.py

@@ -281,6 +281,7 @@ def test_parse_confidence_preserves_valid_range(confidence):
     assert parse_instinct_file(content)[0]["confidence"] == confidence
 
 
+@pytest.mark.unit
 @pytest.mark.parametrize("value", [
     "line one\nline two", "tab\tvalue", "carriage\rreturn",
     'when writing "quoted" text', r"C:\Users\name", "caf\u00e9",
@@ -294,11 +295,13 @@ def test_quoted_instinct_strings_roundtrip(value: str) -> None:
     assert instincts[0]["trigger"] == value
 
 
+@pytest.mark.unit
 def test_parse_quoted_instinct_decodes_newline_escape() -> None:
     content = '---\nid: newline\ntrigger: "line one\\nline two"\n---\nBody'
     assert parse_instinct_file(content)[0]["trigger"] == "line one\nline two"
 
 
+@pytest.mark.unit
 @pytest.mark.parametrize("value", ["line\u0085value", "line\u0090value"])
 def test_unicode_controls_are_escaped_for_yaml(value: str) -> None:
     quoted = _mod._yaml_quote(value)
@@ -306,6 +309,7 @@ def test_unicode_controls_are_escaped_for_yaml(value: str) -> None:
     assert json.loads(quoted) == value
 
 
+@pytest.mark.unit
 def test_parse_quoted_instinct_preserves_legacy_escape() -> None:
     content = '---\nid: legacy\ntrigger: "C:\\projects"\n---\nBody'
     assert parse_instinct_file(content)[0]["trigger"] == r"C:\projects"

skills/python-testing/SKILL.md

@@ -486,20 +486,21 @@ async def test_async_with_fixture(async_client):
 
 ### Async Fixture (FastAPI)
 
-`ASGITransport` does not run lifespan events. If the app needs startup/shutdown, wrap the client block in `async with LifespanManager(app) as manager:` (from `asgi_lifespan`)
-and use `ASGITransport(app=manager.app)`. See [FastAPI's async testing guidance](https://github.com/fastapi/fastapi/blob/master/docs/en/docs/advanced/async-tests.md).
+`ASGITransport` does not run lifespan events. Install `asgi-lifespan` and wrap the client in `LifespanManager` when the app uses startup or shutdown handlers. See [FastAPI's async testing guidance](https://github.com/fastapi/fastapi/blob/master/docs/en/docs/advanced/async-tests.md).
 
 ```python
 import pytest
 import pytest_asyncio
+from asgi_lifespan import LifespanManager
 from httpx import ASGITransport, AsyncClient
 
 @pytest_asyncio.fixture
 async def async_client():
-    """Async fixture providing async test client."""
+    """Async fixture providing async test client with lifespan events."""
     app = create_app()  # Returns a FastAPI application
-    async with AsyncClient(transport=ASGITransport(app=app), base_url="http://test") as client:
-        yield client
+    async with LifespanManager(app) as manager:
+        async with AsyncClient(transport=ASGITransport(app=manager.app), base_url="http://test") as client:
+            yield client
 
 @pytest.mark.asyncio
 async def test_api_endpoint(async_client):

skills/skill-comply/scripts/classifier.py

@@ -48,7 +48,8 @@ def classify_events(
     )
 
     result = subprocess.run(
-        ["claude", "-p", prompt, "--model", model, "--output-format", "text"],
+        ["claude", "-p", "--model", model, "--output-format", "text"],
+        input=prompt,
         capture_output=True,
         encoding="utf-8",
         timeout=60,

skills/skill-comply/scripts/runner.py

@@ -50,7 +50,7 @@ def run_scenario(
 
     result = subprocess.run(
         [
-            "claude", "-p", scenario.prompt,
+            "claude", "-p",
             "--model", model,
             "--max-turns", str(max_turns),
             "--add-dir", str(sandbox_dir),
@@ -58,6 +58,7 @@ def run_scenario(
             "--output-format", "stream-json",
             "--verbose",
         ],
+        input=scenario.prompt,
         capture_output=True,
         encoding="utf-8",
         timeout=timeout,

skills/skill-comply/scripts/scenario_generator.py

@@ -41,7 +41,8 @@ def generate_scenarios(
     )
 
     result = subprocess.run(
-        ["claude", "-p", prompt, "--model", model, "--output-format", "text"],
+        ["claude", "-p", "--model", model, "--output-format", "text"],
+        input=prompt,
         capture_output=True,
         encoding="utf-8",
         timeout=120,

skills/skill-comply/scripts/spec_generator.py

@@ -41,7 +41,8 @@ def generate_spec(
             )
 
         result = subprocess.run(
-            ["claude", "-p", prompt, "--model", model, "--output-format", "text"],
+            ["claude", "-p", "--model", model, "--output-format", "text"],
+            input=prompt,
             capture_output=True,
             encoding="utf-8",
             timeout=120,

skills/skill-comply/tests/test_utf8.py

@@ -27,7 +27,8 @@ SPEC = {"id": "unicode", "name": TEXT, "source_rule": TEXT, "version": "1",
 def mock_cli(payload: str) -> Callable[..., subprocess.CompletedProcess[str]]:
     """Emulate decoding UTF-8 CLI bytes using the caller's selected encoding."""
     def execute(command: list[str], **kwargs: Any) -> subprocess.CompletedProcess[str]:
-        assert TEXT in command[2]
+        assert command[:2] == ["claude", "-p"]
+        assert TEXT in kwargs["input"]
         encoding = kwargs.get("encoding") or locale.getpreferredencoding(False)
         return subprocess.CompletedProcess(command, 0, stdout=payload.encode("utf-8").decode(encoding), stderr="")
     return execute
@@ -67,7 +68,7 @@ def test_generators_preserve_utf8(tmp_path: Path, monkeypatch: pytest.MonkeyPatc
     ]}
     execute = mock_cli(yaml.safe_dump(response, allow_unicode=True))
     def checked_execute(command: list[str], **kwargs: Any) -> subprocess.CompletedProcess[str]:
-        assert PROMPT_TEXT in command[2]
+        assert PROMPT_TEXT in kwargs["input"]
         return execute(command, **kwargs)
     monkeypatch.setattr(module.subprocess, "run", checked_execute)
     if kind == "spec":
@@ -82,7 +83,7 @@ def test_spec_retry_preserves_utf8(tmp_path: Path, monkeypatch: pytest.MonkeyPat
     responses = iter(["steps: [invalid", yaml.safe_dump(SPEC, allow_unicode=True)])
     prompts: list[str] = []
     def execute(command: list[str], **kwargs: Any) -> subprocess.CompletedProcess[str]:
-        prompts.append(command[2])
+        prompts.append(kwargs["input"])
         return mock_cli(next(responses))(command, **kwargs)
     monkeypatch.setattr(spec_generator.subprocess, "run", execute)
     assert spec_generator.generate_spec(skill, max_retries=1).name == TEXT
@@ -95,7 +96,7 @@ def test_classifier_preserves_utf8(tmp_path: Path, monkeypatch: pytest.MonkeyPat
     monkeypatch.setattr(classifier, "PROMPTS_DIR", tmp_path)
     execute = mock_cli(json.dumps({TEXT: [0]}, ensure_ascii=False))
     def checked_execute(command: list[str], **kwargs: Any) -> subprocess.CompletedProcess[str]:
-        assert PROMPT_TEXT in command[2]
+        assert PROMPT_TEXT in kwargs["input"]
         return execute(command, **kwargs)
     monkeypatch.setattr(classifier.subprocess, "run", checked_execute)
     spec = ComplianceSpec("unicode", TEXT, TEXT, "1", (Step(TEXT, TEXT, True, Detector(TEXT)),), 0.6)
@@ -116,6 +117,34 @@ def test_runner_preserves_utf8_capture(tmp_path: Path, monkeypatch: pytest.Monke
     assert runner.run_scenario(scenario).observations[0].output == TEXT
 
 
+@pytest.mark.skipif(os.name == "nt", reason="Windows does not use the POSIX locale for argv encoding")
+def test_real_cli_receives_utf8_prompt_on_stdin(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    """A real child process catches Unicode argv failures that mocked run calls miss."""
+    fake_cli = tmp_path / "claude"
+    fake_cli.write_text(
+        "#!/usr/bin/env python3\n"
+        "import os, sys\n"
+        "data = sys.stdin.buffer.read()\n"
+        "with open(os.environ['ECC_FAKE_CLAUDE_STDIN'], 'wb') as stream:\n"
+        "    stream.write(data)\n"
+        "with open(os.environ['ECC_FAKE_CLAUDE_RESPONSE'], 'rb') as stream:\n"
+        "    sys.stdout.buffer.write(stream.read())\n",
+        encoding="ascii",
+    )
+    fake_cli.chmod(0o755)
+    captured = tmp_path / "stdin.bin"
+    response = tmp_path / "response.yaml"
+    response.write_text(yaml.safe_dump(SPEC, allow_unicode=True), encoding="utf-8")
+    monkeypatch.setenv("ECC_FAKE_CLAUDE_STDIN", str(captured))
+    monkeypatch.setenv("ECC_FAKE_CLAUDE_RESPONSE", str(response))
+    monkeypatch.setenv("PATH", str(tmp_path) + os.pathsep + os.environ["PATH"])
+
+    skill = tmp_path / "SKILL.md"
+    skill.write_text(TEXT, encoding="utf-8")
+    assert spec_generator.generate_spec(skill, max_retries=0).name == TEXT
+    assert TEXT.encode("utf-8") in captured.read_bytes()
+
+
 def test_report_is_written_as_utf8(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
     skill = tmp_path / "SKILL.md"
     skill.write_text(TEXT, encoding="utf-8")