## 模型逻辑清理 早期把模型 API 端点/密钥/模型 ID 硬编码的残留(AGENT_API_* / THINKING_* / TITLE_* 三件套)已彻底移除。模型配置统一由 config/custom_models.json (经 model_profiles 解析为档案)描述,运行时通过 apply_profile 注入; 没有任何可用模型时按既定行为报错。 - config/api.py: 删 9 个三件套符号,仅保留 DEFAULT_RESPONSE_MAX_TOKENS - utils/api_client.py: client 改为空配置起步,移除三件套 import - server/chat_flow_helpers.py: 删死 import(TITLE_* 符号) ## 部署级配置外置(按"决策权归谁"分类) config/*.json 不再一概锚定源码树: - 程序能力(docker_risk_markers / skill_hints)留源码树,随版本演进 - 部署者自定义(custom_models / host_workspaces / auto_approval / goal_review / forbidden_commands / host_sandbox_policy)外置到 ~/.agents/<mode>/config/ 新增统一解析机制(config/paths.py): - DEPLOY_CONFIG_DIR(默认 ~/.agents/<mode>/config,可用环境变量覆盖) - resolve_deploy_config():只读,回退链 部署目录→源码树.json→源码树.example (开发环境不必先跑 setup 也能用源码树种子) - deploy_config_path():写回用,稳定指向部署目录 6 个加载点改用上述解析;顺带修复 approval_agent / goal_review_agent 的 DEBUG_TRANSCRIPT_DIR 仍指旧源码树 logs/ 的漏迁问题。 ## 安全与运维 - 含密钥/机器特定的 5 个文件停止 git 追踪(git rm --cached,本地保留) 并加入 .gitignore,仓库仅留 .example 种子;forbidden_commands 保留 追踪作默认黑名单 - scripts/setup.py: 模型配置写到部署目录(用与 paths 一致的独立推导, 不 import config 以免过早锁定路径) - scripts/migrate_runtime_data.py: 新增 config/*.json → 部署目录迁移 (备份 + 不覆盖已存在) ## 关联:P1 配置收敛 + P2 首启向导 - config/server.py: Web 端口/监听地址/debug/NODE_BIN/PYTHON_BIN 单一事实源 - 消灭 8091 多处重复定义(state.py 死代码、app_legacy、main.py 各读各的) - 修复 sub_agent_manager 命令数组硬编码 "node" → NODE_BIN(便携包内置 Node 的前提) - scripts/setup.py: 终端首启向导(模式/端口/管理员/密钥/模型) ## 测试 test_config_paths_resolution 更新以反映新行为(host_workspaces 锚定部署 目录、新增 DEPLOY_CONFIG_DIR 用例);全部离线用例通过。 Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
187 lines
8.0 KiB
Python
187 lines
8.0 KiB
Python
from __future__ import annotations
|
||
|
||
import json
|
||
import os
|
||
import subprocess
|
||
import sys
|
||
import tempfile
|
||
import unittest
|
||
from pathlib import Path
|
||
|
||
|
||
class ConfigPathsResolutionTest(unittest.TestCase):
|
||
def setUp(self):
|
||
self.repo_root = Path(__file__).resolve().parents[1]
|
||
|
||
def _load_paths(self, *, cwd: Path, extra_env: dict | None = None) -> dict:
|
||
code = """
|
||
import json
|
||
import config
|
||
print(json.dumps({
|
||
"RUNTIME_ROOT": config.RUNTIME_ROOT,
|
||
"DEFAULT_PROJECT_PATH": config.DEFAULT_PROJECT_PATH,
|
||
"HOST_WORKSPACES_FILE": config.HOST_WORKSPACES_FILE,
|
||
"PROMPTS_DIR": config.PROMPTS_DIR,
|
||
"DATA_DIR": config.DATA_DIR,
|
||
"LOGS_DIR": config.LOGS_DIR,
|
||
"USER_SPACE_DIR": config.USER_SPACE_DIR,
|
||
"API_USER_SPACE_DIR": config.API_USER_SPACE_DIR,
|
||
"DEPLOY_CONFIG_DIR": config.DEPLOY_CONFIG_DIR,
|
||
"SUB_AGENT_STATE_FILE": config.SUB_AGENT_STATE_FILE,
|
||
"SUB_AGENT_TASKS_BASE_DIR": config.SUB_AGENT_TASKS_BASE_DIR,
|
||
}, ensure_ascii=False))
|
||
"""
|
||
env = dict(os.environ)
|
||
env["PYTHONPATH"] = str(self.repo_root)
|
||
# 清掉可能从外部 .env / 环境继承的覆盖项,保证用例可控。
|
||
for key in (
|
||
"TERMINAL_SANDBOX_MODE", "AGENTS_HOST_HOME", "AGENTS_WEB_HOME",
|
||
"DATA_DIR", "LOGS_DIR", "USER_SPACE_DIR", "API_USER_SPACE_DIR",
|
||
"DEFAULT_PROJECT_PATH", "HOST_WORKSPACES_FILE", "PROMPTS_DIR",
|
||
"DEPLOY_CONFIG_DIR",
|
||
"SUB_AGENT_STATE_FILE", "SUB_AGENT_TASKS_BASE_DIR",
|
||
):
|
||
env.pop(key, None)
|
||
if extra_env:
|
||
env.update(extra_env)
|
||
completed = subprocess.run(
|
||
[sys.executable, "-c", code],
|
||
cwd=str(cwd),
|
||
env=env,
|
||
capture_output=True,
|
||
text=True,
|
||
check=True,
|
||
)
|
||
lines = [line.strip() for line in (completed.stdout or "").splitlines() if line.strip()]
|
||
self.assertTrue(lines, f"stdout is empty, stderr={completed.stderr}")
|
||
return json.loads(lines[-1])
|
||
|
||
def test_runtime_dirs_default_to_web_home(self):
|
||
"""默认(非 host)模式下,运行态目录锚定到 ~/.agents/web。"""
|
||
with tempfile.TemporaryDirectory() as td:
|
||
data = self._load_paths(cwd=Path(td), extra_env={"TERMINAL_SANDBOX_MODE": "docker"})
|
||
|
||
web_home = Path("~/.agents/web").expanduser().resolve()
|
||
self.assertEqual(data["RUNTIME_ROOT"], str(web_home))
|
||
self.assertEqual(data["DATA_DIR"], str(web_home / "data"))
|
||
self.assertEqual(data["LOGS_DIR"], str(web_home / "logs"))
|
||
self.assertEqual(data["USER_SPACE_DIR"], str(web_home / "users"))
|
||
self.assertEqual(data["API_USER_SPACE_DIR"], str(web_home / "api" / "users"))
|
||
# 数据文件跟随 DATA_DIR
|
||
self.assertEqual(data["SUB_AGENT_STATE_FILE"], str(web_home / "data" / "sub_agents.json"))
|
||
self.assertEqual(data["SUB_AGENT_TASKS_BASE_DIR"], str(web_home / "data" / "sub_agent_tasks"))
|
||
|
||
def test_runtime_dirs_switch_to_host_home(self):
|
||
"""host 模式下,运行态目录锚定到 ~/.agents/host。"""
|
||
with tempfile.TemporaryDirectory() as td:
|
||
data = self._load_paths(cwd=Path(td), extra_env={"TERMINAL_SANDBOX_MODE": "host"})
|
||
|
||
host_home = Path("~/.agents/host").expanduser().resolve()
|
||
self.assertEqual(data["RUNTIME_ROOT"], str(host_home))
|
||
self.assertEqual(data["DATA_DIR"], str(host_home / "data"))
|
||
self.assertEqual(data["LOGS_DIR"], str(host_home / "logs"))
|
||
|
||
def test_source_tree_paths_stay_anchored_to_repo_root(self):
|
||
"""配置类路径(提示词、默认工作区)仍锚定源码树。"""
|
||
with tempfile.TemporaryDirectory() as td:
|
||
data = self._load_paths(cwd=Path(td), extra_env={"TERMINAL_SANDBOX_MODE": "docker"})
|
||
|
||
for key in ("DEFAULT_PROJECT_PATH", "PROMPTS_DIR"):
|
||
value = Path(data[key])
|
||
self.assertTrue(value.is_absolute(), f"{key} not absolute: {data[key]}")
|
||
self.assertTrue(
|
||
str(value).startswith(str(self.repo_root)),
|
||
f"{key} should anchor to repo root: {data[key]}",
|
||
)
|
||
|
||
def test_deploy_config_anchors_to_runtime_root(self):
|
||
"""部署级配置目录与 host_workspaces.json 锚定到运行态根 ~/.agents/<mode>/config。"""
|
||
with tempfile.TemporaryDirectory() as td:
|
||
data = self._load_paths(cwd=Path(td), extra_env={"TERMINAL_SANDBOX_MODE": "web"})
|
||
|
||
web_config = Path("~/.agents/web/config").expanduser().resolve()
|
||
self.assertEqual(data["DEPLOY_CONFIG_DIR"], str(web_config))
|
||
self.assertEqual(
|
||
data["HOST_WORKSPACES_FILE"], str(web_config / "host_workspaces.json")
|
||
)
|
||
|
||
def test_deploy_config_follows_mode_home(self):
|
||
"""模式根变量覆盖时,部署配置目录跟随该根目录。"""
|
||
with tempfile.TemporaryDirectory() as td:
|
||
custom = Path(td) / "web_root"
|
||
data = self._load_paths(
|
||
cwd=Path(td),
|
||
extra_env={
|
||
"TERMINAL_SANDBOX_MODE": "web",
|
||
"AGENTS_WEB_HOME": str(custom),
|
||
},
|
||
)
|
||
self.assertEqual(data["DEPLOY_CONFIG_DIR"], str((custom / "config").resolve()))
|
||
|
||
def test_mode_home_env_overrides_root(self):
|
||
"""模式根变量(AGENTS_HOST_HOME / AGENTS_WEB_HOME)整体搬迁运行态目录。"""
|
||
with tempfile.TemporaryDirectory() as td:
|
||
custom = Path(td) / "host_root"
|
||
data = self._load_paths(
|
||
cwd=Path(td),
|
||
extra_env={
|
||
"TERMINAL_SANDBOX_MODE": "host",
|
||
"AGENTS_HOST_HOME": str(custom),
|
||
},
|
||
)
|
||
|
||
self.assertEqual(data["RUNTIME_ROOT"], str(custom.resolve()))
|
||
self.assertEqual(data["DATA_DIR"], str((custom / "data").resolve()))
|
||
self.assertEqual(data["LOGS_DIR"], str((custom / "logs").resolve()))
|
||
|
||
def test_specific_dir_env_has_highest_priority(self):
|
||
"""具体目录变量优先级高于模式根变量。"""
|
||
with tempfile.TemporaryDirectory() as td:
|
||
root = Path(td) / "root"
|
||
logs = Path(td) / "separate_logs"
|
||
data = self._load_paths(
|
||
cwd=Path(td),
|
||
extra_env={
|
||
"TERMINAL_SANDBOX_MODE": "web",
|
||
"AGENTS_WEB_HOME": str(root),
|
||
"LOGS_DIR": str(logs),
|
||
},
|
||
)
|
||
|
||
# DATA 跟随根变量,LOGS 被单独覆盖
|
||
self.assertEqual(data["DATA_DIR"], str((root / "data").resolve()))
|
||
self.assertEqual(data["LOGS_DIR"], str(logs.resolve()))
|
||
|
||
def test_relative_specific_dir_env_anchors_to_repo_root(self):
|
||
"""具体目录变量给相对路径时,仍锚定仓库根目录。"""
|
||
with tempfile.TemporaryDirectory() as td:
|
||
data = self._load_paths(
|
||
cwd=Path(td),
|
||
extra_env={
|
||
"TERMINAL_SANDBOX_MODE": "docker",
|
||
"DATA_DIR": "./data_rel",
|
||
"LOGS_DIR": "./logs_rel",
|
||
"USER_SPACE_DIR": "./users_rel",
|
||
"DEFAULT_PROJECT_PATH": "./workspace_rel",
|
||
"HOST_WORKSPACES_FILE": "./config/host_workspaces_rel.json",
|
||
"SUB_AGENT_STATE_FILE": "./data/sub_agents_rel.json",
|
||
},
|
||
)
|
||
|
||
self.assertEqual(data["DATA_DIR"], str((self.repo_root / "data_rel").resolve()))
|
||
self.assertEqual(data["LOGS_DIR"], str((self.repo_root / "logs_rel").resolve()))
|
||
self.assertEqual(data["USER_SPACE_DIR"], str((self.repo_root / "users_rel").resolve()))
|
||
self.assertEqual(data["DEFAULT_PROJECT_PATH"], str((self.repo_root / "workspace_rel").resolve()))
|
||
self.assertEqual(
|
||
data["HOST_WORKSPACES_FILE"],
|
||
str((self.repo_root / "config" / "host_workspaces_rel.json").resolve()),
|
||
)
|
||
self.assertEqual(
|
||
data["SUB_AGENT_STATE_FILE"],
|
||
str((self.repo_root / "data" / "sub_agents_rel.json").resolve()),
|
||
)
|
||
|
||
|
||
if __name__ == "__main__":
|
||
unittest.main()
|