vod-devkit 0.5.11 → 0.5.13
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 +12 -0
- package/README.md +16 -0
- package/assets/contract/tools.schema.json +1 -1
- package/package.json +1 -1
- package/packages/dsh/package.json +1 -1
- package/plugins/vod-devkit/.codex-plugin/plugin.json +1 -1
- package/plugins/vod-devkit/build-info.json +3 -3
- package/plugins/vod-devkit/contract/tools.schema.json +1 -1
- package/plugins/vod-devkit/vod_mcp/__init__.py +1 -1
- package/plugins/vod-devkit/vod_mcp/host_adapters/dsh.py +21 -5
- package/plugins/vod-devkit/vod_mcp/payload.py +72 -1
- package/src/vod_mcp/__init__.py +1 -1
- package/src/vod_mcp/host_adapters/dsh.py +21 -5
- package/src/vod_mcp/payload.py +72 -1
- package/src/vodkit_cli/cli.py +16 -1
- package/src/vodkit_cli/doctor.py +22 -0
- package/src/vodkit_cli/packs_cmd.py +83 -6
- package/src/vodkit_cli/prune_cmd.py +75 -0
- package/src/vodkit_cli/remote.py +113 -46
- package/src/vodkit_cli/uninstall.py +7 -0
package/CHANGELOG.md
CHANGED
|
@@ -431,3 +431,15 @@
|
|
|
431
431
|
|
|
432
432
|
- 36495cd fix(dsh): 壳安装钉版本 + 巡检看真判据(0.5.10 真机实锤)
|
|
433
433
|
|
|
434
|
+
|
|
435
|
+
## v0.5.12(2026-11-16)
|
|
436
|
+
|
|
437
|
+
- 7574e3c docs(dsh): 接入手册按 0.5.11 实现重写(两种形态 / 托管块 / 身份两套账本)
|
|
438
|
+
|
|
439
|
+
|
|
440
|
+
## v0.5.13(2026-11-16)
|
|
441
|
+
|
|
442
|
+
- fd804b0 fix(query/prune): 门禁边界 + basetemp 判据 + 壳 add 超时 + prune 文档(评审 a/b/c/d)
|
|
443
|
+
- 4d60d67 fix(release): 发版前必须无未提交改动 + 补交 0.5.12 漏掉的源码(D1/D2/D3/D4)
|
|
444
|
+
- e9e525b feat(prune): 显式清载荷 + 产品校验复用 state 令牌(D3/D6)
|
|
445
|
+
|
package/README.md
CHANGED
|
@@ -82,8 +82,24 @@ npx -y vod-devkit@latest uninstall --target codex --clean-global # 并清载
|
|
|
82
82
|
npx -y vod-devkit@latest auth status # 引擎地址 + 凭据指纹 + 档位(key / 匿名令牌)
|
|
83
83
|
npx -y vod-devkit@latest auth init --key <k> # 校验并显示指纹(缺省不写盘)
|
|
84
84
|
npx -y vod-devkit@latest auth init --key <k> --apply # 写 runtime.json(唯一入口,0600)
|
|
85
|
+
npx -y vod-devkit@latest prune --payloads # 列出可清旧载荷(默认 dry-run,不删)
|
|
86
|
+
npx -y vod-devkit@latest prune --payloads --apply --yes # 真删(保留当前版本与在用的版本)
|
|
85
87
|
```
|
|
86
88
|
|
|
89
|
+
### 旧载荷清理(prune)
|
|
90
|
+
|
|
91
|
+
每升一版会在 `~/.vod-devkit/payloads/<版本>/` 落一份载荷(宿主入口指向它,与 npx 缓存解耦)。
|
|
92
|
+
旧版本**不会自动删**——install 永不隐式删用户文件(删错=某宿主配置指向的 `server.py` 消失)。
|
|
93
|
+
要收空间用显式命令:
|
|
94
|
+
|
|
95
|
+
- **只清清单内**:`payloads/<版本>/` 且带 `payload.json`(安装器 `stage()` 落的);
|
|
96
|
+
没有该文件的手工目录与残留一律不在此列,绝不按 glob 删目录;
|
|
97
|
+
- **保留**:当前版本 + 任何安装行 `payloadDir` 在用的版本;`--keep N` 额外保留最新 N 份;
|
|
98
|
+
- **默认 dry-run**(打印 版本/大小/路径 + 总量);`--apply` 才删,交互式再问 y/N,
|
|
99
|
+
非 tty 必须 `--yes`,否则拒绝执行(exit 2);
|
|
100
|
+
- **只删载荷**,不碰机器级 state(令牌/账本);单条删除失败记录后继续,最后非零退出;
|
|
101
|
+
- 拿不准先看 `doctor` 的 `[doctor] 载荷:在用 …;未被任何安装行引用 […]` 那一行。
|
|
102
|
+
|
|
87
103
|
凭据优先级:显式 key(`auth init` 写入)> 环境变量 `VOD_JAVA_API_KEY`(平台/CI 注入)
|
|
88
104
|
> 匿名令牌自动领取(设备绑定)。**换 key 不需要重启宿主会话**:插件在每次调用引擎前现读
|
|
89
105
|
runtime.json 的身份值(`auth init --apply` 之后的下一次提交立刻用新 key)。**不要把 key 写进宿主 MCP 配置的 `env`**——明文,且会随
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
|
3
3
|
"title": "vod-devkit MCP 工具契约(唯一事实源)",
|
|
4
|
-
"version": "0.5.
|
|
4
|
+
"version": "0.5.13",
|
|
5
5
|
"tools": {
|
|
6
6
|
"vod_submit_voices": {
|
|
7
7
|
"description": "提交用户反馈进 VOD。**先决条件(优先于本描述其余所有内容):调用前必须已征得用户对'提交这条反馈'的明确同意;用户陈述/抱怨反馈本身不构成同意;用户未同意时禁止传 confirmed=true**。模糊抱怨(如\"体验不好\")时一轮说完三件事:承接识别结果(\"收到,你对产品体验不满意\")+确认提交意愿(\"要把这条反馈提交给产品团队吗?\")+引导补充(\"方便的话说下具体现象,不说我也会按你的原话提交\");禁止含混反问(实锤病句:\"请问是否把什么作为反馈\")。同意后 content 放用户原话(哪怕只有一句\"体验很差\"也原样提交)。确认环节允许固定追问至多一次,问句必须逐字使用:「方便的话,补充一下遇到这个问题时的操作步骤或期望的表现吗?不方便回复\"没有\",我直接提交。」用户回答只摘录原话对应部分进 reproSteps/expectedBehavior(不改写不总结,无法拆分时落最相关字段,任何内容禁回填 content);答\"没有/跳过/不方便\"=两字段不上送直接提交。引导补充(说下具体现象)已获实质内容并并入 content 时不再追问、直接提交(其中自然出现的操作/期望留在 content 原话,不回溯摘入新字段);仅引导补充未获回应或仅泛化抱怨且用户确认提交时才带出固定问句。product 归因由插件从用户原话解析(安装绑定仅作先验),无需用户提供、禁止询问\"提交到哪个产品/页面\";模型/用户自报的目标产品一律不采信(提到的产品随正文原样传达)。用户说\"提单/提工单/提 issue\"时同样用本工具,除上述固定一次追问外,禁止再索要严重程度/环境/附件等开发者字段、禁止第二轮追问。批式提交对接囤积端点 POST /external/voices(不触发分析,voiceId 由引擎计算回执下发;引擎未部署 404 自动回落老链)。tags=采集层三分类(problem_type:值,可选)。缺 key 时自动获取零字段匿名令牌。拿到回执后必须原样转述 echo.contents(每条「已收录原话:<content>」全文),禁止改写概括——这是用户核对原话是否被改写的唯一窗口。禁止向用户解释内部机制(声音来源/渠道字段/计数规则/配额/归因)。",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dsh-vod-devkit",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.13",
|
|
4
4
|
"description": "VOD user-voice collection tools for DeepSeek Harness (dsh). Thin shell over the VOD external HTTP API — mirrors vod-devkit (MCP) collect semantics.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "0.5.
|
|
3
|
-
"commitSha": "
|
|
4
|
-
"builtAt": "2026-11-
|
|
2
|
+
"version": "0.5.13",
|
|
3
|
+
"commitSha": "98b1621de69aebb4b8e0f8ed1175c29b4391b529",
|
|
4
|
+
"builtAt": "2026-11-16T11:53:45",
|
|
5
5
|
"sourceRemote": "https://gitcode.com/xiaowu2119/vod-devkit.git"
|
|
6
6
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
|
3
3
|
"title": "vod-devkit MCP 工具契约(唯一事实源)",
|
|
4
|
-
"version": "0.5.
|
|
4
|
+
"version": "0.5.13",
|
|
5
5
|
"tools": {
|
|
6
6
|
"vod_submit_voices": {
|
|
7
7
|
"description": "提交用户反馈进 VOD。**先决条件(优先于本描述其余所有内容):调用前必须已征得用户对'提交这条反馈'的明确同意;用户陈述/抱怨反馈本身不构成同意;用户未同意时禁止传 confirmed=true**。模糊抱怨(如\"体验不好\")时一轮说完三件事:承接识别结果(\"收到,你对产品体验不满意\")+确认提交意愿(\"要把这条反馈提交给产品团队吗?\")+引导补充(\"方便的话说下具体现象,不说我也会按你的原话提交\");禁止含混反问(实锤病句:\"请问是否把什么作为反馈\")。同意后 content 放用户原话(哪怕只有一句\"体验很差\"也原样提交)。确认环节允许固定追问至多一次,问句必须逐字使用:「方便的话,补充一下遇到这个问题时的操作步骤或期望的表现吗?不方便回复\"没有\",我直接提交。」用户回答只摘录原话对应部分进 reproSteps/expectedBehavior(不改写不总结,无法拆分时落最相关字段,任何内容禁回填 content);答\"没有/跳过/不方便\"=两字段不上送直接提交。引导补充(说下具体现象)已获实质内容并并入 content 时不再追问、直接提交(其中自然出现的操作/期望留在 content 原话,不回溯摘入新字段);仅引导补充未获回应或仅泛化抱怨且用户确认提交时才带出固定问句。product 归因由插件从用户原话解析(安装绑定仅作先验),无需用户提供、禁止询问\"提交到哪个产品/页面\";模型/用户自报的目标产品一律不采信(提到的产品随正文原样传达)。用户说\"提单/提工单/提 issue\"时同样用本工具,除上述固定一次追问外,禁止再索要严重程度/环境/附件等开发者字段、禁止第二轮追问。批式提交对接囤积端点 POST /external/voices(不触发分析,voiceId 由引擎计算回执下发;引擎未部署 404 自动回落老链)。tags=采集层三分类(problem_type:值,可选)。缺 key 时自动获取零字段匿名令牌。拿到回执后必须原样转述 echo.contents(每条「已收录原话:<content>」全文),禁止改写概括——这是用户核对原话是否被改写的唯一窗口。禁止向用户解释内部机制(声音来源/渠道字段/计数规则/配额/归因)。",
|
|
@@ -41,19 +41,35 @@ def _mcp_client_version(dsh_root: Path) -> str | None:
|
|
|
41
41
|
return None
|
|
42
42
|
|
|
43
43
|
|
|
44
|
+
def _registry_has(pkg: str, timeout: float = 10) -> bool:
|
|
45
|
+
"""registry 可达且该包存在。离线机器上先判这一步,再决定要不要跑 pnpm——
|
|
46
|
+
直接把 `dsh plugin add` 甩出去会挂满 subprocess 超时(真机实锤 300s)才降级。"""
|
|
47
|
+
try:
|
|
48
|
+
r = subprocess.run(["npm", "view", pkg, "version", "--silent"],
|
|
49
|
+
capture_output=True, text=True, timeout=timeout)
|
|
50
|
+
return r.returncode == 0 and bool((r.stdout or "").strip())
|
|
51
|
+
except Exception: # noqa: BLE001 任何异常都按"不可达"处理(降级而非阻断)
|
|
52
|
+
return False
|
|
53
|
+
|
|
54
|
+
|
|
44
55
|
def _ensure_mcp_client(dsh_cli: str, profile: str) -> str | None:
|
|
45
56
|
"""缺 mcp-client 时用 dsh 自己的安装通道补(参照物同做法);可用 env 跳过。"""
|
|
46
57
|
root = _dsh_root(dsh_cli)
|
|
47
58
|
ver = _mcp_client_version(root)
|
|
48
59
|
if ver:
|
|
49
60
|
return ver
|
|
61
|
+
pkg = "@deepseek-ai/dsh-mcp-client"
|
|
50
62
|
if os.environ.get("VOD_DSH_SKIP_MCP_CLIENT_ADD") == "1":
|
|
51
63
|
print("[vod-devkit] 跳过 mcp-client 自装(VOD_DSH_SKIP_MCP_CLIENT_ADD=1)→ 降级为壳工具面",
|
|
52
64
|
file=sys.stderr)
|
|
53
65
|
return None
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
66
|
+
if not _registry_has(pkg):
|
|
67
|
+
print(f"[vod-devkit] registry 不可达或查不到 {pkg} → 跳过自装,降级为壳工具面"
|
|
68
|
+
"(联网后可 `dsh plugin --profile <p> add " + pkg + "` 补,再重装本插件)",
|
|
69
|
+
file=sys.stderr)
|
|
70
|
+
return None
|
|
71
|
+
r = subprocess.run([dsh_cli, "plugin", "--profile", profile, "add", pkg],
|
|
72
|
+
capture_output=True, text=True, timeout=60)
|
|
57
73
|
if r.returncode != 0:
|
|
58
74
|
print("[vod-devkit] mcp-client 自装失败(降级为壳工具面):"
|
|
59
75
|
f"{(r.stderr or r.stdout).strip()[-200:]}", file=sys.stderr)
|
|
@@ -151,13 +167,13 @@ def install(args, packs: str) -> Path:
|
|
|
151
167
|
from vod_mcp import __version__ as _ver
|
|
152
168
|
pkg = f"dsh-vod-devkit@{_ver}"
|
|
153
169
|
r = subprocess.run([dsh, "plugin", "--profile", profile, "add", pkg],
|
|
154
|
-
capture_output=True, text=True, timeout=
|
|
170
|
+
capture_output=True, text=True, timeout=60)
|
|
155
171
|
if r.returncode != 0:
|
|
156
172
|
print(f"[vod-devkit] dsh plugin add {pkg} 失败,回落不钉版本:"
|
|
157
173
|
f"{(r.stderr or r.stdout).strip()[-200:]}", file=sys.stderr)
|
|
158
174
|
r = subprocess.run([dsh, "plugin", "--profile", profile,
|
|
159
175
|
"add", "dsh-vod-devkit"],
|
|
160
|
-
capture_output=True, text=True, timeout=
|
|
176
|
+
capture_output=True, text=True, timeout=60)
|
|
161
177
|
if r.returncode != 0:
|
|
162
178
|
print(f"[vod-devkit] dsh plugin add 失败:{(r.stderr or r.stdout).strip()[-300:]}",
|
|
163
179
|
file=sys.stderr)
|
|
@@ -178,4 +178,75 @@ def residue() -> list:
|
|
|
178
178
|
if not base.is_dir():
|
|
179
179
|
return []
|
|
180
180
|
return [p for p in sorted(base.iterdir())
|
|
181
|
-
if p.is_dir() and not (p / "payload.json").exists()]
|
|
181
|
+
if p.is_dir() and not (p / "payload.json").exists()]
|
|
182
|
+
|
|
183
|
+
|
|
184
|
+
def _vkey(name: str) -> tuple:
|
|
185
|
+
"""版本目录名排序键(0.5.9 < 0.5.10 < 0.5.11;非数字段落当 0,不抛异常)。"""
|
|
186
|
+
out = []
|
|
187
|
+
for part in str(name).replace("-", ".").split("."):
|
|
188
|
+
out.append(int(part) if part.isdigit() else 0)
|
|
189
|
+
return tuple(out)
|
|
190
|
+
|
|
191
|
+
|
|
192
|
+
def _tree_size(p: Path) -> int:
|
|
193
|
+
try:
|
|
194
|
+
return sum(f.stat().st_size for f in p.rglob("*") if f.is_file())
|
|
195
|
+
except OSError:
|
|
196
|
+
return 0
|
|
197
|
+
|
|
198
|
+
|
|
199
|
+
def prune_candidates(rows=None, keep: int = 0) -> list:
|
|
200
|
+
"""可清理的旧载荷清单 —— 只认安装器自己落过的,且没有宿主在跑(D3,0.5.13)。
|
|
201
|
+
|
|
202
|
+
约束(负责人 2026-11-16 定案):
|
|
203
|
+
· 只删清单内:必须是 `<payload_home>/payloads/<ver>/` 且带 `payload.json`
|
|
204
|
+
(= stage() 落的),绝不按 glob 删目录;
|
|
205
|
+
· 保留当前版本,以及任何安装行 payloadDir 指向的版本(在用的不碰);
|
|
206
|
+
· keep>0 时额外保留最新的 keep 份;
|
|
207
|
+
· 只读 payloads/ 目录,不碰机器级 state(令牌/账本)。
|
|
208
|
+
返回 [(path, version, size_bytes)],按版本升序(最旧的在前)。
|
|
209
|
+
"""
|
|
210
|
+
from vod_mcp import __version__
|
|
211
|
+
base = payload_home() / "payloads"
|
|
212
|
+
if not base.is_dir():
|
|
213
|
+
return []
|
|
214
|
+
used = set()
|
|
215
|
+
for r in (rows or []):
|
|
216
|
+
d = str(r.get("payloadDir") or "").strip()
|
|
217
|
+
if d:
|
|
218
|
+
try:
|
|
219
|
+
used.add(str(Path(d).resolve()))
|
|
220
|
+
except OSError:
|
|
221
|
+
used.add(d)
|
|
222
|
+
cand = []
|
|
223
|
+
for d in sorted(base.iterdir(), key=lambda p: _vkey(p.name)):
|
|
224
|
+
if not d.is_dir() or not (d / "payload.json").exists():
|
|
225
|
+
continue
|
|
226
|
+
try:
|
|
227
|
+
if str(d.resolve()) in used:
|
|
228
|
+
continue
|
|
229
|
+
except OSError:
|
|
230
|
+
continue
|
|
231
|
+
if d.name == __version__:
|
|
232
|
+
continue
|
|
233
|
+
cand.append(d)
|
|
234
|
+
if keep > 0:
|
|
235
|
+
cand = cand[:-keep] if len(cand) > keep else []
|
|
236
|
+
return [(d, d.name, _tree_size(d)) for d in cand]
|
|
237
|
+
|
|
238
|
+
|
|
239
|
+
def remove_payloads(cands, quiet: bool = False) -> tuple:
|
|
240
|
+
"""按清单删除载荷目录:单条失败记录后继续,返回 (removed, failed)。"""
|
|
241
|
+
removed, failed = [], []
|
|
242
|
+
for path, ver, _size in cands:
|
|
243
|
+
try:
|
|
244
|
+
shutil.rmtree(path)
|
|
245
|
+
removed.append(str(path))
|
|
246
|
+
if not quiet:
|
|
247
|
+
print(f"removed old payload {ver}: {path}")
|
|
248
|
+
except OSError as e: # noqa: BLE001 单条失败不中断整体
|
|
249
|
+
failed.append((str(path), str(e)))
|
|
250
|
+
if not quiet:
|
|
251
|
+
print(f"[warn] 删除失败 {path}: {e}")
|
|
252
|
+
return removed, failed
|
package/src/vod_mcp/__init__.py
CHANGED
|
@@ -41,19 +41,35 @@ def _mcp_client_version(dsh_root: Path) -> str | None:
|
|
|
41
41
|
return None
|
|
42
42
|
|
|
43
43
|
|
|
44
|
+
def _registry_has(pkg: str, timeout: float = 10) -> bool:
|
|
45
|
+
"""registry 可达且该包存在。离线机器上先判这一步,再决定要不要跑 pnpm——
|
|
46
|
+
直接把 `dsh plugin add` 甩出去会挂满 subprocess 超时(真机实锤 300s)才降级。"""
|
|
47
|
+
try:
|
|
48
|
+
r = subprocess.run(["npm", "view", pkg, "version", "--silent"],
|
|
49
|
+
capture_output=True, text=True, timeout=timeout)
|
|
50
|
+
return r.returncode == 0 and bool((r.stdout or "").strip())
|
|
51
|
+
except Exception: # noqa: BLE001 任何异常都按"不可达"处理(降级而非阻断)
|
|
52
|
+
return False
|
|
53
|
+
|
|
54
|
+
|
|
44
55
|
def _ensure_mcp_client(dsh_cli: str, profile: str) -> str | None:
|
|
45
56
|
"""缺 mcp-client 时用 dsh 自己的安装通道补(参照物同做法);可用 env 跳过。"""
|
|
46
57
|
root = _dsh_root(dsh_cli)
|
|
47
58
|
ver = _mcp_client_version(root)
|
|
48
59
|
if ver:
|
|
49
60
|
return ver
|
|
61
|
+
pkg = "@deepseek-ai/dsh-mcp-client"
|
|
50
62
|
if os.environ.get("VOD_DSH_SKIP_MCP_CLIENT_ADD") == "1":
|
|
51
63
|
print("[vod-devkit] 跳过 mcp-client 自装(VOD_DSH_SKIP_MCP_CLIENT_ADD=1)→ 降级为壳工具面",
|
|
52
64
|
file=sys.stderr)
|
|
53
65
|
return None
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
66
|
+
if not _registry_has(pkg):
|
|
67
|
+
print(f"[vod-devkit] registry 不可达或查不到 {pkg} → 跳过自装,降级为壳工具面"
|
|
68
|
+
"(联网后可 `dsh plugin --profile <p> add " + pkg + "` 补,再重装本插件)",
|
|
69
|
+
file=sys.stderr)
|
|
70
|
+
return None
|
|
71
|
+
r = subprocess.run([dsh_cli, "plugin", "--profile", profile, "add", pkg],
|
|
72
|
+
capture_output=True, text=True, timeout=60)
|
|
57
73
|
if r.returncode != 0:
|
|
58
74
|
print("[vod-devkit] mcp-client 自装失败(降级为壳工具面):"
|
|
59
75
|
f"{(r.stderr or r.stdout).strip()[-200:]}", file=sys.stderr)
|
|
@@ -151,13 +167,13 @@ def install(args, packs: str) -> Path:
|
|
|
151
167
|
from vod_mcp import __version__ as _ver
|
|
152
168
|
pkg = f"dsh-vod-devkit@{_ver}"
|
|
153
169
|
r = subprocess.run([dsh, "plugin", "--profile", profile, "add", pkg],
|
|
154
|
-
capture_output=True, text=True, timeout=
|
|
170
|
+
capture_output=True, text=True, timeout=60)
|
|
155
171
|
if r.returncode != 0:
|
|
156
172
|
print(f"[vod-devkit] dsh plugin add {pkg} 失败,回落不钉版本:"
|
|
157
173
|
f"{(r.stderr or r.stdout).strip()[-200:]}", file=sys.stderr)
|
|
158
174
|
r = subprocess.run([dsh, "plugin", "--profile", profile,
|
|
159
175
|
"add", "dsh-vod-devkit"],
|
|
160
|
-
capture_output=True, text=True, timeout=
|
|
176
|
+
capture_output=True, text=True, timeout=60)
|
|
161
177
|
if r.returncode != 0:
|
|
162
178
|
print(f"[vod-devkit] dsh plugin add 失败:{(r.stderr or r.stdout).strip()[-300:]}",
|
|
163
179
|
file=sys.stderr)
|
package/src/vod_mcp/payload.py
CHANGED
|
@@ -178,4 +178,75 @@ def residue() -> list:
|
|
|
178
178
|
if not base.is_dir():
|
|
179
179
|
return []
|
|
180
180
|
return [p for p in sorted(base.iterdir())
|
|
181
|
-
if p.is_dir() and not (p / "payload.json").exists()]
|
|
181
|
+
if p.is_dir() and not (p / "payload.json").exists()]
|
|
182
|
+
|
|
183
|
+
|
|
184
|
+
def _vkey(name: str) -> tuple:
|
|
185
|
+
"""版本目录名排序键(0.5.9 < 0.5.10 < 0.5.11;非数字段落当 0,不抛异常)。"""
|
|
186
|
+
out = []
|
|
187
|
+
for part in str(name).replace("-", ".").split("."):
|
|
188
|
+
out.append(int(part) if part.isdigit() else 0)
|
|
189
|
+
return tuple(out)
|
|
190
|
+
|
|
191
|
+
|
|
192
|
+
def _tree_size(p: Path) -> int:
|
|
193
|
+
try:
|
|
194
|
+
return sum(f.stat().st_size for f in p.rglob("*") if f.is_file())
|
|
195
|
+
except OSError:
|
|
196
|
+
return 0
|
|
197
|
+
|
|
198
|
+
|
|
199
|
+
def prune_candidates(rows=None, keep: int = 0) -> list:
|
|
200
|
+
"""可清理的旧载荷清单 —— 只认安装器自己落过的,且没有宿主在跑(D3,0.5.13)。
|
|
201
|
+
|
|
202
|
+
约束(负责人 2026-11-16 定案):
|
|
203
|
+
· 只删清单内:必须是 `<payload_home>/payloads/<ver>/` 且带 `payload.json`
|
|
204
|
+
(= stage() 落的),绝不按 glob 删目录;
|
|
205
|
+
· 保留当前版本,以及任何安装行 payloadDir 指向的版本(在用的不碰);
|
|
206
|
+
· keep>0 时额外保留最新的 keep 份;
|
|
207
|
+
· 只读 payloads/ 目录,不碰机器级 state(令牌/账本)。
|
|
208
|
+
返回 [(path, version, size_bytes)],按版本升序(最旧的在前)。
|
|
209
|
+
"""
|
|
210
|
+
from vod_mcp import __version__
|
|
211
|
+
base = payload_home() / "payloads"
|
|
212
|
+
if not base.is_dir():
|
|
213
|
+
return []
|
|
214
|
+
used = set()
|
|
215
|
+
for r in (rows or []):
|
|
216
|
+
d = str(r.get("payloadDir") or "").strip()
|
|
217
|
+
if d:
|
|
218
|
+
try:
|
|
219
|
+
used.add(str(Path(d).resolve()))
|
|
220
|
+
except OSError:
|
|
221
|
+
used.add(d)
|
|
222
|
+
cand = []
|
|
223
|
+
for d in sorted(base.iterdir(), key=lambda p: _vkey(p.name)):
|
|
224
|
+
if not d.is_dir() or not (d / "payload.json").exists():
|
|
225
|
+
continue
|
|
226
|
+
try:
|
|
227
|
+
if str(d.resolve()) in used:
|
|
228
|
+
continue
|
|
229
|
+
except OSError:
|
|
230
|
+
continue
|
|
231
|
+
if d.name == __version__:
|
|
232
|
+
continue
|
|
233
|
+
cand.append(d)
|
|
234
|
+
if keep > 0:
|
|
235
|
+
cand = cand[:-keep] if len(cand) > keep else []
|
|
236
|
+
return [(d, d.name, _tree_size(d)) for d in cand]
|
|
237
|
+
|
|
238
|
+
|
|
239
|
+
def remove_payloads(cands, quiet: bool = False) -> tuple:
|
|
240
|
+
"""按清单删除载荷目录:单条失败记录后继续,返回 (removed, failed)。"""
|
|
241
|
+
removed, failed = [], []
|
|
242
|
+
for path, ver, _size in cands:
|
|
243
|
+
try:
|
|
244
|
+
shutil.rmtree(path)
|
|
245
|
+
removed.append(str(path))
|
|
246
|
+
if not quiet:
|
|
247
|
+
print(f"removed old payload {ver}: {path}")
|
|
248
|
+
except OSError as e: # noqa: BLE001 单条失败不中断整体
|
|
249
|
+
failed.append((str(path), str(e)))
|
|
250
|
+
if not quiet:
|
|
251
|
+
print(f"[warn] 删除失败 {path}: {e}")
|
|
252
|
+
return removed, failed
|
package/src/vodkit_cli/cli.py
CHANGED
|
@@ -3,7 +3,8 @@ import argparse
|
|
|
3
3
|
import os
|
|
4
4
|
import sys
|
|
5
5
|
|
|
6
|
-
from vodkit_cli import auth_cmd, common, doctor, install, packs_cmd,
|
|
6
|
+
from vodkit_cli import (auth_cmd, common, doctor, install, packs_cmd, prune_cmd,
|
|
7
|
+
uninstall, update)
|
|
7
8
|
|
|
8
9
|
|
|
9
10
|
def main():
|
|
@@ -95,6 +96,20 @@ def main():
|
|
|
95
96
|
sp_auth.add_argument("--apply", action="store_true",
|
|
96
97
|
help="真正写盘(缺省只校验并显示指纹)")
|
|
97
98
|
sp_auth.set_defaults(fn=auth_cmd.cmd_auth)
|
|
99
|
+
def _prune(a):
|
|
100
|
+
"""cmd_prune 返回退出码(0=干净/no-op,1=有删除失败,2=参数/确认问题)。"""
|
|
101
|
+
sys.exit(prune_cmd.cmd_prune(a))
|
|
102
|
+
|
|
103
|
+
sp_prune = sub.add_parser("prune", help="显式清理旧载荷(默认 dry-run;二次确认)")
|
|
104
|
+
sp_prune.add_argument("--payloads", action="store_true",
|
|
105
|
+
help="清理旧载荷版本(当前唯一的清理对象)")
|
|
106
|
+
sp_prune.add_argument("--keep", type=int, default=0,
|
|
107
|
+
help="额外保留最新的 N 份旧载荷(默认 0)")
|
|
108
|
+
sp_prune.add_argument("--apply", action="store_true",
|
|
109
|
+
help="真正删除(缺省只打印清单,dry-run 优先)")
|
|
110
|
+
sp_prune.add_argument("--yes", action="store_true",
|
|
111
|
+
help="非交互环境确认删除(交互式会再问一次 y/N)")
|
|
112
|
+
sp_prune.set_defaults(fn=_prune)
|
|
98
113
|
sub.add_parser("build-info").set_defaults(fn=lambda a: common.write_build_info(strict=False))
|
|
99
114
|
|
|
100
115
|
def _serve(a):
|
package/src/vodkit_cli/doctor.py
CHANGED
|
@@ -229,6 +229,28 @@ def cmd_doctor(args=None):
|
|
|
229
229
|
"未并入 state;确认无用后可手工清理)")
|
|
230
230
|
except Exception: # noqa: BLE001 诊断不应因该项失败而中断
|
|
231
231
|
pass
|
|
232
|
+
# 载荷并存可见(0.5.12):install 不删旧载荷——删错的后果是某个宿主配置里
|
|
233
|
+
# 的 server.py 路径消失(白屏/工具全失),所以只报"谁在用哪份、哪份没人引用",
|
|
234
|
+
# 清理由人决定。真机实锤:机器上同时躺着 0.5.9/0.5.10/0.5.11 三份。
|
|
235
|
+
try:
|
|
236
|
+
raw = json.loads(p.read_text(encoding="utf-8"))
|
|
237
|
+
all_rows = raw.get("installs") or ([raw] if raw.get("target") else [])
|
|
238
|
+
used = {}
|
|
239
|
+
for r in all_rows:
|
|
240
|
+
d = (r.get("payloadDir") or "").strip()
|
|
241
|
+
if d:
|
|
242
|
+
used.setdefault(str(Path(d)), []).append(str(r.get("target")))
|
|
243
|
+
if used:
|
|
244
|
+
parent = Path(next(iter(used))).parent
|
|
245
|
+
if parent.is_dir():
|
|
246
|
+
orphans = sorted(x.name for x in parent.iterdir()
|
|
247
|
+
if x.is_dir() and str(x) not in used)
|
|
248
|
+
live = ", ".join(f"{Path(k).name}({'+'.join(v)})" for k, v in sorted(used.items()))
|
|
249
|
+
print(f"[doctor] 载荷:在用 {live}"
|
|
250
|
+
+ (f";未被任何安装行引用 {orphans}"
|
|
251
|
+
"(不自动删——确认没宿主配置指向后再 rm -rf)" if orphans else ""))
|
|
252
|
+
except Exception: # noqa: BLE001 诊断项失败不阻断整体
|
|
253
|
+
pass
|
|
232
254
|
if mf.get("transport") == "remote" and mf.get("mcpUrl"):
|
|
233
255
|
url = mf["mcpUrl"]
|
|
234
256
|
token = (os.environ.get("VOD_MCP_TOKEN")
|
|
@@ -92,12 +92,76 @@ def _dsh_version_line(row: dict, cur: str) -> None:
|
|
|
92
92
|
verdict = (f"≠ CLI({inst} → {cur},重跑 install --target dsh "
|
|
93
93
|
f"--profile {row['profile']})")
|
|
94
94
|
print(f" {name:14s} 已装 {inst:8s} {verdict}")
|
|
95
|
-
|
|
95
|
+
_st, _eff, _note = _dsh_effective(row)
|
|
96
|
+
print(f" {'':14s} 生效 packs: {','.join(_eff) if _eff else '—'} [{_st}] {_note}")
|
|
97
|
+
|
|
98
|
+
|
|
99
|
+
def _dsh_effective(row: dict) -> tuple:
|
|
100
|
+
"""dsh 的 packs 来源,按形态分两种(B 模式 D-dsh-mcp-b-1,0.5.10 起):
|
|
101
|
+
|
|
102
|
+
· MCP 模式:patch 托管块里 `- id: vod-devkit-mcp` 子项的 `env.VOD_PACKS`
|
|
103
|
+
就是生效值(agent 工具面的 server 由它拉起)→ 与其它宿主一样可读;
|
|
104
|
+
· 降级形态(无 mcp-client):能力面由壳包固定(6 工具)→ 只能重装改。
|
|
105
|
+
旧实现见 .yml 就报 `unsupported 不是 JSON 形态`,把可读的 YAML 说成读不了(D1)。
|
|
106
|
+
"""
|
|
107
|
+
prof = str(row.get("profile") or row.get("dshProfile") or "")
|
|
108
|
+
patch = Path.home() / ".dsh" / "profiles" / prof / "cordis.patch.yml"
|
|
109
|
+
if not prof or not patch.exists():
|
|
110
|
+
return ("missing", None, f"dsh profile patch 不存在:{patch}")
|
|
111
|
+
try:
|
|
112
|
+
text = patch.read_text(encoding="utf-8", errors="replace")
|
|
113
|
+
except OSError as e: # noqa: BLE001
|
|
114
|
+
return ("unparsable", None, f"patch 读不出({e})")
|
|
115
|
+
if "- id: vod-devkit-mcp" not in text:
|
|
116
|
+
return ("n/a", None,
|
|
117
|
+
f"{patch}(降级形态:壳自注册 6 工具,能力面由包内固定,改 packs 需重装)")
|
|
118
|
+
raw, in_mcp = None, False
|
|
119
|
+
for ln in text.splitlines():
|
|
120
|
+
s = ln.strip()
|
|
121
|
+
if s.startswith("- id:"):
|
|
122
|
+
in_mcp = (s == "- id: vod-devkit-mcp")
|
|
123
|
+
continue
|
|
124
|
+
if in_mcp and s.startswith("VOD_PACKS:"):
|
|
125
|
+
raw = s.split(":", 1)[1].strip().strip("'\"")
|
|
126
|
+
break
|
|
127
|
+
if not raw:
|
|
128
|
+
return ("n/a", None, f"{patch}(mcp-client 未设 VOD_PACKS,server 用内置默认)")
|
|
129
|
+
try:
|
|
130
|
+
eff = packs_mod.parse_packs(raw)
|
|
131
|
+
except packs_mod.UnknownPack as e:
|
|
132
|
+
return ("unparsable", None, str(e))
|
|
133
|
+
return ("ok", eff, f"{patch}(mcp-client env.VOD_PACKS)")
|
|
134
|
+
|
|
135
|
+
|
|
136
|
+
def _codex_desktop_effective(row: dict) -> tuple:
|
|
137
|
+
"""codex-desktop 是 marketplace 登记形态({name, source}),没有 env:
|
|
138
|
+
packs 由插件包里的 .mcp.json 决定。旧实现按 mcpServers/env 找条目必然报
|
|
139
|
+
missing,而 host_matrix 同时报 PASS —— 同一台机器两个门禁互相打架(D2)。
|
|
140
|
+
判据:marketplace.plugins[] 里有登记就不是 missing。"""
|
|
141
|
+
mp = Path.home() / ".agents" / "plugins" / "marketplace.json"
|
|
142
|
+
if not mp.exists():
|
|
143
|
+
return ("missing", None, f"marketplace 不存在:{mp}")
|
|
144
|
+
try:
|
|
145
|
+
cfg = json.loads(mp.read_text(encoding="utf-8"))
|
|
146
|
+
except (OSError, json.JSONDecodeError) as e: # noqa: BLE001
|
|
147
|
+
return ("unparsable", None, f"marketplace 读不出({e})")
|
|
148
|
+
plugins = cfg.get("plugins") or []
|
|
149
|
+
hit = any((p.get("name") if isinstance(p, dict) else p) == "vod-devkit" for p in plugins)
|
|
150
|
+
if not hit:
|
|
151
|
+
return ("missing", None, f"marketplace 未登记 vod-devkit:{mp}")
|
|
152
|
+
return ("n/a", None,
|
|
153
|
+
f"{mp}(marketplace 登记形态:packs 由插件包内 .mcp.json 决定,装包时写入)")
|
|
96
154
|
|
|
97
155
|
|
|
98
156
|
def _dsh_packs_note(row: dict) -> str:
|
|
99
|
-
|
|
100
|
-
|
|
157
|
+
"""改 packs 的出路:MCP 形态能直接改 env,降级形态只能重装换形态。"""
|
|
158
|
+
state, _eff, note = _dsh_effective(row)
|
|
159
|
+
prof = row.get("profile") or row.get("dshProfile") or ""
|
|
160
|
+
if state == "ok":
|
|
161
|
+
return (f"dsh 的 packs 在 MCP 托管块的 env.VOD_PACKS({note}):改它,"
|
|
162
|
+
f"或重跑 install --target dsh --profile {prof}")
|
|
163
|
+
return (f"当前形态不支持改 packs({note});换形态:"
|
|
164
|
+
f"install --target dsh --profile {prof}")
|
|
101
165
|
|
|
102
166
|
|
|
103
167
|
def _dsh_filter(rows: list, target: str) -> list:
|
|
@@ -153,7 +217,17 @@ def _locate_entry(cfg):
|
|
|
153
217
|
|
|
154
218
|
|
|
155
219
|
def _read_effective(row: dict) -> tuple:
|
|
156
|
-
"""(形态, 实际生效 packs, 说明)。形态: ok / missing / unparsable / unsupported
|
|
220
|
+
"""(形态, 实际生效 packs, 说明)。形态: ok / missing / unparsable / unsupported / n/a
|
|
221
|
+
|
|
222
|
+
D1/D2(0.5.12):两种非 MCP 落点必须先分派掉,否则会被当成"JSON 里找不到条目"
|
|
223
|
+
—— dsh 读 patch YAML 托管块、codex-desktop 读 marketplace 登记。这两处曾与
|
|
224
|
+
host_matrix 的结论直接矛盾(同一台机器一个 PASS 一个 missing)。
|
|
225
|
+
"""
|
|
226
|
+
target = str(row.get("target") or "")
|
|
227
|
+
if target == "dsh":
|
|
228
|
+
return _dsh_effective(row)
|
|
229
|
+
if target == "codex-desktop":
|
|
230
|
+
return _codex_desktop_effective(row)
|
|
157
231
|
path = _config_path(row)
|
|
158
232
|
if path is None:
|
|
159
233
|
return ("unsupported", None, "该宿主的 MCP 配置不在可写 JSON 里(dsh 等需重跑 install)")
|
|
@@ -262,9 +336,12 @@ def cmd_packs(args):
|
|
|
262
336
|
eff_s = ",".join(eff) if eff else "—"
|
|
263
337
|
print(f"{row.get('target'):14s} 生效 packs: {eff_s} [{state}] {note}")
|
|
264
338
|
for drow in dsh:
|
|
265
|
-
|
|
339
|
+
_st, _eff, _note = _dsh_effective(drow)
|
|
340
|
+
print(f"{_dsh_name(drow):14s} 生效 packs: "
|
|
341
|
+
f"{','.join(_eff) if _eff else '—'} [{_st}] {_note}")
|
|
266
342
|
return
|
|
267
|
-
# enable/disable/all:dsh
|
|
343
|
+
# enable/disable/all:dsh 的 packs 在 patch YAML 托管块里,本命令只改 JSON 形态,
|
|
344
|
+
# 不代写 YAML(写坏托管块=插件掉出组合树/UI 消失)→ 跳过并说出路,不打印"已改"
|
|
268
345
|
for drow in dsh:
|
|
269
346
|
print(f"{_dsh_name(drow):14s} 跳过:{_dsh_packs_note(drow)}")
|
|
270
347
|
if not rows:
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
"""prune:显式清理旧载荷(D3,2026-11-16 负责人定案)。
|
|
2
|
+
|
|
3
|
+
为什么单独一个命令、而不是 install 顺手删:
|
|
4
|
+
· 安装时删用户文件不可接受(无法回滚、误删风险高、用户没预期);
|
|
5
|
+
· 卸载才清理又太晚(很多机器只升级不卸载,旧载荷永远留着)。
|
|
6
|
+
|
|
7
|
+
约束(定案原文的落法):
|
|
8
|
+
· 只删清单内:`payload.prune_candidates()` 只认 `<payload_home>/payloads/<ver>/`
|
|
9
|
+
且带 `payload.json`(stage() 落的)的目录,绝不 glob 盲删;
|
|
10
|
+
· 保留当前版本 + 任何安装行 payloadDir 指向的版本;`--keep N` 额外保留最新 N 份;
|
|
11
|
+
· 默认 dry-run(只打印清单);真删要 `--apply`;
|
|
12
|
+
· 二次确认:交互式 y/N;非 tty 必须 `--yes`,否则拒绝;
|
|
13
|
+
· 逐条打印 路径/版本/大小;
|
|
14
|
+
· 只删载荷目录,不碰机器级 state;
|
|
15
|
+
· 单条删除失败记录后继续,最后以非零退出码收尾。
|
|
16
|
+
"""
|
|
17
|
+
import sys
|
|
18
|
+
|
|
19
|
+
from vod_mcp import payload as _payload
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
def _fmt(n: float) -> str:
|
|
23
|
+
for unit in ("B", "KB", "MB", "GB"):
|
|
24
|
+
if n < 1024 or unit == "GB":
|
|
25
|
+
return f"{n:.0f}{unit}" if unit == "B" else f"{n:.1f}{unit}"
|
|
26
|
+
n /= 1024
|
|
27
|
+
return f"{n:.1f}GB"
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
def _rows() -> list:
|
|
31
|
+
from vodkit_cli import common
|
|
32
|
+
import json
|
|
33
|
+
p = common.manifest_path()
|
|
34
|
+
if not p.exists():
|
|
35
|
+
return []
|
|
36
|
+
try:
|
|
37
|
+
mf = json.loads(p.read_text(encoding="utf-8"))
|
|
38
|
+
except (OSError, ValueError):
|
|
39
|
+
return []
|
|
40
|
+
return mf.get("installs") or ([mf] if mf.get("target") else [])
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
def cmd_prune(args) -> int:
|
|
44
|
+
if not getattr(args, "payloads", False):
|
|
45
|
+
print("只支持 --payloads(当前唯一的清理对象)", file=sys.stderr)
|
|
46
|
+
return 2
|
|
47
|
+
rows = _rows()
|
|
48
|
+
keep = int(getattr(args, "keep", 0) or 0)
|
|
49
|
+
cands = _payload.prune_candidates(rows, keep=keep)
|
|
50
|
+
if not cands:
|
|
51
|
+
print("没有可清理的旧载荷(当前版本与安装行在用的都保留)")
|
|
52
|
+
return 0
|
|
53
|
+
total = sum(size for _p, _v, size in cands)
|
|
54
|
+
print(f"可清理 {len(cands)} 份旧载荷,共 {_fmt(total)}"
|
|
55
|
+
+ (f"(额外保留最新 {keep} 份)" if keep else ""))
|
|
56
|
+
for path, ver, size in cands:
|
|
57
|
+
print(f" - {ver:<10s} {_fmt(size):>9s} {path}")
|
|
58
|
+
print(" 保留:当前版本 + 安装行在用的版本 + 机器级 state(不在本命令范围内)")
|
|
59
|
+
|
|
60
|
+
if not getattr(args, "apply", False):
|
|
61
|
+
print("(dry-run:未删除。确认后加 --apply 执行)")
|
|
62
|
+
return 0
|
|
63
|
+
if not getattr(args, "yes", False):
|
|
64
|
+
if not sys.stdin.isatty():
|
|
65
|
+
print("非交互环境需加 --yes 才执行删除(二次确认)", file=sys.stderr)
|
|
66
|
+
return 2
|
|
67
|
+
ans = input(f"确认删除上述 {len(cands)} 份载荷?[y/N] ").strip().lower()
|
|
68
|
+
if ans not in ("y", "yes"):
|
|
69
|
+
print("已取消")
|
|
70
|
+
return 0
|
|
71
|
+
|
|
72
|
+
removed, failed = _payload.remove_payloads(cands)
|
|
73
|
+
print(f"已删除 {len(removed)} 份"
|
|
74
|
+
+ (f",失败 {len(failed)} 份(见上)" if failed else ""))
|
|
75
|
+
return 1 if failed else 0
|
package/src/vodkit_cli/remote.py
CHANGED
|
@@ -132,20 +132,31 @@ def _remote_reachable(url: str, timeout: int = 6) -> bool:
|
|
|
132
132
|
def _validate_product_or_exit(product: str, base: str) -> bool:
|
|
133
133
|
"""D-product-id-2:安装期产品硬校验(B 案,2026-11-05 拍板)。
|
|
134
134
|
--product 命中 meta productCatalog(名字大小写不敏感或 id 精确)才放行;
|
|
135
|
-
未命中/目录不可达一律拒绝安装并给可执行引导(宁可不装不可装错)。
|
|
135
|
+
未命中/目录不可达一律拒绝安装并给可执行引导(宁可不装不可装错)。
|
|
136
|
+
|
|
137
|
+
0.5.12(真机实锤):引擎多实例时「签发令牌的实例」与「校验令牌的实例」可能不同步——
|
|
138
|
+
POST /external/token 刚拿到的匿名令牌,紧随其后 GET /external/meta 就 401
|
|
139
|
+
「API Key 无效或已失效」。这不是网络故障,文案必须点明(实际踩过:照「不可达」
|
|
140
|
+
去查网络,白查);401 时换设备锚点重领一次令牌能救掉偶发的那一半。
|
|
141
|
+
"""
|
|
136
142
|
import urllib.request
|
|
137
143
|
import urllib.error
|
|
138
144
|
import uuid
|
|
139
145
|
api_prefix = "/rest/developer/manager/hdvodmngservice/v1"
|
|
140
146
|
key = os.environ.get("VOD_JAVA_API_KEY", "")
|
|
141
|
-
token = ""
|
|
142
|
-
# 全程一致的设备锚点(S1 设备绑定:token 与后续请求必须同 device/UA,
|
|
143
|
-
# 否则 meta 401 设备不匹配;每次装机一个新锚点,一次校验只耗一枚令牌)
|
|
144
|
-
device = uuid.uuid4().hex[:32]
|
|
145
147
|
ua = "vod-devkit-installer/1"
|
|
146
148
|
|
|
147
|
-
def
|
|
148
|
-
|
|
149
|
+
def _mint(device: str) -> str:
|
|
150
|
+
"""零字段匿名令牌(方案 C 同链);设备锚点必须与后续请求一致(S1 设备绑定)。"""
|
|
151
|
+
req = urllib.request.Request(
|
|
152
|
+
f"{base}{api_prefix}/external/token", data=b"{}",
|
|
153
|
+
headers={"content-type": "application/json", "X-Vod-Device-Id": device,
|
|
154
|
+
"User-Agent": ua}, method="POST")
|
|
155
|
+
with urllib.request.urlopen(req, timeout=10) as resp:
|
|
156
|
+
body = json.loads(resp.read().decode("utf-8", "replace") or "{}")
|
|
157
|
+
return (body.get("data") or {}).get("token") or body.get("token") or ""
|
|
158
|
+
|
|
159
|
+
def _get(url: str, auth: str, device: str):
|
|
149
160
|
req = urllib.request.Request(url, headers={
|
|
150
161
|
"content-type": "application/json",
|
|
151
162
|
"X-Vod-Device-Id": device,
|
|
@@ -155,46 +166,102 @@ def _validate_product_or_exit(product: str, base: str) -> bool:
|
|
|
155
166
|
with urllib.request.urlopen(req, timeout=10) as resp:
|
|
156
167
|
return resp.status, resp.read().decode("utf-8", "replace")
|
|
157
168
|
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
+
def _state_identity() -> tuple:
|
|
170
|
+
"""机器级 state 里已存的匿名令牌 + 它的设备锚点(install_nonce)。
|
|
171
|
+
|
|
172
|
+
装机校验**不该每次新签一枚**:引擎对"同网络当日签发次数"有限流
|
|
173
|
+
(实测撞到 100/日 → 429,整批装机全被挡)。复用 state 的令牌既省配额,
|
|
174
|
+
又避免一次新的设备锚点漂移;device 必须用 state 的 install_nonce,
|
|
175
|
+
否则令牌与设备不配对(S1 设备绑定)。
|
|
176
|
+
"""
|
|
177
|
+
try:
|
|
178
|
+
from vod_mcp import runtime_state as _rt
|
|
179
|
+
cfg = _rt._runtime_cfg() or {}
|
|
180
|
+
if str(cfg.get("token_tier") or "") != "anonymous":
|
|
181
|
+
return ("", "")
|
|
182
|
+
tok = str(cfg.get("java_key") or "")
|
|
183
|
+
dev = str(_rt._install_nonce() or "")
|
|
184
|
+
return (tok, dev) if (tok and dev) else ("", "")
|
|
185
|
+
except Exception: # noqa: BLE001 读不到就当没有,回落新签
|
|
186
|
+
return ("", "")
|
|
187
|
+
|
|
188
|
+
def _catalog_once():
|
|
189
|
+
"""一个回合:有 state 令牌就复用,否则新设备锚点 + 领令牌 → 读目录。"""
|
|
190
|
+
reuse_tok, reuse_dev = _state_identity()
|
|
191
|
+
if key:
|
|
192
|
+
device, token = uuid.uuid4().hex[:32], key
|
|
193
|
+
elif reuse_tok:
|
|
194
|
+
device, token = reuse_dev, reuse_tok
|
|
195
|
+
else:
|
|
196
|
+
device = uuid.uuid4().hex[:32]
|
|
197
|
+
token = _mint(device)
|
|
198
|
+
status, text = _get(f"{base}{api_prefix}/external/meta", token, device)
|
|
169
199
|
data = (json.loads(text) or {}).get("data") or {}
|
|
170
|
-
|
|
171
|
-
if not
|
|
172
|
-
status, text = _get(f"{base}{api_prefix}/external/products"
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
200
|
+
cat = data.get("productCatalog")
|
|
201
|
+
if not cat and not key: # 老引擎 meta 无目录 → 退 /external/products
|
|
202
|
+
status, text = _get(f"{base}{api_prefix}/external/products", token, device)
|
|
203
|
+
data = (json.loads(text) or {}).get("data") or []
|
|
204
|
+
cat = data if isinstance(data, list) else None
|
|
205
|
+
return cat
|
|
206
|
+
|
|
207
|
+
catalog, unauthorized, rate_limited, last_exc = None, False, False, None
|
|
208
|
+
for attempt in (1, 2):
|
|
209
|
+
try:
|
|
210
|
+
catalog = _catalog_once()
|
|
211
|
+
last_exc = None
|
|
212
|
+
break
|
|
213
|
+
except urllib.error.HTTPError as e:
|
|
214
|
+
last_exc = e
|
|
215
|
+
if e.code == 401:
|
|
216
|
+
unauthorized = True
|
|
217
|
+
if e.code == 429:
|
|
218
|
+
# 限流:重试只会更糟(配额头是"当日/网络"),立刻停
|
|
219
|
+
rate_limited = True
|
|
220
|
+
break
|
|
221
|
+
if attempt == 2:
|
|
222
|
+
break
|
|
223
|
+
except Exception as e: # noqa: BLE001 网络抖动也重试一次
|
|
224
|
+
last_exc = e
|
|
225
|
+
if attempt == 2:
|
|
226
|
+
break
|
|
227
|
+
|
|
228
|
+
if catalog is None:
|
|
229
|
+
if rate_limited:
|
|
230
|
+
print("[vod-devkit] 产品校验失败:令牌签发被限流(HTTP 429,同网络当日签发次数上限)。\n"
|
|
231
|
+
" 这不是装机器本身的问题——安装器每校验一次都要一枚匿名令牌,"
|
|
232
|
+
"密集重装/联调会把日配额打满。\n"
|
|
233
|
+
" 处置:配 VOD_JAVA_API_KEY 走正式 key(不占匿名配额);或明天再试;"
|
|
234
|
+
"或找 VOD 运营调整限流。", file=sys.stderr)
|
|
235
|
+
elif unauthorized:
|
|
236
|
+
print("[vod-devkit] 产品校验失败:引擎鉴权异常(HTTP 401)——刚签发的匿名令牌被"
|
|
237
|
+
"校验侧拒绝。\n"
|
|
238
|
+
" 典型原因:引擎多实例的令牌存储/缓存不同步(重试一次通常就过),"
|
|
239
|
+
"或该环境只接受正式 key。\n"
|
|
240
|
+
" 这不是网络故障,别先查网络。处置:稍后重跑 install / 配 "
|
|
241
|
+
"VOD_JAVA_API_KEY / 找 VOD 运营核对引擎。", file=sys.stderr)
|
|
242
|
+
elif last_exc is not None:
|
|
243
|
+
print(f"[vod-devkit] 产品校验不可达({last_exc.__class__.__name__}),"
|
|
244
|
+
"拒绝安装(宁可不装不可装错)。\n"
|
|
245
|
+
" 请核对网络与 --java-api-base;确需离线安装请联系 VOD 运营。",
|
|
191
246
|
file=sys.stderr)
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
247
|
+
else:
|
|
248
|
+
print("[vod-devkit] 产品校验失败:引擎 meta 无 productCatalog 且 "
|
|
249
|
+
"/external/products 不可用。\n"
|
|
250
|
+
" 不执行安装(宁可不装不可装错)。请核对 --java-api-base 指向的引擎"
|
|
251
|
+
"是否已部署 T7i 版本。", file=sys.stderr)
|
|
252
|
+
sys.exit(2)
|
|
253
|
+
|
|
254
|
+
p = product.strip()
|
|
255
|
+
hit = any(
|
|
256
|
+
(str(x.get("name") or "").lower() == p.lower())
|
|
257
|
+
or (str(x.get("id")) == p)
|
|
258
|
+
for x in catalog if isinstance(x, dict))
|
|
259
|
+
if not hit:
|
|
260
|
+
sample = " / ".join(str(x.get("name")) for x in catalog[:8] if isinstance(x, dict))
|
|
261
|
+
print(f"[vod-devkit] --product '{product}' 不在产品名录(t_vod_product),拒绝安装。\n"
|
|
262
|
+
" 归因前提无效=内置采集技能/分类/透传全部空转且用户无感知(归因错误比报错更糟)。\n"
|
|
263
|
+
f" 权威名单:GET {api_prefix}/external/products(共 {len(catalog)} 项),"
|
|
264
|
+
f"示例:{sample} …",
|
|
199
265
|
file=sys.stderr)
|
|
200
266
|
sys.exit(2)
|
|
267
|
+
return True
|
|
@@ -222,6 +222,13 @@ def _clean_global(rows: list, remaining: list | None = None) -> None:
|
|
|
222
222
|
continue
|
|
223
223
|
shutil.rmtree(res, ignore_errors=True)
|
|
224
224
|
print("removed payload residue:", res)
|
|
225
|
+
# 旧载荷(带 payload.json 的安装器产物):与 `prune --payloads` 同一实现
|
|
226
|
+
#(D3 定案:显式、只删清单内、保留 remaining 宿主仍在引用的版本)。
|
|
227
|
+
old = _payload.prune_candidates(remaining or [])
|
|
228
|
+
if old:
|
|
229
|
+
_removed, _failed = _payload.remove_payloads(old)
|
|
230
|
+
if _failed:
|
|
231
|
+
print(f"[warn] 旧载荷删除失败 {len(_failed)} 份(见上)")
|
|
225
232
|
# D-token-machine-1:机器级 state(跨版本/跨宿主共享的那一份)。
|
|
226
233
|
state = _paths.machine_state_home()
|
|
227
234
|
if remaining:
|