github/deer-flow
1
0
Fork 0
mirror of https://github.com/bytedance/deer-flow.git synced 2026-07-25 23:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sandbox): allow bash after cwd setup failure (#4051)

Browse Source
This commit is contained in:
明年我18 2026-07-12 23:40:52 +08:00 committed by GitHub
parent 897be7e064
commit 0542d3c5f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/packages/harness/deerflow/sandbox/tools.py
View File

@ -1741,6 +1741,7 @@ def bash_tool(runtime: Runtime, description: str, command: str) -> str:
max_chars,
)
ensure_thread_directories_exist(runtime)
command = f"cd {VIRTUAL_PATH_PREFIX}/workspace; {command}"
if identity_prefix:
command = identity_prefix + command
try:

16
backend/tests/test_channel_user_id_env.py
View File

@ -91,13 +91,13 @@ class TestBashToolChannelIdentityPrefix:
sandbox = _run_bash(monkeypatch, _aio_runtime({"channel_user_id": "ou_feishu_123"}))
assert len(sandbox.calls) == 1
assert sandbox.calls[0]["command"] == f"export {CHANNEL_USER_ID_ENV}=ou_feishu_123; echo hi"
assert sandbox.calls[0]["command"] == f"export {CHANNEL_USER_ID_ENV}=ou_feishu_123; cd /mnt/user-data/workspace; echo hi"
assert sandbox.calls[0]["env"] is None
def test_no_channel_user_id_leaves_command_unchanged(self, monkeypatch):
def test_no_channel_user_id_omits_identity_prefix(self, monkeypatch):
sandbox = _run_bash(monkeypatch, _aio_runtime({"thread_id": "t1"}))
assert sandbox.calls[0]["command"] == "echo hi"
assert sandbox.calls[0]["command"] == "cd /mnt/user-data/workspace; echo hi"
assert sandbox.calls[0]["env"] is None
def test_per_call_identity_follows_current_context(self, monkeypatch):
@ -114,10 +114,10 @@ class TestBashToolChannelIdentityPrefix:
sandbox = _run_bash(monkeypatch, _aio_runtime({"channel_user_id": "x'; rm -rf /tmp/y; '"}))
command = sandbox.calls[0]["command"]
assert command.endswith("; echo hi")
assert command.endswith("; cd /mnt/user-data/workspace; echo hi")
# shlex.quote wraps the value; the raw injection payload must not appear
# as executable syntax outside the quoted region.
assert "export " + CHANNEL_USER_ID_ENV + "='x'\"'\"'; rm -rf /tmp/y; '\"'\"''; echo hi" == command
assert "export " + CHANNEL_USER_ID_ENV + "='x'\"'\"'; rm -rf /tmp/y; '\"'\"''; cd /mnt/user-data/workspace; echo hi" == command
def test_secrets_and_identity_compose(self, monkeypatch):
"""Active skill secrets keep the env= channel; the identity keeps the
@ -132,7 +132,7 @@ class TestBashToolChannelIdentityPrefix:
call = sandbox.calls[0]
assert call["env"] == {"ERP_TOKEN": "secret-value"}
assert call["command"].startswith(f"export {CHANNEL_USER_ID_ENV}=ou_1; ")
assert call["command"] == f"export {CHANNEL_USER_ID_ENV}=ou_1; cd /mnt/user-data/workspace; echo hi"
assert "secret-value" not in call["command"]
def test_non_im_run_leaves_command_untouched(self):
@ -159,8 +159,8 @@ class TestBashToolChannelIdentityPrefix:
a = _run_bash(monkeypatch, _aio_runtime({"channel_user_id": "sender-a"}))
b = _run_bash(monkeypatch, _aio_runtime({"channel_user_id": "b" * 5000}))
assert a.calls[0]["command"] == f"export {CHANNEL_USER_ID_ENV}=sender-a; echo hi"
assert b.calls[0]["command"] == f"unset {CHANNEL_USER_ID_ENV}; echo hi"
assert a.calls[0]["command"] == f"export {CHANNEL_USER_ID_ENV}=sender-a; cd /mnt/user-data/workspace; echo hi"
assert b.calls[0]["command"] == f"unset {CHANNEL_USER_ID_ENV}; cd /mnt/user-data/workspace; echo hi"
assert b.calls[0]["env"] is None
def test_windows_local_sandbox_skips_prefix(self, monkeypatch):