steerable-sidecar 0.7.2__tar.gz → 0.7.4__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/PKG-INFO +1 -1
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/pyproject.toml +1 -1
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/egress_ask.py +20 -1
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/sidecar.py +5 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar.egg-info/PKG-INFO +1 -1
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_egress_ask.py +18 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_sidecar_skills.py +2 -2
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/README.md +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/setup.cfg +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/__init__.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/__main__.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/_version.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/acp_adapter.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/acp_fs.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/acp_terminal.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/ag_ui.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/delivery.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/display.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/file_edit.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/headless.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/host_spawn.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/host_tools.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/jpeg_ascii.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/landlock.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/landlock_run.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/loop_limits.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/multi_file_edit.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/png_ascii.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/ptc_js.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/ptc_js_worker.cjs +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/run_code.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/run_code_driver.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/sandbox.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/search_tools.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/shell_session.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/stream_chunks.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/todo_tools.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/tool_contract.json +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/tool_contract.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/web_tools.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/workspace_fs.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/workspace_tools.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar.egg-info/SOURCES.txt +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar.egg-info/dependency_links.txt +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar.egg-info/entry_points.txt +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar.egg-info/requires.txt +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar.egg-info/top_level.txt +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_acp_adapter.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_acp_e2e.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_ag_ui.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_delivery.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_display.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_e2e_loop_limits.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_e2e_plugins.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_e2e_ptc_js.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_e2e_r16_features.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_e2e_record_migration.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_e2e_run_code.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_e2e_todo.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_e2e_tool_exposure.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_e2e_web_tools.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_e2e_workspace_tools.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_file_edit.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_gateway_catalog_confined.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_headless.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_host_spawn.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_host_tools.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_landlock.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_loop_limits.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_multi_file_edit.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_provider_factory.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_ptc_js.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_rpc_method_contract.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_run_code.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_sandbox.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_search_tools.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_shell_session.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_sidecar_approval.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_sidecar_coreloop.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_sidecar_exec_sandbox.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_sidecar_mcp.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_sidecar_methods.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_sidecar_parts.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_sidecar_plugins.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_sidecar_reverse_channel.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_sidecar_subprocess.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_sidecar_world_state.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_stream_chunks.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_tool_contract.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_web_tools.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_win32_stdio.py +0 -0
- {steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/tests/test_workspace_tools.py +0 -0
|
@@ -21,6 +21,7 @@ from __future__ import annotations
|
|
|
21
21
|
|
|
22
22
|
import logging
|
|
23
23
|
import re
|
|
24
|
+
from contextvars import ContextVar, Token
|
|
24
25
|
from typing import Any, Literal
|
|
25
26
|
|
|
26
27
|
from steerable_agent_runtime import ApprovalRequest
|
|
@@ -30,6 +31,20 @@ from .host_tools import HostApprover
|
|
|
30
31
|
|
|
31
32
|
logger = logging.getLogger(__name__)
|
|
32
33
|
|
|
34
|
+
# The asker is created once for the process. The chat id is per turn.
|
|
35
|
+
_turn_chat_id: ContextVar[str | None] = ContextVar("steerable_turn_chat_id", default=None)
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
def bind_turn_chat_id(chat_id: str | None) -> Token[str | None]:
|
|
39
|
+
"""Remember the chat whose turn is running, so an egress grant names it."""
|
|
40
|
+
value = chat_id if isinstance(chat_id, str) and chat_id else None
|
|
41
|
+
return _turn_chat_id.set(value)
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
def reset_turn_chat_id(token: Token[str | None]) -> None:
|
|
45
|
+
"""Drop the chat id bound for the turn that just finished."""
|
|
46
|
+
_turn_chat_id.reset(token)
|
|
47
|
+
|
|
33
48
|
#: Matches the proxy's 403 reason phrase (``proxy.py``): the only metadata
|
|
34
49
|
#: channel a CONNECT client can see.
|
|
35
50
|
_EGRESS_DENIED_RE = re.compile(r"egress denied for ([A-Za-z0-9._-]+):(\d{1,5})")
|
|
@@ -81,7 +96,11 @@ class EgressApprovalAsker:
|
|
|
81
96
|
key = f"{host}:{port}"
|
|
82
97
|
if key in self._session_denied:
|
|
83
98
|
return False
|
|
84
|
-
approver = HostApprover(
|
|
99
|
+
approver = HostApprover(
|
|
100
|
+
self._server,
|
|
101
|
+
timeout=self._timeout_s,
|
|
102
|
+
chat_id=_turn_chat_id.get(),
|
|
103
|
+
)
|
|
85
104
|
try:
|
|
86
105
|
decision = await approver.approve(
|
|
87
106
|
ApprovalRequest(
|
|
@@ -2430,6 +2430,10 @@ class Sidecar:
|
|
|
2430
2430
|
self._exec_controls[stream_id] = exec_control
|
|
2431
2431
|
final_content_only = params.get("contentMode") == "final"
|
|
2432
2432
|
pending_content: list[str] = []
|
|
2433
|
+
from .egress_ask import bind_turn_chat_id, reset_turn_chat_id
|
|
2434
|
+
|
|
2435
|
+
raw_chat_id = params.get("chatId")
|
|
2436
|
+
chat_token = bind_turn_chat_id(raw_chat_id if isinstance(raw_chat_id, str) else None)
|
|
2433
2437
|
try:
|
|
2434
2438
|
async for event in recorder.tee(
|
|
2435
2439
|
loop.run(
|
|
@@ -2492,6 +2496,7 @@ class Sidecar:
|
|
|
2492
2496
|
},
|
|
2493
2497
|
)
|
|
2494
2498
|
finally:
|
|
2499
|
+
reset_turn_chat_id(chat_token)
|
|
2495
2500
|
self._coreloops.pop(stream_id, None)
|
|
2496
2501
|
self._exec_controls.pop(stream_id, None)
|
|
2497
2502
|
for client in mcp_clients:
|
|
@@ -26,7 +26,9 @@ async def _call(router: ToolRouter, name: str, arguments: dict) -> Any:
|
|
|
26
26
|
from steerable_sidecar.egress_ask import (
|
|
27
27
|
EgressApprovalAsker,
|
|
28
28
|
asker_from_environ,
|
|
29
|
+
bind_turn_chat_id,
|
|
29
30
|
parse_egress_denied,
|
|
31
|
+
reset_turn_chat_id,
|
|
30
32
|
)
|
|
31
33
|
from steerable_sidecar.web_tools import register_web_tools
|
|
32
34
|
|
|
@@ -82,6 +84,22 @@ class TestAsker:
|
|
|
82
84
|
finally:
|
|
83
85
|
proxy.stop()
|
|
84
86
|
|
|
87
|
+
@pytest.mark.asyncio
|
|
88
|
+
async def test_prompt_names_the_turn_chat(self, monkeypatch) -> None:
|
|
89
|
+
stub = _StubServer("allow_once")
|
|
90
|
+
asker = EgressApprovalAsker(
|
|
91
|
+
stub, control_port=1, control_token="t" # type: ignore[arg-type]
|
|
92
|
+
)
|
|
93
|
+
monkeypatch.setattr(asker, "_relay_allow", AsyncMock(return_value=True))
|
|
94
|
+
assert await asker.ask_and_allow("example.com", 443, "https://example.com/") is True
|
|
95
|
+
assert "chatId" not in stub.calls[0]["params"]
|
|
96
|
+
token = bind_turn_chat_id("chat-1")
|
|
97
|
+
try:
|
|
98
|
+
assert await asker.ask_and_allow("example.com", 443, "https://example.com/") is True
|
|
99
|
+
finally:
|
|
100
|
+
reset_turn_chat_id(token)
|
|
101
|
+
assert stub.calls[1]["params"]["chatId"] == "chat-1"
|
|
102
|
+
|
|
85
103
|
@pytest.mark.asyncio
|
|
86
104
|
async def test_approval_off_relays_without_prompting(self, monkeypatch) -> None:
|
|
87
105
|
stub = _StubServer("deny_once")
|
|
@@ -182,7 +182,7 @@ async def test_system_prompt_and_catalog_keep_a_single_leading_system(
|
|
|
182
182
|
sidecar,
|
|
183
183
|
_params(
|
|
184
184
|
skills_root,
|
|
185
|
-
systemPrompt="
|
|
185
|
+
systemPrompt="你是示例助手。",
|
|
186
186
|
messages=[{"role": "user", "content": "hi"}],
|
|
187
187
|
),
|
|
188
188
|
)
|
|
@@ -190,7 +190,7 @@ async def test_system_prompt_and_catalog_keep_a_single_leading_system(
|
|
|
190
190
|
assert len(provider.seen_messages) == 2
|
|
191
191
|
first = provider.seen_messages[0]
|
|
192
192
|
assert [message.role for message in first] == ["system", "user", "user"]
|
|
193
|
-
assert first[0].content_text == "
|
|
193
|
+
assert first[0].content_text == "你是示例助手。"
|
|
194
194
|
assert first[1].content_text == "hi"
|
|
195
195
|
assert "# Available skills" in first[2].content_text
|
|
196
196
|
for request in provider.seen_messages:
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/multi_file_edit.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/run_code_driver.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/tool_contract.json
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar/workspace_tools.py
RENAMED
|
File without changes
|
{steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar.egg-info/SOURCES.txt
RENAMED
|
File without changes
|
|
File without changes
|
{steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar.egg-info/entry_points.txt
RENAMED
|
File without changes
|
{steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar.egg-info/requires.txt
RENAMED
|
File without changes
|
{steerable_sidecar-0.7.2 → steerable_sidecar-0.7.4}/src/steerable_sidecar.egg-info/top_level.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|