vod-devkit 0.5.9 → 0.5.11
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.
- package/CHANGELOG.md +58 -0
- package/QUICKSTART.md +6 -2
- package/README.en.md +23 -2
- package/README.md +204 -16
- package/{contract → assets/contract}/tools.schema.json +127 -1
- package/{skills → assets/skills}/vod-core/SKILL.md +32 -1
- package/bin/vod-devkit +21 -1
- package/integrations/hermes/hooks/vod_guard.py +127 -0
- package/integrations/hermes/hooks/vod_router.py +89 -0
- package/integrations/hermes/host.json +4 -1
- package/npm/cli.js +6 -1
- package/package.json +37 -34
- package/packages/dsh/README.md +60 -0
- package/packages/dsh/package.json +52 -0
- package/plugins/vod-devkit/.codex-plugin/plugin.json +1 -1
- package/plugins/vod-devkit/.mcp.json +2 -0
- package/plugins/vod-devkit/build-info.json +3 -3
- package/plugins/vod-devkit/contract/tools.schema.json +127 -1
- package/plugins/vod-devkit/hooks/vod_guard.py +127 -0
- package/plugins/vod-devkit/hooks/vod_router.py +89 -0
- package/plugins/vod-devkit/skills/vod-core/SKILL.md +32 -1
- package/plugins/vod-devkit/vod_mcp/__init__.py +1 -1
- package/plugins/vod-devkit/vod_mcp/attribution.py +21 -2
- package/plugins/vod-devkit/vod_mcp/config_forms.py +22 -6
- package/plugins/vod-devkit/vod_mcp/diagnose.py +4 -2
- package/plugins/vod-devkit/vod_mcp/host_adapters/base.py +4 -1
- package/plugins/vod-devkit/vod_mcp/host_adapters/codex.py +154 -34
- package/plugins/vod-devkit/vod_mcp/host_adapters/dsh.py +133 -22
- package/plugins/vod-devkit/vod_mcp/host_adapters/hermes.py +216 -59
- package/plugins/vod-devkit/vod_mcp/host_adapters/opencode.py +10 -4
- package/plugins/vod-devkit/vod_mcp/hosts.py +4 -0
- package/plugins/vod-devkit/vod_mcp/net.py +78 -18
- package/plugins/vod-devkit/vod_mcp/packs/__init__.py +97 -22
- package/plugins/vod-devkit/vod_mcp/packs/collect.py +50 -42
- package/plugins/vod-devkit/vod_mcp/packs/core.py +138 -2
- package/plugins/vod-devkit/vod_mcp/paths.py +200 -30
- package/plugins/vod-devkit/vod_mcp/payload.py +10 -5
- package/plugins/vod-devkit/vod_mcp/provenance.py +1 -1
- package/plugins/vod-devkit/vod_mcp/remote_app.py +4 -4
- package/plugins/vod-devkit/vod_mcp/runtime_state.py +151 -28
- package/plugins/vod-devkit/vod_mcp/server.py +52 -7
- package/plugins/vod-devkit/vod_mcp/skills_registry.py +29 -8
- package/plugins/vod-devkit/vod_mcp/tools.py +21 -3
- package/plugins/vod-devkit/vod_mcp/transport_remote.py +22 -3
- package/{vod_mcp → src/vod_mcp}/__init__.py +1 -1
- package/{vod_mcp → src/vod_mcp}/attribution.py +21 -2
- package/{vod_mcp → src/vod_mcp}/config_forms.py +22 -6
- package/{vod_mcp → src/vod_mcp}/diagnose.py +4 -2
- package/{vod_mcp → src/vod_mcp}/host_adapters/base.py +4 -1
- package/{vod_mcp → src/vod_mcp}/host_adapters/codex.py +154 -34
- package/{vod_mcp → src/vod_mcp}/host_adapters/dsh.py +133 -22
- package/src/vod_mcp/host_adapters/hermes.py +361 -0
- package/{vod_mcp → src/vod_mcp}/host_adapters/opencode.py +10 -4
- package/{vod_mcp → src/vod_mcp}/hosts.py +4 -0
- package/{vod_mcp → src/vod_mcp}/net.py +78 -18
- package/src/vod_mcp/packs/__init__.py +142 -0
- package/{vod_mcp → src/vod_mcp}/packs/collect.py +50 -42
- package/src/vod_mcp/packs/core.py +216 -0
- package/src/vod_mcp/paths.py +208 -0
- package/{vod_mcp → src/vod_mcp}/payload.py +10 -5
- package/{vod_mcp → src/vod_mcp}/provenance.py +1 -1
- package/{vod_mcp → src/vod_mcp}/remote_app.py +4 -4
- package/{vod_mcp → src/vod_mcp}/runtime_state.py +151 -28
- package/{vod_mcp → src/vod_mcp}/server.py +52 -7
- package/{vod_mcp → src/vod_mcp}/skills_registry.py +29 -8
- package/{vod_mcp → src/vod_mcp}/tools.py +21 -3
- package/{vod_mcp → src/vod_mcp}/transport_remote.py +22 -3
- package/src/vodkit_cli/auth_cmd.py +81 -0
- package/{vodkit_cli → src/vodkit_cli}/cli.py +38 -8
- package/{vodkit_cli → src/vodkit_cli}/common.py +14 -3
- package/{vodkit_cli → src/vodkit_cli}/doctor.py +147 -9
- package/{vodkit_cli → src/vodkit_cli}/install.py +148 -33
- package/src/vodkit_cli/packs_cmd.py +329 -0
- package/{vodkit_cli → src/vodkit_cli}/remote.py +3 -3
- package/src/vodkit_cli/uninstall.py +315 -0
- package/vod_mcp/host_adapters/__pycache__/__init__.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/__init__.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/atomcode.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/atomcode.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/base.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/base.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codearts.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codearts.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codeartswork.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codeartswork.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codex.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codex.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codex_desktop.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/codex_desktop.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/dsh.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/dsh.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/generic.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/generic.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/hermes.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/hermes.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/opencode.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/opencode.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/workbuddy.cpython-314.pyc +0 -0
- package/vod_mcp/host_adapters/__pycache__/workbuddy.cpython-39.pyc +0 -0
- package/vod_mcp/host_adapters/hermes.py +0 -204
- package/vod_mcp/packs/__init__.py +0 -67
- package/vod_mcp/packs/__pycache__/__init__.cpython-314.pyc +0 -0
- package/vod_mcp/packs/__pycache__/__init__.cpython-39.pyc +0 -0
- package/vod_mcp/packs/__pycache__/collect.cpython-314.pyc +0 -0
- package/vod_mcp/packs/__pycache__/collect.cpython-39.pyc +0 -0
- package/vod_mcp/packs/__pycache__/core.cpython-314.pyc +0 -0
- package/vod_mcp/packs/__pycache__/core.cpython-39.pyc +0 -0
- package/vod_mcp/packs/__pycache__/knowledge.cpython-314.pyc +0 -0
- package/vod_mcp/packs/__pycache__/knowledge.cpython-39.pyc +0 -0
- package/vod_mcp/packs/core.py +0 -80
- package/vod_mcp/paths.py +0 -38
- package/vodkit_cli/__pycache__/__init__.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/__init__.cpython-39.pyc +0 -0
- package/vodkit_cli/__pycache__/cli.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/cli.cpython-39.pyc +0 -0
- package/vodkit_cli/__pycache__/common.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/common.cpython-39.pyc +0 -0
- package/vodkit_cli/__pycache__/doctor.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/doctor.cpython-39.pyc +0 -0
- package/vodkit_cli/__pycache__/install.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/install.cpython-39.pyc +0 -0
- package/vodkit_cli/__pycache__/remote.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/remote.cpython-39.pyc +0 -0
- package/vodkit_cli/__pycache__/uninstall.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/uninstall.cpython-39.pyc +0 -0
- package/vodkit_cli/__pycache__/update.cpython-314.pyc +0 -0
- package/vodkit_cli/__pycache__/update.cpython-39.pyc +0 -0
- package/vodkit_cli/uninstall.py +0 -161
- /package/{safety → assets/safety}/policy.json +0 -0
- /package/{skills → assets/skills}/vod-core/references/acceptance-criteria.md +0 -0
- /package/{skills → assets/skills}/vod-core/references/verification-method.md +0 -0
- /package/{skills → assets/skills}/vod-feedback-collect/SKILL.md +0 -0
- /package/{skills → assets/skills}/vod-feedback-collect/references/acceptance-criteria.md +0 -0
- /package/{skills → assets/skills}/vod-feedback-collect/references/verification-method.md +0 -0
- /package/{skills → assets/skills}/vod-problem-classification-rules/SKILL.md +0 -0
- /package/{skills → assets/skills}/vod-scoring-rules/SKILL.md +0 -0
- /package/{vod_mcp → src/vod_mcp}/detect_framework.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/guardrails.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/host_adapters/__init__.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/host_adapters/atomcode.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/host_adapters/codearts.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/host_adapters/codeartswork.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/host_adapters/codex_desktop.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/host_adapters/generic.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/host_adapters/workbuddy.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/packs/knowledge.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/pending.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/policy.py +0 -0
- /package/{vod_mcp → src/vod_mcp}/runtime.example.json +0 -0
- /package/{vod_mcp → src/vod_mcp}/update_check.py +0 -0
- /package/{vodkit_cli → src/vodkit_cli}/__init__.py +0 -0
- /package/{vodkit_cli → src/vodkit_cli}/update.py +0 -0
|
@@ -19,18 +19,72 @@ _REQ_KEY = contextvars.ContextVar("vod_req_key", default=None)
|
|
|
19
19
|
|
|
20
20
|
_SERVER_FACE = contextvars.ContextVar("vod_server_face", default=False)
|
|
21
21
|
|
|
22
|
+
# 匿名令牌代领总开关(D-token-machine-1 安全护栏):进程级布尔,启动期由
|
|
23
|
+
# transport_remote 按绑定地址决定——非回环绑定(可能被反代/公网触达)默认关闭
|
|
24
|
+
# 代领,避免"任何能连端口的进程都能用这台机的身份提交、消耗额度"。
|
|
25
|
+
# 回环绑定(同机部署的默认形态)保持开启,与本地 stdio 完全一致。
|
|
26
|
+
ANON_MINT_DISABLED = False
|
|
22
27
|
|
|
23
|
-
def _eff_key(explicit=None) -> str:
|
|
24
|
-
"""当前生效的 key:显式参数 > 请求头(HTTP 面)> env/runtime(stdio 面)。"""
|
|
25
|
-
if explicit is not None:
|
|
26
|
-
return explicit
|
|
27
|
-
return _REQ_KEY.get() or JAVA_KEY
|
|
28
28
|
|
|
29
|
+
def _live(field: str, default: str = "") -> str:
|
|
30
|
+
"""身份类值的**调用期**解析:env(平台注入)> runtime.json 现读 > 默认。
|
|
29
31
|
|
|
30
|
-
|
|
32
|
+
为什么不能在 import 期定常量(D-state-read-1):MCP server 是长驻进程,
|
|
33
|
+
`auth init --apply` 换 key、自动领取匿名令牌、安装器改 apiBase 都会改
|
|
34
|
+
runtime.json;常量把进程启动那一刻的值冻结住,表现是"明明配了/换了 key,
|
|
35
|
+
工具仍用旧的"(401 或打到旧环境)。读失败回落默认,不阻断出口。
|
|
36
|
+
"""
|
|
37
|
+
env_key = "VOD_JAVA_API_KEY" if field == "java_key" else "VOD_JAVA_API_BASE"
|
|
38
|
+
env = os.environ.get(env_key, "")
|
|
39
|
+
if env:
|
|
40
|
+
return env
|
|
41
|
+
try:
|
|
42
|
+
val = rt._runtime_cfg().get(field)
|
|
43
|
+
except Exception: # noqa: BLE001 状态文件坏/不可读时不阻断出口
|
|
44
|
+
val = None
|
|
45
|
+
if val:
|
|
46
|
+
return str(val)
|
|
47
|
+
# 镜像回落:本进程刚写的值(_runtime_update 同步镜像)与测试桩都走这条路;
|
|
48
|
+
# 文件优先保证"外部(auth init / 重装)改过的值"立刻生效。
|
|
49
|
+
return str(rt._RT.get(field) or default)
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
def _java_key() -> str:
|
|
53
|
+
# 显式 set 过的模块属性优先(monkeypatch / 历史赋值):这是仓内已有的 patch 面契约
|
|
54
|
+
# ("共享符号用模块属性访问"),现读只在**没人 set** 时生效。
|
|
55
|
+
override = globals().get("JAVA_KEY")
|
|
56
|
+
if override:
|
|
57
|
+
return str(override)
|
|
58
|
+
return _live("java_key", "")
|
|
59
|
+
|
|
60
|
+
|
|
61
|
+
def _java_base() -> str:
|
|
62
|
+
override = globals().get("JAVA_BASE")
|
|
63
|
+
if override:
|
|
64
|
+
return str(override)
|
|
65
|
+
return _live("java_base", DEFAULT_JAVA_BASE)
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
def __getattr__(name: str):
|
|
69
|
+
"""`net.JAVA_KEY` / `net.JAVA_BASE` 一律**现读**(PEP 562 模块级 __getattr__)。
|
|
70
|
+
|
|
71
|
+
保留这两个名字只为不动既有调用点与测试的 patch 面:属性被显式 set 过
|
|
72
|
+
(monkeypatch / 历史赋值)时优先用 set 的值,否则每次现读 runtime。
|
|
73
|
+
模块**内部**必须直接调 `_java_key()` / `_java_base()`——模块内部的全局名查找
|
|
74
|
+
不会触发 __getattr__,写成 `JAVA_KEY` 会 NameError 或读到旧值。
|
|
75
|
+
"""
|
|
76
|
+
if name == "JAVA_KEY":
|
|
77
|
+
return _java_key()
|
|
78
|
+
if name == "JAVA_BASE":
|
|
79
|
+
return _java_base()
|
|
80
|
+
raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
|
|
31
81
|
|
|
32
82
|
|
|
33
|
-
|
|
83
|
+
def _eff_key(explicit=None) -> str:
|
|
84
|
+
"""当前生效的 key:显式参数 > 请求头(HTTP 面)> env/runtime(stdio 面)。"""
|
|
85
|
+
if explicit is not None:
|
|
86
|
+
return explicit
|
|
87
|
+
return _REQ_KEY.get() or _java_key()
|
|
34
88
|
|
|
35
89
|
|
|
36
90
|
_META_PATH = "/rest/developer/manager/hdvodmngservice/v1/external/meta"
|
|
@@ -65,7 +119,7 @@ def _load_meta(force: bool = False) -> dict:
|
|
|
65
119
|
"dictVersion": cache["data"].get("dictVersion"),
|
|
66
120
|
"stale": False, "source": "cache"}
|
|
67
121
|
try:
|
|
68
|
-
out = _http("GET", _META_PATH, None, base=
|
|
122
|
+
out = _http("GET", _META_PATH, None, base=_java_base(), key=_eff_key(), timeout=10)
|
|
69
123
|
data = out.get("data") or {}
|
|
70
124
|
if isinstance(data.get("products"), list) and data["products"]:
|
|
71
125
|
rt._runtime_update({"meta_cache": {"fetchedAt": int(now), "data": data}})
|
|
@@ -95,8 +149,8 @@ def _http(method: str, path: str, body: dict | None = None,
|
|
|
95
149
|
base/key 缺省在调用时解析模块级配置(不能用函数默认值——定义时即冻结,
|
|
96
150
|
环境变更/测试 monkeypatch 均无法生效)。
|
|
97
151
|
"""
|
|
98
|
-
base = base if base is not None else
|
|
99
|
-
key = key if key is not None else
|
|
152
|
+
base = base if base is not None else _java_base()
|
|
153
|
+
key = key if key is not None else _java_key()
|
|
100
154
|
# 传输协议守卫:非本机回环一律要求 https(Bearer 不得明文过公网)
|
|
101
155
|
_host = base.split("//", 1)[-1].split("/", 1)[0].split(":")[0]
|
|
102
156
|
if not base.startswith("https://") and _host not in ("127.0.0.1", "localhost", "::1"):
|
|
@@ -145,7 +199,7 @@ def probe_key(key: str | None = None, timeout: int = 8) -> dict:
|
|
|
145
199
|
不判定——网络问题不是 key 问题,报"无法验证"而非"无效"
|
|
146
200
|
"""
|
|
147
201
|
explicit = key is not None # 显式传参(服务面=请求头 Bearer)按显式口径判
|
|
148
|
-
key = key if key is not None else
|
|
202
|
+
key = key if key is not None else _java_key()
|
|
149
203
|
fp = _fingerprint(key)
|
|
150
204
|
if not key:
|
|
151
205
|
return {"ok": None, "reason": "no-key", "fingerprint": None}
|
|
@@ -168,7 +222,7 @@ def probe_key(key: str | None = None, timeout: int = 8) -> dict:
|
|
|
168
222
|
return {"ok": False, "reason": "device-mismatch", "fingerprint": fp,
|
|
169
223
|
"note": "匿名令牌与本设备不匹配:令牌本身有效,"
|
|
170
224
|
"在本设备重新申请令牌后可继续(POST /external/token,"
|
|
171
|
-
"
|
|
225
|
+
"首次提交或 vod_auth_ensure 时自动完成)"}
|
|
172
226
|
if not (explicit or _explicit_key()):
|
|
173
227
|
# 匿名令牌 401 ≠ 配置错误:报"过期待重领"而非"rejected",
|
|
174
228
|
# 避免 runtime 残留过期匿名令牌时被误读为正式 key 失效
|
|
@@ -180,9 +234,9 @@ def probe_key(key: str | None = None, timeout: int = 8) -> dict:
|
|
|
180
234
|
|
|
181
235
|
|
|
182
236
|
def _key_state() -> dict:
|
|
183
|
-
return {"configured": bool(
|
|
184
|
-
"base":
|
|
185
|
-
"note": "已配置" if
|
|
237
|
+
return {"configured": bool(_java_key()), "fingerprint": _fingerprint(_java_key()),
|
|
238
|
+
"base": _java_base(),
|
|
239
|
+
"note": "已配置" if _java_key() else "未配置(首次提交或 vod_auth_ensure 时自动取匿名令牌)"}
|
|
186
240
|
|
|
187
241
|
|
|
188
242
|
def _explicit_key() -> bool:
|
|
@@ -195,7 +249,9 @@ def _explicit_key() -> bool:
|
|
|
195
249
|
"""
|
|
196
250
|
if bool(os.environ.get("VOD_JAVA_API_KEY")):
|
|
197
251
|
return True
|
|
198
|
-
|
|
252
|
+
tier = str(rt._runtime_cfg().get("token_tier")
|
|
253
|
+
or rt._RT.get("token_tier") or "")
|
|
254
|
+
return bool(_java_key()) and tier != "anonymous"
|
|
199
255
|
|
|
200
256
|
|
|
201
257
|
def _legacy_key_hint() -> str:
|
|
@@ -235,7 +291,9 @@ def _fetch_anon_token() -> str | None:
|
|
|
235
291
|
D-anon-verify(2026-11-05 真机实锤):引擎返回 ApiResponse 信封,
|
|
236
292
|
顶层取 token 恒 None → 无 key 首提必 -32012,信封解析为必经路径。"""
|
|
237
293
|
try:
|
|
238
|
-
|
|
294
|
+
if ANON_MINT_DISABLED:
|
|
295
|
+
return None # 非回环远程面:不代领(调用方须自带 Bearer)
|
|
296
|
+
out = _http("POST", _TOKEN_PATH, {}, base=_java_base(), key="", timeout=15)
|
|
239
297
|
return _extract_anon_token(out)
|
|
240
298
|
except ToolError:
|
|
241
299
|
return None
|
|
@@ -245,7 +303,9 @@ def _acquire_anon_token_or_raise() -> str:
|
|
|
245
303
|
"""缺 key/匿名令牌失效 → 领零字段匿名令牌;端点不可用则如实报错。"""
|
|
246
304
|
token = _fetch_anon_token()
|
|
247
305
|
if not token:
|
|
306
|
+
hint = (";远程面若绑定非回环地址,代领默认关闭——请带 Authorization: Bearer <key>,"
|
|
307
|
+
"或服务端以 --allow-anon-mint 显式开启" if ANON_MINT_DISABLED else "")
|
|
248
308
|
raise ToolError(
|
|
249
309
|
"未配置接入 key 且匿名令牌端点不可用。引导:"
|
|
250
|
-
+ ";".join(str(g["label"]) for g in _KEY_GUIDANCE), code=-32012)
|
|
310
|
+
+ ";".join(str(g["label"]) for g in _KEY_GUIDANCE) + hint, code=-32012)
|
|
251
311
|
return token
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
"""packs 裁剪:VOD_PACKS=core,workflow,kb(逗号分隔,默认全装)。
|
|
2
|
+
|
|
3
|
+
core 常驻(vod_devkit_info + vod-core 技能);未启用的 pack 工具不注册。
|
|
4
|
+
"""
|
|
5
|
+
import os
|
|
6
|
+
import sys
|
|
7
|
+
|
|
8
|
+
ALL_PACKS = ("core", "collect", "knowledge")
|
|
9
|
+
|
|
10
|
+
PACK_TOOLS = {
|
|
11
|
+
# vod_search_products:问用户"是哪个产品"前给候选(只读,D-product-ask-1)
|
|
12
|
+
"core": ["vod_devkit_info", "vod_auth_status", "vod_auth_ensure", "vod_check_update",
|
|
13
|
+
"vod_search_products", "vod_packs_configure"],
|
|
14
|
+
# 两段式(D-token-approval-2 极简形态)随 collect 下发;codex 话术走 draft→commit
|
|
15
|
+
"collect": ["vod_submit_voices", "vod_draft_voices", "vod_commit_voices", "vod_list_submitted"],
|
|
16
|
+
# 领域规则技能披露(第二轨):知道有哪几本规则、按需取全文。
|
|
17
|
+
# 只读、零上游调用、零依赖——与"纯知识包"的定位一致。
|
|
18
|
+
"knowledge": ["vod_list_skills", "vod_retrieve_skill"],
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
BREAKER_MARKERS = ()
|
|
23
|
+
# 熔断标记(D-codex-circuit-breaker-1):install 门禁可被 `VOD_PACKS=core,collect serve`
|
|
24
|
+
# 绕过——运行期同查标记强制降级。默认值**调用期解析**(不用 import 期 expanduser:
|
|
25
|
+
# 测试 monkeypatch HOME 时模块常量会钉在真机 HOME 上,标记就查错了机器);
|
|
26
|
+
# 非空即视为测试注入的显式清单(monkeypatch.setattr(packs, "BREAKER_MARKERS", ...))。
|
|
27
|
+
def breaker_markers() -> tuple:
|
|
28
|
+
if BREAKER_MARKERS:
|
|
29
|
+
return tuple(BREAKER_MARKERS)
|
|
30
|
+
return (os.path.expanduser("~/.codex/vod-collect-suspended.json"),)
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
def enabled_packs() -> tuple:
|
|
34
|
+
return _resolve(os.environ.get("VOD_PACKS", "").strip())
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
class UnknownPack(ValueError):
|
|
38
|
+
"""VOD_PACKS 里出现未知包 id。
|
|
39
|
+
|
|
40
|
+
对齐 devkit 口径:**启动即报错**,不静默过滤。静默过滤=操作者以为关掉的还开着、
|
|
41
|
+
以为打开的其实没装——"看起来配了没生效"是比崩溃更难查的一类故障。
|
|
42
|
+
"""
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
def parse_packs(raw: str) -> tuple:
|
|
46
|
+
"""解析 VOD_PACKS 字面值(逗号分隔,kb=knowledge 旧称)。未知 id 抛 UnknownPack。"""
|
|
47
|
+
if not raw:
|
|
48
|
+
return ALL_PACKS
|
|
49
|
+
ids = []
|
|
50
|
+
for part in raw.split(","):
|
|
51
|
+
p = part.strip()
|
|
52
|
+
if not p:
|
|
53
|
+
continue
|
|
54
|
+
ids.append("knowledge" if p == "kb" else p)
|
|
55
|
+
unknown = [p for p in ids if p not in ALL_PACKS]
|
|
56
|
+
if unknown:
|
|
57
|
+
raise UnknownPack(
|
|
58
|
+
f"VOD_PACKS 含未知包 id: {','.join(unknown)};可用: {','.join(ALL_PACKS)}")
|
|
59
|
+
return tuple(ids) or ALL_PACKS
|
|
60
|
+
|
|
61
|
+
|
|
62
|
+
def _resolve(raw: str) -> tuple:
|
|
63
|
+
if not raw:
|
|
64
|
+
return ALL_PACKS
|
|
65
|
+
packs = parse_packs(raw)
|
|
66
|
+
if "core" not in packs:
|
|
67
|
+
packs = ("core",) + packs
|
|
68
|
+
if "collect" in packs and any(os.path.isfile(m) for m in breaker_markers()):
|
|
69
|
+
# 运行期熔断门禁:collect 强制摘除(非静默——stderr 告警)。
|
|
70
|
+
# 解除=删熔断标记(install --ack-suspension 即此语义)
|
|
71
|
+
packs = tuple(p for p in packs if p != "collect")
|
|
72
|
+
print("[vod-devkit] 采集熔断生效(codex 未确认提交 ≥2 次,"
|
|
73
|
+
"D-codex-circuit-breaker-1):collect 已强制摘除。"
|
|
74
|
+
"恢复前置=token 化上线并过回归;--ack-suspension 解除安装门禁,"
|
|
75
|
+
"运行期解除须删熔断标记", file=sys.stderr)
|
|
76
|
+
return packs
|
|
77
|
+
|
|
78
|
+
|
|
79
|
+
# 服务面(HTTP 传输)摘除的工具。(2026-11-16 D-token-machine-1 修订:远程面收窄为
|
|
80
|
+
# 只剩这一项——远程部署的实际形态是"同一台机器上独立跑一个 MCP server 进程,
|
|
81
|
+
# 多个 agent 通过 HTTP 连它",和本地同一套身份/账本语义,所以 draft/commit/ledger 都放开。)
|
|
82
|
+
# packs_configure:会话内开关是**进程内状态**,HTTP 面每请求现造 server、无会话,
|
|
83
|
+
# 开关会在下一个请求消失("以为改了其实没改");且多 agent 共用进程时会互相影响。
|
|
84
|
+
# draft/commit 放开的前置是**草稿归属隔离**:草稿落 owner(宿主名+身份 hash),commit 校验归属,
|
|
85
|
+
# 避免同机两个 agent 之间"A 的草稿被 B 提交"(collect.draft_voices / commit_voices)。
|
|
86
|
+
# 注意:submit 不摘——它对 VOD 的唯一动作是调用引擎 HTTP API,落库是服务端的事。
|
|
87
|
+
REMOTE_WITHHELD = ("vod_packs_configure",)
|
|
88
|
+
|
|
89
|
+
|
|
90
|
+
def enabled_tools(remote: bool = False) -> list:
|
|
91
|
+
tools = []
|
|
92
|
+
for pack in effective_packs():
|
|
93
|
+
tools.extend(PACK_TOOLS[pack])
|
|
94
|
+
if remote:
|
|
95
|
+
tools = [t for t in tools if t not in REMOTE_WITHHELD]
|
|
96
|
+
return tools
|
|
97
|
+
|
|
98
|
+
|
|
99
|
+
# ── 会话内开关(D-packs-configure-1) ─────────────────────
|
|
100
|
+
#
|
|
101
|
+
# 与 CLI `packs enable|disable --apply` 分工:CLI 写宿主配置(持久,重启用),
|
|
102
|
+
# 这里只改进程内状态(立即生效,重启即清)。**不写 env、不写配置**——MCP 工具
|
|
103
|
+
# 去改宿主配置文件会把"谁改的"变成猜谜,而持久化面已经有一个可解释入口。
|
|
104
|
+
|
|
105
|
+
_RUNTIME: tuple | None = None
|
|
106
|
+
|
|
107
|
+
|
|
108
|
+
class PackRefused(PermissionError):
|
|
109
|
+
"""运行期拒绝(安全门禁,如采集熔断)。与 UnknownPack(拼写错)分开报。"""
|
|
110
|
+
|
|
111
|
+
|
|
112
|
+
def effective_packs() -> tuple:
|
|
113
|
+
"""当前生效的包:会话内开关优先,否则按 VOD_PACKS(含 core 强制与熔断)。"""
|
|
114
|
+
return _RUNTIME if _RUNTIME is not None else enabled_packs()
|
|
115
|
+
|
|
116
|
+
|
|
117
|
+
def normalize_packs(ids) -> tuple:
|
|
118
|
+
"""归一请求的包列表:去重、kb 别名、core 强制、未知 id 报错、熔断拦截。"""
|
|
119
|
+
want = []
|
|
120
|
+
for p in ids:
|
|
121
|
+
p = (p or "").strip()
|
|
122
|
+
if not p:
|
|
123
|
+
continue
|
|
124
|
+
p = "knowledge" if p == "kb" else p
|
|
125
|
+
if p not in ALL_PACKS:
|
|
126
|
+
raise UnknownPack(
|
|
127
|
+
f"未知包 id: {p};可用: {','.join(ALL_PACKS)}")
|
|
128
|
+
if p not in want:
|
|
129
|
+
want.append(p)
|
|
130
|
+
if "collect" in want and any(os.path.isfile(m) for m in breaker_markers()):
|
|
131
|
+
# 熔断是安全门禁:显式开启也不能绕过。静默摘掉等于"配了没生效"。
|
|
132
|
+
raise PackRefused(
|
|
133
|
+
"采集熔断生效(codex 未确认提交 ≥2 次,D-codex-circuit-breaker-1):"
|
|
134
|
+
"会话内不能开启 collect;解除须删熔断标记")
|
|
135
|
+
return tuple(dict.fromkeys(["core"] + want))
|
|
136
|
+
|
|
137
|
+
|
|
138
|
+
def set_runtime_packs(ids) -> tuple:
|
|
139
|
+
"""设置会话内生效包;ids 为 None 时恢复按 VOD_PACKS。返回新生效 tuple。"""
|
|
140
|
+
global _RUNTIME
|
|
141
|
+
_RUNTIME = None if ids is None else normalize_packs(ids)
|
|
142
|
+
return effective_packs()
|
|
@@ -39,7 +39,7 @@ def _attribute_product(items: list, params: dict, client_info: dict | None = Non
|
|
|
39
39
|
① 用户明确回答/确认(params.product,仅问过用户后由模型填)
|
|
40
40
|
② 原话唯一且高置信提及(多产品/歧义=低置信,转去问)
|
|
41
41
|
③ 会话记忆(30 分钟滑动,进程内;跨会话不继承)
|
|
42
|
-
④
|
|
42
|
+
④ 安装先验(**仅在原话出现自指时生效**:D-product-ask-1 修订 A,2026-11-16)
|
|
43
43
|
四级都拿不到(含用户明确说"不知道/随便"= params.productNotSpecified)→
|
|
44
44
|
返回 source=unknown + confidence=low,由调用方抛可执行错误要求追问。
|
|
45
45
|
**不做 host_default 兜底**(2026-11-12 复评删除:宿主产品也是一次推断,
|
|
@@ -415,13 +415,9 @@ def submit_voices(params: dict, client_info: dict | None = None,
|
|
|
415
415
|
out = net._http("POST", _EXISTING_SUBMIT, body, base=net.JAVA_BASE, key=net._eff_key())
|
|
416
416
|
return vid, (out.get("data") or {}).get("taskId")
|
|
417
417
|
|
|
418
|
-
# 服务面(HTTP
|
|
419
|
-
#
|
|
420
|
-
|
|
421
|
-
raise net.ToolError(
|
|
422
|
-
"服务面(HTTP 传输)不代签身份:请在本请求带上 Authorization: Bearer "
|
|
423
|
-
"<VOD key>(插件只搬运身份,不产生身份;落库与配额都在服务端)",
|
|
424
|
-
code=-32012)
|
|
418
|
+
# 服务面(HTTP):身份优先取请求头 Bearer;没有就同本地一样走机器级匿名令牌
|
|
419
|
+
# (D-token-machine-1 定稿:本地/远程同一套身份语义。远程多租户若需按调用方隔离,
|
|
420
|
+
# 由调用方带 Bearer 显式给出身份;匿名是"整机一份"的低信任档)
|
|
425
421
|
|
|
426
422
|
# 缺产品且用户没说不知道 → 可执行错误(先问一次),不许裸提交 UNKNOWN
|
|
427
423
|
_require_product_or_ask(attr, items, client_info)
|
|
@@ -451,20 +447,13 @@ def submit_voices(params: dict, client_info: dict | None = None,
|
|
|
451
447
|
if ex.code == 404:
|
|
452
448
|
fallback = True # 囤积端点未部署 → 落到下方 legacy 回落
|
|
453
449
|
elif not net._eff_key() or ex.code == -32012:
|
|
454
|
-
if net._SERVER_FACE.get():
|
|
455
|
-
# 服务面(HTTP):不代签身份。匿名令牌按设备锚点签发,一进程
|
|
456
|
-
# 一锚点会把配额/声量/归因全搅在一起(服务端多用户形态的
|
|
457
|
-
# 已拍板口径:formal/host key + 按请求透传)。
|
|
458
|
-
raise net.ToolError(
|
|
459
|
-
"服务面(HTTP 传输)不代签身份:请在本请求带上 "
|
|
460
|
-
"Authorization: Bearer <VOD key>,或改用 stdio 形态的匿名链",
|
|
461
|
-
code=-32012)
|
|
462
450
|
if net._explicit_key():
|
|
463
451
|
_raise_explicit_key_rejected(net._eff_key())
|
|
464
452
|
# 缺 key/匿名令牌失效 → 零字段匿名令牌 → 落 runtime.json → 重试一次
|
|
465
453
|
token = net._acquire_anon_token_or_raise()
|
|
466
|
-
net
|
|
467
|
-
|
|
454
|
+
# 统一状态入口(落盘 + 镜像);net 的 key 是调用期现读,不再写模块属性——
|
|
455
|
+
# 写属性会让 __getattr__ 失效、这份 token 又被冻结在进程里(D-state-read-1)
|
|
456
|
+
rt._runtime_update({"java_key": token, "token_tier": "anonymous"})
|
|
468
457
|
out = net._http("POST", _SUBMIT_HOARDING, body, base=net.JAVA_BASE, key=net._eff_key())
|
|
469
458
|
else:
|
|
470
459
|
raise # 网络/413 等如实上抛
|
|
@@ -516,16 +505,11 @@ def submit_voices(params: dict, client_info: dict | None = None,
|
|
|
516
505
|
voice_ids.append(vid)
|
|
517
506
|
task_ids.append(None)
|
|
518
507
|
elif (not net._eff_key() or e.code == -32012) and not voice_ids:
|
|
519
|
-
if net._SERVER_FACE.get():
|
|
520
|
-
rejected.append({"index": i, "reason":
|
|
521
|
-
"服务面(HTTP 传输)不代签身份:请带 Authorization: Bearer <VOD key>"})
|
|
522
|
-
continue
|
|
523
508
|
if net._explicit_key():
|
|
524
509
|
_raise_explicit_key_rejected(net._eff_key())
|
|
525
510
|
# 零字段匿名令牌:缺 key/401 → 自动取令牌 → 落 runtime.json → 重试一次
|
|
526
511
|
token = net._acquire_anon_token_or_raise()
|
|
527
|
-
|
|
528
|
-
rt._save_runtime({"java_key": token, "token_tier": "anonymous"})
|
|
512
|
+
rt._runtime_update({"java_key": token, "token_tier": "anonymous"})
|
|
529
513
|
vid, tid = _legacy_submit(i, v, content)
|
|
530
514
|
accepted += 1
|
|
531
515
|
voice_ids.append(vid)
|
|
@@ -614,11 +598,16 @@ def draft_voices(params: dict, client_info: dict | None = None) -> dict:
|
|
|
614
598
|
payload_sha = hashlib.sha256(
|
|
615
599
|
json.dumps(payload, sort_keys=True, ensure_ascii=False).encode()).hexdigest()
|
|
616
600
|
|
|
617
|
-
|
|
618
|
-
store = rt.
|
|
601
|
+
def _mutate(cfg: dict):
|
|
602
|
+
store = rt._drafts_purge(cfg.get(rt._DRAFT_KEY) or {})
|
|
619
603
|
store[draft_id] = {
|
|
620
604
|
"payload": payload, "payloadSha256": payload_sha,
|
|
621
605
|
"tokenHash": rt._sha256(token),
|
|
606
|
+
# 草稿归属(D-token-machine-1 远程面放开两段式的前置):
|
|
607
|
+
# 同机多个 agent 共用一个远程 server 时草稿池是共享的,
|
|
608
|
+
# 记录创建者、commit 时校验,避免"A 的草稿被 B 提交"。
|
|
609
|
+
# 旧草稿无 owner 字段 → commit 兼容放行(升级不断回合)。
|
|
610
|
+
"owner": rt._session_key(client_info),
|
|
622
611
|
# D-resume-commit-1:token 明文随草稿落盘(runtime.json 0600,与 java_key
|
|
623
612
|
# 同级保护)。token 的威胁模型是"防载荷改写"而非"同意凭证"——落盘不放大
|
|
624
613
|
# 风险,换断回合可续:agent 回合中断后凭 draftId 即可恢复提交(此前
|
|
@@ -631,7 +620,9 @@ def draft_voices(params: dict, client_info: dict | None = None) -> dict:
|
|
|
631
620
|
}
|
|
632
621
|
while len(store) > rt._DRAFT_CAP: # 环形:最旧先淘汰
|
|
633
622
|
store.pop(next(iter(store)))
|
|
634
|
-
rt.
|
|
623
|
+
cfg[rt._DRAFT_KEY] = store
|
|
624
|
+
|
|
625
|
+
rt._runtime_atomic(_mutate) # 读整键→改→写整键必须整段在锁内(跨进程)
|
|
635
626
|
|
|
636
627
|
out = {
|
|
637
628
|
"draftId": draft_id,
|
|
@@ -660,22 +651,39 @@ def commit_voices(params: dict, client_info: dict | None = None) -> dict:
|
|
|
660
651
|
if not draft_id:
|
|
661
652
|
raise net.ToolError("draftId 为必填(取自 vod_draft_voices 返回原样透传)", code=-32602)
|
|
662
653
|
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
654
|
+
holder: dict = {}
|
|
655
|
+
|
|
656
|
+
def _consume(cfg: dict) -> None:
|
|
657
|
+
"""校验 + 单次消费**同一事务内**完成。
|
|
658
|
+
|
|
659
|
+
为什么不能在锁外读 store 再进锁里 pop:读到的是一份快照,覆盖回去会把别的
|
|
660
|
+
draft 甚至已消费的草稿复活(跨进程时尤其明显)。
|
|
661
|
+
"""
|
|
662
|
+
store = rt._drafts_purge(cfg.get(rt._DRAFT_KEY) or {})
|
|
663
|
+
draft = store.get(draft_id)
|
|
664
|
+
if draft is None:
|
|
665
|
+
raise net.ToolError("草稿不存在或已过期(10 分钟 TTL),请重新 vod_draft_voices",
|
|
666
|
+
code=-32011)
|
|
667
|
+
owner = draft.get("owner")
|
|
668
|
+
if owner and owner != rt._session_key(client_info):
|
|
669
|
+
raise net.ToolError(
|
|
670
|
+
"这份草稿不属于当前客户端(草稿按宿主/会话隔离:只能由创建它的那个 agent 提交)",
|
|
671
|
+
code=-32011)
|
|
672
|
+
token = str(params.get("approvalToken", "")) or str(draft.get("token", ""))
|
|
673
|
+
payload_sha = str(params.get("payloadSha256", "")) or str(draft["payloadSha256"])
|
|
674
|
+
if draft["tokenHash"] != rt._sha256(token):
|
|
675
|
+
raise net.ToolError("审批令牌不匹配(draft 返回的 approvalToken 原样透传)",
|
|
676
|
+
code=-32011)
|
|
677
|
+
if draft["payloadSha256"] != payload_sha:
|
|
678
|
+
raise net.ToolError("载荷校验不符(payloadSha256 与 draft 签发值不一致,禁止改写已确认内容)",
|
|
679
|
+
code=-32011)
|
|
680
|
+
# 单次消费:提交中途崩溃也不会二次提交(宁可丢一单重走流程)
|
|
677
681
|
store.pop(draft_id)
|
|
678
|
-
rt.
|
|
682
|
+
cfg[rt._DRAFT_KEY] = store
|
|
683
|
+
holder["draft"] = draft
|
|
684
|
+
|
|
685
|
+
rt._runtime_atomic(_consume)
|
|
686
|
+
draft = holder["draft"]
|
|
679
687
|
|
|
680
688
|
out = submit_voices(dict(draft["payload"]), client_info,
|
|
681
689
|
ledger_extra={"stage": "committed", "draftId": draft_id})
|