nas/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-11-04 14:24:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(agent): bind CLI commands to project virtualenv

Browse Source
This commit is contained in:
jxxghp
2026-10-01 12:33:10 +08:00
parent 58ec86b586
commit 60cf52b246
8 changed files with 117 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/agent/tools/impl/execute_command.py
View File

@@ -15,7 +15,12 @@ from typing import Any, Literal, Optional, TextIO, Type
from pydantic import BaseModel, Field
from app.agent.shell import build_agent_subprocess_env, resolve_agent_cwd, resolve_agent_shell
from app.agent.shell import (
bind_agent_project_environment,
build_agent_subprocess_env,
resolve_agent_cwd,
resolve_agent_shell,
)
from app.agent.terminal.manager import (
TERMINAL_WAIT_DEFAULT_MS,
TERMINAL_YIELD_DEFAULT_MS,
@@ -594,8 +599,12 @@ class ExecuteCommandTool(MoviePilotTool):
) -> str:
"""在已登记作用域下运行一次命令，并对封口和进程收尾保持可观察。"""
normalized_timeout, timeout_note = self._normalize_timeout(timeout)
normalized_cwd = resolve_agent_cwd(cwd, root_path=get_runtime_setting("ROOT_PATH"))
normalized_env = build_agent_subprocess_env(env)
project_root = get_runtime_setting("ROOT_PATH")
normalized_cwd = resolve_agent_cwd(cwd, root_path=project_root)
normalized_env = bind_agent_project_environment(
build_agent_subprocess_env(env),
project_root=project_root,
)
shell_policy = resolve_agent_shell(executable=shell, login=login, environment=normalized_env, cwd=normalized_cwd)
await self._acquire_command_slot(scope)