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.
Files changed (152) hide show
  1. package/CHANGELOG.md +58 -0
  2. package/QUICKSTART.md +6 -2
  3. package/README.en.md +23 -2
  4. package/README.md +204 -16
  5. package/{contract → assets/contract}/tools.schema.json +127 -1
  6. package/{skills → assets/skills}/vod-core/SKILL.md +32 -1
  7. package/bin/vod-devkit +21 -1
  8. package/integrations/hermes/hooks/vod_guard.py +127 -0
  9. package/integrations/hermes/hooks/vod_router.py +89 -0
  10. package/integrations/hermes/host.json +4 -1
  11. package/npm/cli.js +6 -1
  12. package/package.json +37 -34
  13. package/packages/dsh/README.md +60 -0
  14. package/packages/dsh/package.json +52 -0
  15. package/plugins/vod-devkit/.codex-plugin/plugin.json +1 -1
  16. package/plugins/vod-devkit/.mcp.json +2 -0
  17. package/plugins/vod-devkit/build-info.json +3 -3
  18. package/plugins/vod-devkit/contract/tools.schema.json +127 -1
  19. package/plugins/vod-devkit/hooks/vod_guard.py +127 -0
  20. package/plugins/vod-devkit/hooks/vod_router.py +89 -0
  21. package/plugins/vod-devkit/skills/vod-core/SKILL.md +32 -1
  22. package/plugins/vod-devkit/vod_mcp/__init__.py +1 -1
  23. package/plugins/vod-devkit/vod_mcp/attribution.py +21 -2
  24. package/plugins/vod-devkit/vod_mcp/config_forms.py +22 -6
  25. package/plugins/vod-devkit/vod_mcp/diagnose.py +4 -2
  26. package/plugins/vod-devkit/vod_mcp/host_adapters/base.py +4 -1
  27. package/plugins/vod-devkit/vod_mcp/host_adapters/codex.py +154 -34
  28. package/plugins/vod-devkit/vod_mcp/host_adapters/dsh.py +133 -22
  29. package/plugins/vod-devkit/vod_mcp/host_adapters/hermes.py +216 -59
  30. package/plugins/vod-devkit/vod_mcp/host_adapters/opencode.py +10 -4
  31. package/plugins/vod-devkit/vod_mcp/hosts.py +4 -0
  32. package/plugins/vod-devkit/vod_mcp/net.py +78 -18
  33. package/plugins/vod-devkit/vod_mcp/packs/__init__.py +97 -22
  34. package/plugins/vod-devkit/vod_mcp/packs/collect.py +50 -42
  35. package/plugins/vod-devkit/vod_mcp/packs/core.py +138 -2
  36. package/plugins/vod-devkit/vod_mcp/paths.py +200 -30
  37. package/plugins/vod-devkit/vod_mcp/payload.py +10 -5
  38. package/plugins/vod-devkit/vod_mcp/provenance.py +1 -1
  39. package/plugins/vod-devkit/vod_mcp/remote_app.py +4 -4
  40. package/plugins/vod-devkit/vod_mcp/runtime_state.py +151 -28
  41. package/plugins/vod-devkit/vod_mcp/server.py +52 -7
  42. package/plugins/vod-devkit/vod_mcp/skills_registry.py +29 -8
  43. package/plugins/vod-devkit/vod_mcp/tools.py +21 -3
  44. package/plugins/vod-devkit/vod_mcp/transport_remote.py +22 -3
  45. package/{vod_mcp → src/vod_mcp}/__init__.py +1 -1
  46. package/{vod_mcp → src/vod_mcp}/attribution.py +21 -2
  47. package/{vod_mcp → src/vod_mcp}/config_forms.py +22 -6
  48. package/{vod_mcp → src/vod_mcp}/diagnose.py +4 -2
  49. package/{vod_mcp → src/vod_mcp}/host_adapters/base.py +4 -1
  50. package/{vod_mcp → src/vod_mcp}/host_adapters/codex.py +154 -34
  51. package/{vod_mcp → src/vod_mcp}/host_adapters/dsh.py +133 -22
  52. package/src/vod_mcp/host_adapters/hermes.py +361 -0
  53. package/{vod_mcp → src/vod_mcp}/host_adapters/opencode.py +10 -4
  54. package/{vod_mcp → src/vod_mcp}/hosts.py +4 -0
  55. package/{vod_mcp → src/vod_mcp}/net.py +78 -18
  56. package/src/vod_mcp/packs/__init__.py +142 -0
  57. package/{vod_mcp → src/vod_mcp}/packs/collect.py +50 -42
  58. package/src/vod_mcp/packs/core.py +216 -0
  59. package/src/vod_mcp/paths.py +208 -0
  60. package/{vod_mcp → src/vod_mcp}/payload.py +10 -5
  61. package/{vod_mcp → src/vod_mcp}/provenance.py +1 -1
  62. package/{vod_mcp → src/vod_mcp}/remote_app.py +4 -4
  63. package/{vod_mcp → src/vod_mcp}/runtime_state.py +151 -28
  64. package/{vod_mcp → src/vod_mcp}/server.py +52 -7
  65. package/{vod_mcp → src/vod_mcp}/skills_registry.py +29 -8
  66. package/{vod_mcp → src/vod_mcp}/tools.py +21 -3
  67. package/{vod_mcp → src/vod_mcp}/transport_remote.py +22 -3
  68. package/src/vodkit_cli/auth_cmd.py +81 -0
  69. package/{vodkit_cli → src/vodkit_cli}/cli.py +38 -8
  70. package/{vodkit_cli → src/vodkit_cli}/common.py +14 -3
  71. package/{vodkit_cli → src/vodkit_cli}/doctor.py +147 -9
  72. package/{vodkit_cli → src/vodkit_cli}/install.py +148 -33
  73. package/src/vodkit_cli/packs_cmd.py +329 -0
  74. package/{vodkit_cli → src/vodkit_cli}/remote.py +3 -3
  75. package/src/vodkit_cli/uninstall.py +315 -0
  76. package/vod_mcp/host_adapters/__pycache__/__init__.cpython-314.pyc +0 -0
  77. package/vod_mcp/host_adapters/__pycache__/__init__.cpython-39.pyc +0 -0
  78. package/vod_mcp/host_adapters/__pycache__/atomcode.cpython-314.pyc +0 -0
  79. package/vod_mcp/host_adapters/__pycache__/atomcode.cpython-39.pyc +0 -0
  80. package/vod_mcp/host_adapters/__pycache__/base.cpython-314.pyc +0 -0
  81. package/vod_mcp/host_adapters/__pycache__/base.cpython-39.pyc +0 -0
  82. package/vod_mcp/host_adapters/__pycache__/codearts.cpython-314.pyc +0 -0
  83. package/vod_mcp/host_adapters/__pycache__/codearts.cpython-39.pyc +0 -0
  84. package/vod_mcp/host_adapters/__pycache__/codeartswork.cpython-314.pyc +0 -0
  85. package/vod_mcp/host_adapters/__pycache__/codeartswork.cpython-39.pyc +0 -0
  86. package/vod_mcp/host_adapters/__pycache__/codex.cpython-314.pyc +0 -0
  87. package/vod_mcp/host_adapters/__pycache__/codex.cpython-39.pyc +0 -0
  88. package/vod_mcp/host_adapters/__pycache__/codex_desktop.cpython-314.pyc +0 -0
  89. package/vod_mcp/host_adapters/__pycache__/codex_desktop.cpython-39.pyc +0 -0
  90. package/vod_mcp/host_adapters/__pycache__/dsh.cpython-314.pyc +0 -0
  91. package/vod_mcp/host_adapters/__pycache__/dsh.cpython-39.pyc +0 -0
  92. package/vod_mcp/host_adapters/__pycache__/generic.cpython-314.pyc +0 -0
  93. package/vod_mcp/host_adapters/__pycache__/generic.cpython-39.pyc +0 -0
  94. package/vod_mcp/host_adapters/__pycache__/hermes.cpython-314.pyc +0 -0
  95. package/vod_mcp/host_adapters/__pycache__/hermes.cpython-39.pyc +0 -0
  96. package/vod_mcp/host_adapters/__pycache__/opencode.cpython-314.pyc +0 -0
  97. package/vod_mcp/host_adapters/__pycache__/opencode.cpython-39.pyc +0 -0
  98. package/vod_mcp/host_adapters/__pycache__/workbuddy.cpython-314.pyc +0 -0
  99. package/vod_mcp/host_adapters/__pycache__/workbuddy.cpython-39.pyc +0 -0
  100. package/vod_mcp/host_adapters/hermes.py +0 -204
  101. package/vod_mcp/packs/__init__.py +0 -67
  102. package/vod_mcp/packs/__pycache__/__init__.cpython-314.pyc +0 -0
  103. package/vod_mcp/packs/__pycache__/__init__.cpython-39.pyc +0 -0
  104. package/vod_mcp/packs/__pycache__/collect.cpython-314.pyc +0 -0
  105. package/vod_mcp/packs/__pycache__/collect.cpython-39.pyc +0 -0
  106. package/vod_mcp/packs/__pycache__/core.cpython-314.pyc +0 -0
  107. package/vod_mcp/packs/__pycache__/core.cpython-39.pyc +0 -0
  108. package/vod_mcp/packs/__pycache__/knowledge.cpython-314.pyc +0 -0
  109. package/vod_mcp/packs/__pycache__/knowledge.cpython-39.pyc +0 -0
  110. package/vod_mcp/packs/core.py +0 -80
  111. package/vod_mcp/paths.py +0 -38
  112. package/vodkit_cli/__pycache__/__init__.cpython-314.pyc +0 -0
  113. package/vodkit_cli/__pycache__/__init__.cpython-39.pyc +0 -0
  114. package/vodkit_cli/__pycache__/cli.cpython-314.pyc +0 -0
  115. package/vodkit_cli/__pycache__/cli.cpython-39.pyc +0 -0
  116. package/vodkit_cli/__pycache__/common.cpython-314.pyc +0 -0
  117. package/vodkit_cli/__pycache__/common.cpython-39.pyc +0 -0
  118. package/vodkit_cli/__pycache__/doctor.cpython-314.pyc +0 -0
  119. package/vodkit_cli/__pycache__/doctor.cpython-39.pyc +0 -0
  120. package/vodkit_cli/__pycache__/install.cpython-314.pyc +0 -0
  121. package/vodkit_cli/__pycache__/install.cpython-39.pyc +0 -0
  122. package/vodkit_cli/__pycache__/remote.cpython-314.pyc +0 -0
  123. package/vodkit_cli/__pycache__/remote.cpython-39.pyc +0 -0
  124. package/vodkit_cli/__pycache__/uninstall.cpython-314.pyc +0 -0
  125. package/vodkit_cli/__pycache__/uninstall.cpython-39.pyc +0 -0
  126. package/vodkit_cli/__pycache__/update.cpython-314.pyc +0 -0
  127. package/vodkit_cli/__pycache__/update.cpython-39.pyc +0 -0
  128. package/vodkit_cli/uninstall.py +0 -161
  129. /package/{safety → assets/safety}/policy.json +0 -0
  130. /package/{skills → assets/skills}/vod-core/references/acceptance-criteria.md +0 -0
  131. /package/{skills → assets/skills}/vod-core/references/verification-method.md +0 -0
  132. /package/{skills → assets/skills}/vod-feedback-collect/SKILL.md +0 -0
  133. /package/{skills → assets/skills}/vod-feedback-collect/references/acceptance-criteria.md +0 -0
  134. /package/{skills → assets/skills}/vod-feedback-collect/references/verification-method.md +0 -0
  135. /package/{skills → assets/skills}/vod-problem-classification-rules/SKILL.md +0 -0
  136. /package/{skills → assets/skills}/vod-scoring-rules/SKILL.md +0 -0
  137. /package/{vod_mcp → src/vod_mcp}/detect_framework.py +0 -0
  138. /package/{vod_mcp → src/vod_mcp}/guardrails.py +0 -0
  139. /package/{vod_mcp → src/vod_mcp}/host_adapters/__init__.py +0 -0
  140. /package/{vod_mcp → src/vod_mcp}/host_adapters/atomcode.py +0 -0
  141. /package/{vod_mcp → src/vod_mcp}/host_adapters/codearts.py +0 -0
  142. /package/{vod_mcp → src/vod_mcp}/host_adapters/codeartswork.py +0 -0
  143. /package/{vod_mcp → src/vod_mcp}/host_adapters/codex_desktop.py +0 -0
  144. /package/{vod_mcp → src/vod_mcp}/host_adapters/generic.py +0 -0
  145. /package/{vod_mcp → src/vod_mcp}/host_adapters/workbuddy.py +0 -0
  146. /package/{vod_mcp → src/vod_mcp}/packs/knowledge.py +0 -0
  147. /package/{vod_mcp → src/vod_mcp}/pending.py +0 -0
  148. /package/{vod_mcp → src/vod_mcp}/policy.py +0 -0
  149. /package/{vod_mcp → src/vod_mcp}/runtime.example.json +0 -0
  150. /package/{vod_mcp → src/vod_mcp}/update_check.py +0 -0
  151. /package/{vodkit_cli → src/vodkit_cli}/__init__.py +0 -0
  152. /package/{vodkit_cli → src/vodkit_cli}/update.py +0 -0
@@ -0,0 +1,329 @@
1
+ """全局命令:version(各宿主已装版本一眼视图)/ packs(能力包启用面查看与持久改写)。
2
+
3
+ 为什么要有(对齐 huaweicloud-devkit 的三条全局命令):
4
+ 多宿主分发必然产生版本碎片与能力面漂移——同一个包在 codex 缓存、hermes 配置、
5
+ dsh profile 里可能是三个版本/三套 VOD_PACKS。单宿主命令回答"这个宿主好不好",
6
+ 全局命令回答"整台机器现在是什么状态"。没有它,排查就是各查一遍配置文件。
7
+
8
+ 数据源唯一:install-manifest.json 的 installs[](D-installs-1:一个 manifest
9
+ 记全部宿主安装)。本模块只**读**宿主真实配置来回答"实际生效的是哪一套",
10
+ 写只在 `packs enable/disable/all --apply` 时发生,并且只改受管条目的 env。
11
+ """
12
+ import json
13
+ import shutil
14
+ from pathlib import Path
15
+
16
+ from vod_mcp import packs as packs_mod
17
+ from vodkit_cli import common
18
+
19
+ _ENV_KEYS = ("env", "environment")
20
+
21
+
22
+ def _rows() -> list:
23
+ p = common.manifest_path()
24
+ if not p.exists():
25
+ return []
26
+ mf = json.loads(p.read_text(encoding="utf-8"))
27
+ return mf.get("installs") or ([mf] if mf.get("target") else [])
28
+
29
+
30
+ def _filter(rows: list, target: str) -> list:
31
+ if not target:
32
+ return rows
33
+ return [r for r in rows if r.get("target") == target]
34
+
35
+
36
+ def _current_version() -> str:
37
+ from vod_mcp import __version__
38
+ return __version__
39
+
40
+
41
+ # ── dsh:不进 installs[] 的宿主(只读探测) ─────────────────
42
+ #
43
+ # dsh 由 `dsh-vod-devkit` 的 profile 依赖承载(install --target dsh 只装壳包,
44
+ # 不写 install-manifest 行——D-installs-1 的账本只登记 MCP 宿主)。结果是
45
+ # `version` / `packs status` 里连一行都没有、也没有 [missing] 提示,读起来像
46
+ # "这台机器没装 dsh"。补法是只读探测 profile,**不是**把 dsh 塞进 installs[]
47
+ # (塞进去会改写安装/卸载语义:uninstall 会按行去删壳依赖)。
48
+
49
+ def _dsh_rows() -> list:
50
+ """读 ~/.dsh/profiles/*/package.json,返回声明了 dsh-vod-devkit 的 profile。
51
+
52
+ 只读:不写 profile、不碰 node_modules。版本取**实际装下来的那份**
53
+ (node_modules/dsh-vod-devkit/package.json);取不到才回落声明的 spec
54
+ ——spec 是意图(可能是 `file:…tgz` 或范围号),实际跑的是装下来的版本。
55
+ """
56
+ base = Path.home() / ".dsh" / "profiles"
57
+ if not base.is_dir():
58
+ return []
59
+ out = []
60
+ for pj in sorted(base.glob("*/package.json")):
61
+ try:
62
+ data = json.loads(pj.read_text(encoding="utf-8"))
63
+ except (OSError, json.JSONDecodeError):
64
+ continue
65
+ dep = (data.get("dependencies") or {}).get("dsh-vod-devkit")
66
+ bundles = ((data.get("dsh") or {}).get("profile") or {}).get("bundles") or []
67
+ if not dep and "dsh-vod-devkit" not in bundles:
68
+ continue
69
+ inst = None
70
+ try:
71
+ inst = json.loads((pj.parent / "node_modules" / "dsh-vod-devkit"
72
+ / "package.json").read_text(encoding="utf-8")).get("version")
73
+ except (OSError, json.JSONDecodeError):
74
+ pass
75
+ out.append({"profile": pj.parent.name, "declared": dep or "(bundles 引用)",
76
+ "installed": inst, "config": str(pj)})
77
+ return out
78
+
79
+
80
+ def _dsh_name(row: dict) -> str:
81
+ return f"dsh({row['profile']})"
82
+
83
+
84
+ def _dsh_version_line(row: dict, cur: str) -> None:
85
+ name = _dsh_name(row)
86
+ inst = row["installed"] or row["declared"]
87
+ if row["installed"] is None:
88
+ verdict = "已装版本未知(node_modules 无该包,先 dsh plugin add dsh-vod-devkit)"
89
+ elif inst == cur:
90
+ verdict = "同版"
91
+ else:
92
+ verdict = (f"≠ CLI({inst} → {cur},重跑 install --target dsh "
93
+ f"--profile {row['profile']})")
94
+ print(f" {name:14s} 已装 {inst:8s} {verdict}")
95
+ print(f" {'':14s} 生效 packs: — [n/a] 壳内固定(不走 MCP env);{row['config']}")
96
+
97
+
98
+ def _dsh_packs_note(row: dict) -> str:
99
+ return (f"dsh 壳不走 MCP env,能力面由包内固定;改 pack 需重装:"
100
+ f"install --target dsh --profile {row['profile']}({row['config']})")
101
+
102
+
103
+ def _dsh_filter(rows: list, target: str) -> list:
104
+ """--target 只有 dsh(整族)有意义;给具体 dsh(web) 也接受,便于复制输出。"""
105
+ if not target or target == "dsh":
106
+ return rows
107
+ return [r for r in rows if target == _dsh_name(r)]
108
+
109
+
110
+ # ── 宿主配置定位与受管条目 ────────────────────────────────
111
+
112
+ def _config_path(row: dict) -> Path | None:
113
+ """该安装行的 MCP 配置文件。codex 走插件缓存(manifest 里无 mcpConfig)。"""
114
+ target = row.get("target")
115
+ if target == "codex":
116
+ from vod_mcp.host_adapters import codex
117
+ ver = row.get("version")
118
+ if ver:
119
+ # 优先读"与 manifest 记录同版本"的缓存目录:多版本残留时按 mtime 取最新
120
+ # 会把 0.5.5 的配置当成 0.5.9 的(实测本机就是这样)
121
+ p = Path.home() / ".codex" / "plugins" / "cache" / "vod-local" / "vod-devkit" / ver / ".mcp.json"
122
+ if p.exists():
123
+ return p
124
+ return codex.locate_plugin_mcp(None)
125
+ cfg = row.get("mcpConfig")
126
+ return Path(cfg) if cfg else None
127
+
128
+
129
+ def _locate_entry(cfg):
130
+ """在任意宿主 JSON 里找到 vod-devkit 条目 → (entry_dict, env_key) 或 None。
131
+
132
+ 形态差异(实测):hermes 的独立 mcp json 顶层就是条目本身;opencode 在
133
+ `mcp.vod-devkit.environment`;其余在 `mcpServers.vod-devkit.env`;
134
+ codex 插件缓存同 mcpServers。用递归定位而不是写死九张表——写死就会在
135
+ 下一个宿主形态上再漏一次。
136
+ """
137
+ if isinstance(cfg, dict) and cfg.get("name") == "vod-devkit" and "command" in cfg:
138
+ return cfg, ("env" if "env" in cfg else "environment")
139
+ stack = [cfg]
140
+ while stack:
141
+ cur = stack.pop()
142
+ if isinstance(cur, dict):
143
+ for k, v in cur.items():
144
+ if k == "vod-devkit" and isinstance(v, dict) and (
145
+ "command" in v or "args" in v):
146
+ env_key = next((e for e in _ENV_KEYS if e in v), "env")
147
+ return v, env_key
148
+ if isinstance(v, (dict, list)):
149
+ stack.append(v)
150
+ elif isinstance(cur, list):
151
+ stack.extend(x for x in cur if isinstance(x, (dict, list)))
152
+ return None
153
+
154
+
155
+ def _read_effective(row: dict) -> tuple:
156
+ """(形态, 实际生效 packs, 说明)。形态: ok / missing / unparsable / unsupported"""
157
+ path = _config_path(row)
158
+ if path is None:
159
+ return ("unsupported", None, "该宿主的 MCP 配置不在可写 JSON 里(dsh 等需重跑 install)")
160
+ if path.suffix not in (".json", ".jsonc"):
161
+ return ("unsupported", None, f"不是 JSON 形态({path.name}),该宿主改 packs 需重跑 install")
162
+ if not path.exists():
163
+ return ("missing", None, f"配置不存在:{path}")
164
+ stale = ""
165
+ if row.get("target") == "codex" and row.get("version"):
166
+ # manifest 记的版本与缓存目录不一致时说出来:实际跑的是哪个版本,别让人自己猜
167
+ want = (Path.home() / ".codex" / "plugins" / "cache" / "vod-local" / "vod-devkit"
168
+ / str(row["version"]) / ".mcp.json")
169
+ if not want.exists():
170
+ stale = f"(manifest 记 {row['version']},cache 无该版本目录,读到的是残留副本)"
171
+ try:
172
+ cfg = json.loads(path.read_text(encoding="utf-8"))
173
+ except (OSError, json.JSONDecodeError) as e:
174
+ return ("unparsable", None, f"配置读不出({e})")
175
+ hit = _locate_entry(cfg)
176
+ if hit is None:
177
+ return ("missing", None, f"配置里没有 vod-devkit 条目:{path}")
178
+ entry, env_key = hit
179
+ raw = (entry.get(env_key) or {}).get("VOD_PACKS")
180
+ try:
181
+ eff = packs_mod.parse_packs(raw or "")
182
+ except packs_mod.UnknownPack as e:
183
+ return ("unparsable", None, str(e))
184
+ return ("ok", eff, f"{path}({'.'.join([env_key, 'VOD_PACKS'])}){stale}")
185
+
186
+
187
+ # ── version ───────────────────────────────────────────
188
+
189
+ def cmd_version(_args):
190
+ """CLI 版本 + 每个宿主已装版本 + 实际生效的能力包(一眼诊断碎片)。"""
191
+ cur = _current_version()
192
+ print(f"vod-devkit CLI: {cur}")
193
+ rows = _rows()
194
+ if not rows:
195
+ print("未安装(无 install-manifest;先 install --target <agent>)")
196
+ return
197
+ for row in rows:
198
+ target = row.get("target", "?")
199
+ inst = row.get("version") or row.get("source", {}).get("version") or "?"
200
+ if inst == cur:
201
+ verdict = "同版"
202
+ else:
203
+ verdict = f"≠ CLI({inst} → {cur},重跑 install 刷新)"
204
+ state, eff, note = _read_effective(row)
205
+ eff_s = ",".join(eff) if eff else "—"
206
+ print(f" {target:14s} 已装 {inst:8s} {verdict}")
207
+ print(f" {'':14s} 生效 packs: {eff_s} [{state}] {note}")
208
+ # dsh 不在账本里(profile 依赖承载)→ 单独只读探测,别让全局视图漏掉它
209
+ for drow in _dsh_rows():
210
+ _dsh_version_line(drow, cur)
211
+
212
+
213
+ # ── packs ────────────────────────────────────────────
214
+
215
+ def _write_packs(row: dict, new_packs: tuple, apply: bool) -> tuple:
216
+ """把受管条目的 VOD_PACKS 改成 new_packs。返回 (changed?, 说明)。
217
+
218
+ 只改 env 里这一个键:其它 env(VOD_JAVA_API_BASE 等)与宿主其它 server、
219
+ 用户自有键原样保留;首改落 .bak。apply=False 时只报"将改什么"。
220
+ """
221
+ path = _config_path(row)
222
+ if path is None or not path.exists():
223
+ return (False, "配置不在可写 JSON 里(该宿主需重跑 install 改 packs)")
224
+ try:
225
+ cfg = json.loads(path.read_text(encoding="utf-8"))
226
+ except (OSError, json.JSONDecodeError) as e:
227
+ return (False, f"配置读不出({e}),拒绝改动")
228
+ hit = _locate_entry(cfg)
229
+ if hit is None:
230
+ return (False, "配置里没有 vod-devkit 条目,拒绝改动")
231
+ entry, env_key = hit
232
+ env = dict(entry.get(env_key) or {})
233
+ want = ",".join(new_packs)
234
+ if env.get("VOD_PACKS") == want:
235
+ return (False, "已是目标值")
236
+ if not apply:
237
+ return (True, f"将把 {env_key}.VOD_PACKS: {env.get('VOD_PACKS') or '(缺省=全包)'} → {want}"
238
+ "(未写盘;加 --apply 生效)")
239
+ shutil.copyfile(path, str(path) + ".bak")
240
+ env["VOD_PACKS"] = want
241
+ entry[env_key] = env
242
+ path.write_text(json.dumps(cfg, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
243
+ # 写后读回:写成功 ≠ 落盘就是我们要的(并发改写/宿主升级会改回去)
244
+ back = json.loads(path.read_text(encoding="utf-8"))
245
+ hit2 = _locate_entry(back)
246
+ if not hit2 or (hit2[0].get(hit2[1]) or {}).get("VOD_PACKS") != want:
247
+ raise RuntimeError(f"写入后读回不一致:{path}")
248
+ return (True, f"已写入 {path}(重启宿主会话生效;旧值备份 .bak)")
249
+
250
+
251
+ def cmd_packs(args):
252
+ action = getattr(args, "packs_action", "status")
253
+ target = getattr(args, "target", "") or ""
254
+ rows = _filter(_rows(), target)
255
+ dsh = _dsh_filter(_dsh_rows(), target)
256
+ if not rows and not dsh:
257
+ print("未安装(无 install-manifest)" if not _rows() else f"没有该宿主的安装记录:{target}")
258
+ return
259
+ if action == "status":
260
+ for row in rows:
261
+ state, eff, note = _read_effective(row)
262
+ eff_s = ",".join(eff) if eff else "—"
263
+ print(f"{row.get('target'):14s} 生效 packs: {eff_s} [{state}] {note}")
264
+ for drow in dsh:
265
+ print(f"{_dsh_name(drow):14s} 生效 packs: — [n/a] {_dsh_packs_note(drow)}")
266
+ return
267
+ # enable/disable/all:dsh 不可写(壳内固定),明确说出路,不打印"已改"
268
+ for drow in dsh:
269
+ print(f"{_dsh_name(drow):14s} 跳过:{_dsh_packs_note(drow)}")
270
+ if not rows:
271
+ return
272
+ # enable/disable/all
273
+ if action == "all":
274
+ want = packs_mod.ALL_PACKS
275
+ else:
276
+ ids = [p.strip() for p in (getattr(args, "ids", "") or "").split(",") if p.strip()]
277
+ if not ids:
278
+ print("用法:packs enable|disable core,collect [--target <agent>] [--apply]",
279
+ file=__import__("sys").stderr)
280
+ return
281
+ for row in rows:
282
+ state, eff, note = _read_effective(row)
283
+ if eff is None:
284
+ print(f"{row.get('target'):14s} 跳过:{note}")
285
+ continue
286
+ base = list(eff)
287
+ if action == "enable":
288
+ base += [p for p in ids if p not in base]
289
+ else:
290
+ base = [p for p in base if p not in ids]
291
+ want = tuple(dict.fromkeys(["core"] + base)) # core 强制包含
292
+ try:
293
+ changed, note = _write_packs(row, want, getattr(args, "apply", False))
294
+ except RuntimeError as e:
295
+ print(f"{row.get('target'):14s} 失败:{e}")
296
+ continue
297
+ print(f"{row.get('target'):14s} → {','.join(want)} {note}")
298
+ if changed and getattr(args, "apply", False):
299
+ _update_row_packs(row.get("target"), ",".join(want))
300
+ return
301
+ for row in rows:
302
+ state, eff, note = _read_effective(row)
303
+ if eff is None:
304
+ print(f"{row.get('target'):14s} 跳过:{note}")
305
+ continue
306
+ try:
307
+ changed, note = _write_packs(row, want, getattr(args, "apply", False))
308
+ except RuntimeError as e:
309
+ print(f"{row.get('target'):14s} 失败:{e}")
310
+ continue
311
+ print(f"{row.get('target'):14s} → {','.join(want)} {note}")
312
+ if changed and getattr(args, "apply", False):
313
+ _update_row_packs(row.get("target"), ",".join(want))
314
+
315
+
316
+ def _update_row_packs(target: str, packs: str) -> None:
317
+ """manifest 行同步(幂等;读改写整份文件,只动目标行的 packs)。"""
318
+ p = common.manifest_path()
319
+ if not p.exists():
320
+ return
321
+ mf = json.loads(p.read_text(encoding="utf-8"))
322
+ rows = mf.get("installs") or []
323
+ for r in rows:
324
+ if r.get("target") == target:
325
+ r["packs"] = packs
326
+ if rows:
327
+ mf["installs"] = rows
328
+ mf["packs"] = packs
329
+ p.write_text(json.dumps(mf, ensure_ascii=False, indent=2), encoding="utf-8")
@@ -3,13 +3,13 @@ import json
3
3
  import os
4
4
  import sys
5
5
 
6
- from vodkit_cli import common
6
+ from vod_mcp import paths
7
7
 
8
8
 
9
9
  def _expected_remote_tools() -> set:
10
- """远程面应当暴露的工具集 = 契约全集 - REMOTE_WITHHELD(写面本机工具不进远程)。"""
10
+ """远程面应当暴露的工具集 = 契约全集 - REMOTE_WITHHELD(只摘进程内开关 packs_configure)。"""
11
11
  from vod_mcp import packs as _packs
12
- contract = json.loads((common.ROOT / "contract" / "tools.schema.json").read_text(encoding="utf-8"))
12
+ contract = json.loads((paths.ASSETS / "contract" / "tools.schema.json").read_text(encoding="utf-8"))
13
13
  return set(contract["tools"]) - set(_packs.REMOTE_WITHHELD)
14
14
 
15
15
 
@@ -0,0 +1,315 @@
1
+ """uninstall 子命令:按 manifest 名册逐宿主摘除(共享配置只摘条目)。"""
2
+ import json
3
+ import os
4
+ import shutil
5
+ import subprocess
6
+ from pathlib import Path
7
+
8
+ from vod_mcp import hosts as host_specs
9
+ from vodkit_cli import common
10
+
11
+
12
+ _SHARED_CONFIG_NAMES = {"config.toml", "config.yaml", "config.yml",
13
+ "opencode.json", "opencode.jsonc"}
14
+
15
+
16
+ def _remove_managed_mcp_entry(target: str, path: Path) -> None:
17
+ """从宿主共享配置里摘掉 vod-devkit 条目(保留其它键/其它 server)。"""
18
+ section = {"opencode": "mcp", "codeartsdoer": "mcp", "codeartswork": "mcp",
19
+ "generic": "mcpServers", "workbuddy": "mcpServers",
20
+ "atomcode": "mcpServers"}.get(target)
21
+ if section:
22
+ if not path.exists():
23
+ return
24
+ try:
25
+ cfg = json.loads(path.read_text(encoding="utf-8"))
26
+ except Exception:
27
+ print(f"skip({path} 不是合法 JSON,未改动)")
28
+ return
29
+ block = cfg.get(section) or {}
30
+ if "vod-devkit" not in block:
31
+ return
32
+ block.pop("vod-devkit")
33
+ if not block:
34
+ cfg.pop(section, None)
35
+ else:
36
+ cfg[section] = block
37
+ path.write_text(json.dumps(cfg, ensure_ascii=False, indent=2), encoding="utf-8")
38
+ print(f"removed {section}.vod-devkit: {path}")
39
+ return
40
+ cli: str | None = None
41
+ args: list[str] = []
42
+ if target == "hermes":
43
+ # 先摘 config.yaml 的预采集 hook(shell hook 形态,D-hook-unify-1)
44
+ from vod_mcp.host_adapters import hermes as _hermes
45
+ cfg = Path(_hermes._profile_config())
46
+ if cfg.exists():
47
+ text = cfg.read_text(encoding="utf-8")
48
+ new_text, removed = _hermes.remove_llm_hook(text)
49
+ new_text2, removed2 = _hermes.remove_guard_hook(new_text)
50
+ if removed or removed2:
51
+ cfg.write_text(new_text2, encoding="utf-8")
52
+ print("removed vod-devkit hooks:", cfg,
53
+ "(pre_llm_call)" if removed else "",
54
+ "(pre_tool_call)" if removed2 else "")
55
+ # 旧插件形态(老装机)一并摘
56
+ legacy = _hermes.remove_legacy_plugin()
57
+ if legacy:
58
+ print("removed legacy plugin:", legacy)
59
+ if shutil.which("hermes"):
60
+ cli, args = "hermes", ["mcp", "remove", "vod-devkit"]
61
+ else:
62
+ cli, args = None, []
63
+ elif target == "codex" and shutil.which("codex"):
64
+ cli, args = "codex", ["mcp", "remove", "vod-devkit"]
65
+ if cli:
66
+ r = subprocess.run([cli, *args], capture_output=True, text=True, timeout=120)
67
+ print(f"{cli} mcp remove:", "OK" if r.returncode == 0
68
+ else (r.stderr or r.stdout).strip()[-120:])
69
+
70
+
71
+ def _outside_home(p: Path) -> bool:
72
+ """落点是否在当前 HOME 之外——**卸载是破坏性动作,守卫必须在这里**。
73
+
74
+ 实锤(2026-11-16):`common.HERMES_SKILLS_DIR` 是 import 期常量,同进程里
75
+ monkeypatch HOME 后它仍指真实家目录,隔离用例于是删掉了真机的 vod-core。
76
+ 判据用 resolve() 后前缀比较(符号链接/相对路径都归一)。
77
+ """
78
+ try:
79
+ home = Path.home().resolve()
80
+ return not str(Path(p).resolve()).startswith(str(home) + os.sep)
81
+ except OSError:
82
+ return True
83
+
84
+
85
+ def _remove_managed_skills(mf: dict, path: Path, target: str | None = None) -> None:
86
+ """技能摘除:**只摘本插件装进去的子目录**,目录本身与别人的技能一律不动。
87
+
88
+ 为什么不再"hermes 目录整删"(2026-11-16 并行评审 P2):该目录
89
+ `~/.hermes/skills/devops/vod-devkit` 是所有安装共用的副本池(`install._install_skills`
90
+ 对每个宿主都会往这里拷一份),用户/其它插件也可能在这里放技能——整删会连带删掉
91
+ 不属于我们的东西。留下的空目录无害,`uninstall` 也不是清理工具。
92
+ """
93
+ names = {rel.split("/")[0] for rel in (mf.get("skillHashes") or {})}
94
+ removed = []
95
+ for n in sorted(names):
96
+ d = path / n
97
+ if d.is_dir():
98
+ shutil.rmtree(d)
99
+ removed.append(n)
100
+ if removed:
101
+ print(f"removed skills: {removed}(目录与其它技能保留):{path}")
102
+ else:
103
+ print(f"skip(无需摘除的技能):{path}")
104
+
105
+
106
+ def _cleanup_install_row(row: dict, skill_hashes: dict | None = None,
107
+ skill_installs: list | None = None,
108
+ remaining_targets: set | None = None) -> None:
109
+ """按一条安装记录清理:技能落点 / MCP 条目 / 宿主专属产物。
110
+
111
+ 技能名清单来自 manifest 顶层 skillHashes(各安装行共用同一份技能集合)。
112
+ 技能**落点**来自顶层 skillInstalls(按 host 匹配)——不能只用 row["skillsDir"]:
113
+ 历史 manifest 把每一行的 skillsDir 都写成 hermes 目录(common.py 单值形态),
114
+ 于是 `uninstall --target opencode` 会去删 hermes 的技能目录、而 opencode 自己的
115
+ `~/.config/opencode/skills` 永远漏删(并行评审 P2 实测)。
116
+ """
117
+ target = str(row.get("target") or "") # 名册老条目可能缺 target:按空串走"未知宿主"分支
118
+ # codex-desktop:mcpConfig 指向共享的 marketplace.json,绝不能走"整文件删"分支
119
+ # (那会删掉用户/其它插件的市场登记)。交给适配器只摘自己那一条 + 删插件目录。
120
+ if target == "codex-desktop":
121
+ from vod_mcp.host_adapters import codex_desktop as _cd
122
+ _cd.uninstall()
123
+ return
124
+ mf = dict(row)
125
+ mf["skillHashes"] = skill_hashes or {}
126
+ # ① 技能:落点真源是 skillInstalls(按 host 匹配),且**共享落点不许摘**——
127
+ # 历史 manifest 把每行 skillsDir 都写成 hermes 目录(单值形态),若照此行删,
128
+ # 卸 opencode 会删掉 hermes 正在用的副本(卸 A 删 B),而 opencode 自己的
129
+ # ~/.config/opencode/skills 永远漏删。老 manifest 无该键时 skillsDir 只有
130
+ # hermes 行可信,其它行宁可漏删也不猜。
131
+ installs = list(skill_installs or [])
132
+ mine = [si for si in installs if si.get("host") == target and si.get("dir")]
133
+ # hermes 目录是**所有安装共用**的副本池(install._install_skills 对每个宿主都往里拷,
134
+ # _skill_installs 也恒含 hermes 条目)。所以它不是"别人的落点",而是"我们冗余的一份":
135
+ # 本次卸载后若不再有 hermes 安装行,这一份也该摘。用自己的落点之外判据 = 剩余行。
136
+ if target != "hermes" and "hermes" not in (remaining_targets or set()):
137
+ # 路径**调用期**解析:common.HERMES_SKILLS_DIR 是 import 期常量,同进程里
138
+ # monkeypatch HOME 之后它会指到真实家目录(隔离测试会去删真机技能,实锤)。
139
+ try:
140
+ pool = str(host_specs.load("hermes")["skillsDir"])
141
+ except KeyError:
142
+ pool = ""
143
+ if pool:
144
+ mine.append({"host": "hermes", "dir": pool})
145
+ if not mine:
146
+ legacy = row.get("skillsDir")
147
+ if legacy and target == "hermes":
148
+ mine = [{"host": target, "dir": legacy}]
149
+ for si in mine:
150
+ d = Path(si["dir"])
151
+ if _outside_home(d):
152
+ print(f"skip(落点不在当前 HOME 之下,拒绝删除):{d}")
153
+ continue
154
+ _remove_managed_skills(mf, d, si.get("host"))
155
+ # ② MCP 配置
156
+ path_s = row.get("mcpConfig")
157
+ if path_s and _outside_home(Path(path_s)):
158
+ print(f"skip(配置不在当前 HOME 之下,拒绝改动):{path_s}")
159
+ path_s = None
160
+ if path_s: # codex 等宿主 mcpConfig 可为 None(P0-3:无托管配置文件)
161
+ path = Path(path_s)
162
+ # dsh 的 profile cordis.patch.yml 是**共享文件**(用户与其它插件也往里写 insert
163
+ # 块)——整文件删会把别人的内容一起删掉(本轮 B 模式用例实锤:卸载后文件消失)。
164
+ # 托管块的摘除由下方 dsh 段(remove_patch_block)完成,这里只打印不改字节。
165
+ if target == "dsh":
166
+ print(f"skip(dsh profile patch 是共享文件,只摘托管块):{path}")
167
+ # 深审 P0-3(破坏性路径一票否决):共享用户配置永不整文件删除
168
+ #(config.toml/opencode.json/codearts_cli.json/.claude.json 里有用户自己的
169
+ # provider、其它 server)。JSON 合并型宿主一律走"摘条目",与文件名无关——
170
+ # codearts_cli.json 第一版没进 _SHARED_CONFIG_NAMES,卸载把整份配置删了(实锤)。
171
+ elif target in ("opencode", "codeartsdoer", "codeartswork", "generic",
172
+ "workbuddy", "atomcode") or path.name in _SHARED_CONFIG_NAMES:
173
+ print(f"skip(用户配置文件,uninstall 只摘托管条目):{path}")
174
+ _remove_managed_mcp_entry(target, path)
175
+ elif path.exists():
176
+ shutil.rmtree(path) if path.is_dir() else path.unlink()
177
+ print("removed:", path)
178
+ # codex 摘除:remote 形态摘 MCP 条目;stdio 形态摘原生插件(best-effort)
179
+ if target == "codex":
180
+ codex = shutil.which("codex")
181
+ if codex and (row.get("transport") or "stdio") == "remote":
182
+ _remove_managed_mcp_entry("codex", Path.home() / ".codex" / "config.toml")
183
+ elif codex:
184
+ r = subprocess.run([codex, "plugin", "remove", "vod-devkit@vod-local"],
185
+ capture_output=True, text=True, timeout=120)
186
+ print("codex plugin remove:",
187
+ "OK" if r.returncode == 0 else (r.stderr or r.stdout).strip()[-120:])
188
+ # opencode 随装生成物(/vod-doctor 命令)
189
+ if target == "opencode":
190
+ for g in host_specs.load("opencode")["generated"]:
191
+ gen = Path(g["dest"])
192
+ if gen.exists():
193
+ gen.unlink()
194
+ print("removed:", gen)
195
+ # dsh 壳(D-dsh-install-1):摘插件 + 从 profile patch 移除 config 段
196
+ if target == "dsh":
197
+ dsh = shutil.which("dsh")
198
+ prof = (row.get("dshProfile") or "").strip()
199
+ if dsh and prof:
200
+ subprocess.run([dsh, "plugin", "--profile", prof, "remove",
201
+ "dsh-vod-devkit"], capture_output=True, text=True)
202
+ if prof: # 无 profile 记录=没写过 patch,无需(也无法)摘除
203
+ patch_path = Path(host_specs.load("dsh", prof)["configPath"])
204
+ from vod_mcp.host_adapters import dsh as dsh_adapter
205
+ if dsh_adapter.remove_patch_block(patch_path):
206
+ print("removed vod-devkit config block:", patch_path)
207
+
208
+
209
+ def _clean_global(rows: list, remaining: list | None = None) -> None:
210
+ """清外部残留(对齐 devkit `--clean-global`):载荷残留 + npx 缓存里的旧副本。
211
+
212
+ 纪律:只删"认得的东西",逐条打印;在用载荷、仓内源码、宿主配置一律不碰。
213
+ `remaining` = 卸载后仍装着的其它宿主行:非空时**机器级 state 必须保留**
214
+ (它是同机共享的设备锚点/令牌,删了会让剩余宿主下次首启换新 nonce = 新设备,
215
+ 历史提交查不到、匿名额度重计)。这条与载荷的 `in_use` 同形,不是特例。
216
+ """
217
+ from vod_mcp import payload as _payload
218
+ from vod_mcp import paths as _paths
219
+ in_use = {r.get("payloadDir") for r in rows if r.get("payloadDir")}
220
+ for res in _payload.residue():
221
+ if str(res) in in_use:
222
+ continue
223
+ shutil.rmtree(res, ignore_errors=True)
224
+ print("removed payload residue:", res)
225
+ # D-token-machine-1:机器级 state(跨版本/跨宿主共享的那一份)。
226
+ state = _paths.machine_state_home()
227
+ if remaining:
228
+ users = ", ".join(r.get("target", "?") for r in remaining)
229
+ print(f"保留 state:{state}(仍有宿主在用:{users})——同机共享设备锚点/令牌")
230
+ else:
231
+ for name in ("runtime.json", "runtime.json.lock", ".migrated"):
232
+ f = state / name
233
+ if f.is_file():
234
+ f.unlink()
235
+ print("removed state:", f)
236
+ if state.is_dir() and not any(state.iterdir()):
237
+ state.rmdir()
238
+ print("removed empty:", state)
239
+ root = Path.home() / ".vod-devkit"
240
+ if root.is_dir() and not any(root.iterdir()):
241
+ root.rmdir()
242
+ print("removed empty:", root)
243
+ npx = Path.home() / ".npm" / "_npx"
244
+ if npx.is_dir():
245
+ for d in npx.iterdir():
246
+ pkg = d / "node_modules" / "vod-devkit"
247
+ if not pkg.is_dir():
248
+ continue
249
+ # 只删我们那一份:一个 npx hash 目录里可能同时缓存了别的包
250
+ #(整目录 rmtree 会连带删掉用户其它 npx 缓存,评审 P2 实测)。
251
+ shutil.rmtree(pkg, ignore_errors=True)
252
+ try:
253
+ leftovers = [x for x in (d / "node_modules").iterdir()]
254
+ except OSError:
255
+ leftovers = []
256
+ if not leftovers:
257
+ shutil.rmtree(d, ignore_errors=True)
258
+ print("removed npx cache:", d)
259
+ else:
260
+ print(f"removed npx copy of vod-devkit(保留同目录其它包):{pkg}")
261
+
262
+
263
+ def cmd_uninstall(args=None):
264
+ target = (getattr(args, "target", "") or "") if args else ""
265
+ clean_global = bool(getattr(args, "clean_global", False)) if args else False
266
+ p = common.manifest_path()
267
+ if not p.exists():
268
+ print("未安装")
269
+ return
270
+ mf = json.loads(p.read_text(encoding="utf-8"))
271
+ all_rows = mf.get("installs") or [mf] # 老 manifest(无 installs[])退化为单条
272
+ rows = [r for r in all_rows if not target or r.get("target") == target]
273
+ if not rows:
274
+ print(f"没有该宿主的安装记录:{target}"
275
+ f"(现有:{', '.join(r.get('target','?') for r in all_rows)})")
276
+ return
277
+ for row in rows:
278
+ still_installed = {r.get("target") for r in all_rows if r not in rows}
279
+ _cleanup_install_row(row, mf.get("skillHashes"), mf.get("skillInstalls"),
280
+ still_installed)
281
+ # 载荷清理(D-payload-1):逐目录去重后删——但别删还被保留行引用的载荷
282
+ keep = {r.get("payloadDir") for r in all_rows if r not in rows and r.get("payloadDir")}
283
+ seen = set()
284
+ for row in rows:
285
+ pd = row.get("payloadDir")
286
+ if not pd or pd in seen or pd in keep:
287
+ continue
288
+ seen.add(pd)
289
+ if Path(pd).is_dir():
290
+ shutil.rmtree(pd, ignore_errors=True)
291
+ print("removed payload:", pd)
292
+ remaining = [r for r in all_rows if r not in rows]
293
+ if remaining:
294
+ mf["installs"] = remaining
295
+ mf["target"] = remaining[-1].get("target")
296
+ mf.pop("payloadDir", None)
297
+ if not any(r.get("payloadDir") for r in remaining):
298
+ from vod_mcp import payload as _payload
299
+ try:
300
+ _payload.marker_path().unlink(missing_ok=True)
301
+ except Exception:
302
+ pass
303
+ p.write_text(json.dumps(mf, ensure_ascii=False, indent=2), encoding="utf-8")
304
+ print(f"removed install row(s): {', '.join(r.get('target','?') for r in rows)}"
305
+ f"(保留 {', '.join(r.get('target','?') for r in remaining)})")
306
+ else:
307
+ from vod_mcp import payload as _payload
308
+ try:
309
+ _payload.marker_path().unlink(missing_ok=True)
310
+ except Exception:
311
+ pass
312
+ p.unlink()
313
+ print("removed:", p)
314
+ if clean_global:
315
+ _clean_global(rows, remaining)