flow-comet 1.6.3 → 1.6.4

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 (78) hide show
  1. package/.flow-comet/skills/flow-comet/INSTALLED_VERSION +1 -1
  2. package/.flow-comet/skills/flow-comet/scripts/comet-hook-guard.mjs +11 -13
  3. package/.flow-comet/skills/flow-comet/scripts/context-init.mjs +2 -2
  4. package/.flow-comet/skills/flow-comet/scripts/evolve.mjs +6 -6
  5. package/.flow-comet/skills/flow-comet/scripts/guard-self-test.mjs +67 -18878
  6. package/.flow-comet/skills/flow-comet/scripts/health.mjs +1 -1
  7. package/.flow-comet/skills/flow-comet/scripts/items/a.mjs +1030 -0
  8. package/.flow-comet/skills/flow-comet/scripts/items/b.mjs +830 -0
  9. package/.flow-comet/skills/flow-comet/scripts/items/c.mjs +781 -0
  10. package/.flow-comet/skills/flow-comet/scripts/items/d.mjs +99 -0
  11. package/.flow-comet/skills/flow-comet/scripts/items/e.mjs +185 -0
  12. package/.flow-comet/skills/flow-comet/scripts/items/f.mjs +90 -0
  13. package/.flow-comet/skills/flow-comet/scripts/items/g.mjs +59 -0
  14. package/.flow-comet/skills/flow-comet/scripts/items/h.mjs +815 -0
  15. package/.flow-comet/skills/flow-comet/scripts/items/i.mjs +77 -0
  16. package/.flow-comet/skills/flow-comet/scripts/items/j.mjs +75 -0
  17. package/.flow-comet/skills/flow-comet/scripts/items/k.mjs +1427 -0
  18. package/.flow-comet/skills/flow-comet/scripts/items/l.mjs +275 -0
  19. package/.flow-comet/skills/flow-comet/scripts/items/m.mjs +614 -0
  20. package/.flow-comet/skills/flow-comet/scripts/lib/count-derivation.mjs +97 -0
  21. package/.flow-comet/skills/flow-comet/scripts/lib/fix-loop-node.mjs +196 -0
  22. package/.flow-comet/skills/flow-comet/scripts/lib/guard-evidence-gates.mjs +553 -0
  23. package/.flow-comet/skills/flow-comet/scripts/lib/guard-gates.mjs +837 -0
  24. package/.flow-comet/skills/flow-comet/scripts/lib/guard-routing.mjs +404 -0
  25. package/.flow-comet/skills/flow-comet/scripts/lib/guard-state-io.mjs +404 -0
  26. package/.flow-comet/skills/flow-comet/scripts/lib/guard-template-fidelity.mjs +302 -0
  27. package/.flow-comet/skills/flow-comet/scripts/lib/guard-uidesign.mjs +133 -0
  28. package/.flow-comet/skills/flow-comet/scripts/lib/reentry-node.mjs +237 -0
  29. package/.flow-comet/skills/flow-comet/scripts/lib/replan-node.mjs +209 -0
  30. package/.flow-comet/skills/flow-comet/scripts/lib/state-branch.mjs +49 -0
  31. package/.flow-comet/skills/flow-comet/scripts/lib/state-bridgecheck.mjs +201 -0
  32. package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-admin.mjs +141 -0
  33. package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-flow.mjs +700 -0
  34. package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-recovery.mjs +578 -0
  35. package/.flow-comet/skills/flow-comet/scripts/lib/state-determine.mjs +52 -0
  36. package/.flow-comet/skills/flow-comet/scripts/lib/state-evolve-hint.mjs +55 -0
  37. package/.flow-comet/skills/flow-comet/scripts/lib/state-explain.mjs +106 -0
  38. package/.flow-comet/skills/flow-comet/scripts/lib/state-intelscan.mjs +58 -0
  39. package/.flow-comet/skills/flow-comet/scripts/lib/state-io.mjs +147 -0
  40. package/.flow-comet/skills/flow-comet/scripts/lib/state-skillmarkers.mjs +189 -0
  41. package/.flow-comet/skills/flow-comet/scripts/lib/system-fixtures.mjs +1441 -0
  42. package/.flow-comet/skills/flow-comet/scripts/lib/task-graph.mjs +471 -0
  43. package/.flow-comet/skills/flow-comet/scripts/lib/test-assertions.mjs +509 -0
  44. package/.flow-comet/skills/flow-comet/scripts/lib/test-fixtures.mjs +1228 -0
  45. package/.flow-comet/skills/flow-comet/scripts/lib/test-helpers.mjs +237 -0
  46. package/.flow-comet/skills/flow-comet/scripts/lib/text-anchor-checks.mjs +2484 -0
  47. package/.flow-comet/skills/flow-comet/scripts/protocol-utils.mjs +2 -2
  48. package/.flow-comet/skills/flow-comet/scripts/route-node.mjs +72 -1123
  49. package/.flow-comet/skills/flow-comet/scripts/scenarios/a.mjs +966 -0
  50. package/.flow-comet/skills/flow-comet/scripts/scenarios/b.mjs +1233 -0
  51. package/.flow-comet/skills/flow-comet/scripts/scenarios/c.mjs +1382 -0
  52. package/.flow-comet/skills/flow-comet/scripts/scenarios/d.mjs +483 -0
  53. package/.flow-comet/skills/flow-comet/scripts/scenarios/e.mjs +1388 -0
  54. package/.flow-comet/skills/flow-comet/scripts/scenarios/f.mjs +1466 -0
  55. package/.flow-comet/skills/flow-comet/scripts/scenarios/g.mjs +1364 -0
  56. package/.flow-comet/skills/flow-comet/scripts/scenarios/h.mjs +1287 -0
  57. package/.flow-comet/skills/flow-comet/scripts/scenarios/i.mjs +1436 -0
  58. package/.flow-comet/skills/flow-comet/scripts/scenarios/j.mjs +1384 -0
  59. package/.flow-comet/skills/flow-comet/scripts/scenarios/k.mjs +1338 -0
  60. package/.flow-comet/skills/flow-comet/scripts/scenarios/l.mjs +1484 -0
  61. package/.flow-comet/skills/flow-comet/scripts/scenarios/m.mjs +971 -0
  62. package/.flow-comet/skills/flow-comet/scripts/state-schema.mjs +1 -1
  63. package/.flow-comet/skills/flow-comet/scripts/system-test.mjs +58 -7559
  64. package/.flow-comet/skills/flow-comet/scripts/time-utils.mjs +4 -4
  65. package/.flow-comet/skills/flow-comet/scripts/workflow-guard.mjs +151 -2476
  66. package/.flow-comet/skills/flow-comet/scripts/workflow-handoff.mjs +5 -5
  67. package/.flow-comet/skills/flow-comet/scripts/workflow-state.mjs +27 -2190
  68. package/.flow-comet/skills/flow-comet-plan/GUIDANCE.md +1 -1
  69. package/README.md +52 -69
  70. package/package.json +3 -2
  71. package/scripts/dsh-bridge.mjs +2 -2
  72. package/scripts/lib/installer-cleanup.mjs +152 -0
  73. package/scripts/lib/installer-flowkit.mjs +119 -0
  74. package/scripts/lib/installer-hooks.mjs +363 -0
  75. package/scripts/lib/installer-loader.mjs +220 -0
  76. package/scripts/lib/installer-migrate.mjs +236 -0
  77. package/scripts/lib/installer-platforms.mjs +314 -0
  78. package/scripts/prepare-env.mjs +21 -1313
@@ -0,0 +1,363 @@
1
+ /**
2
+ * installer-hooks.mjs — 各平台的配置注入与 .gitignore 纳管(prepare-env 的逻辑层模块)
3
+ *
4
+ * 「注入」在本模块的统一语义(也是本模块的边界):读现有文件 → 保留用户既有内容 → 只替换
5
+ * 本安装器管理的条目 → 写回。解析不了(非法 JSON / 非 YAML / 结构不符)一律中止并给人工处置
6
+ * 指引,绝不静默覆盖——安装器写的是用户的配置文件,失败方向必须是「不动」而不是「清空」,
7
+ * 否则一次手写变体就会让用户的权限与 hook 配置消失。
8
+ *
9
+ * 依赖方向:installer-migrate(路径探测原语与运行时目录名)与 installer-loader(托管块移除:
10
+ * AGENTS.md 托管区与 cordis.patch.yml 托管块共用同一幂等替换边界);installer-platforms 依赖
11
+ * 本模块。反向依赖不存在。
12
+ */
13
+ import fs from 'node:fs';
14
+ import os from 'node:os';
15
+ import path from 'node:path';
16
+
17
+ import { RUNTIME_DIR, isMissingPathError } from './installer-migrate.mjs';
18
+ import { stripManagedBlock } from './installer-loader.mjs';
19
+
20
+ // comet-hook-guard 的 command 特征(用于识别"已管理的 hook 命令",注入时替换避免重复)
21
+ const MANAGED_HOOK_COMMAND_MARKER = 'comet-hook-guard.mjs';
22
+
23
+ // ---------- hook 命令项目根锚定(单一事实来源) ----------
24
+ // Claude Code 运行 hook 时注入 CLAUDE_PROJECT_DIR 环境变量(值 = 项目根绝对路径,官方 hooks
25
+ // 文档契约)。变量名是唯一事实来源;命令形态**全平台统一**为 POSIX/bash 词形
26
+ // (`${VAR}` + 正斜杠——CC 在所有平台含 Windows 都以 /bin/bash -c 执行 hook 命令),
27
+ // 由 projectRootGuardScriptRef 派生,不按宿主 OS 分叉。
28
+ const PROJECT_ROOT_ENV_VAR = 'CLAUDE_PROJECT_DIR';
29
+
30
+ // hook 命令加整体外层引号(2026-09-10 演进——原「不加引号」取舍的前提是识别函数按空白分词
31
+ // 判等、外层引号会并入 token 使 basename 失配;识别函数已演进为容忍引号,故放开):未加
32
+ // 引号时,含空格的项目根路径在变量展开后会被词法分词切断(静默失效,与反斜杠转义同类)。
33
+ function projectRootGuardScriptRef(rootDirName) {
34
+ // CC 全平台以 /bin/bash -c 执行 hook 命令(含 Windows——Git Bash 语义),并注入
35
+ // CLAUDE_PROJECT_DIR 环境变量;故统一 POSIX 形态:${VAR} 花括号词形(CC 自身亦做该词形
36
+ // 插值——字符串替换,双保险)+ 正斜杠路径(反斜杠在 bash 词法里会被当转义吞掉,如 \. \f)。
37
+ // 整体加引号:含空格的项目根路径不因词法分词断裂;识别层容忍引号(isManagedHookCommand
38
+ // 去引号后取 basename 判等),幂等升级不受影响。
39
+ const segments = [rootDirName, 'skills', 'flow-comet', 'scripts', MANAGED_HOOK_COMMAND_MARKER];
40
+ return `"\${${PROJECT_ROOT_ENV_VAR}}/${segments.join('/')}"`;
41
+ }
42
+
43
+ // AGENTS.md 托管区标记(Codex/dsh 平台 rules 注入共用——幂等替换边界,任一平台卸载可清)
44
+ export const MANAGED_AGENTS_START = '<!-- Managed by flow-comet prepare-env -->';
45
+ export const MANAGED_AGENTS_END = '<!-- /Managed by flow-comet prepare-env -->';
46
+ // ---------- .gitignore 保守纳管(目标项目;读-合并-写幂等,参照 injectSettingsHook 模式) ----------
47
+
48
+ /** 判断一行是否为 `.flow-comet/` 忽略条目(容忍首尾空白与可选的首尾斜杠变体)。 */
49
+ function isRuntimeDirIgnoreLine(line) {
50
+ return String(line).trim().replace(/^\/+/, '').replace(/\/+$/, '') === RUNTIME_DIR;
51
+ }
52
+
53
+ /**
54
+ * gitignore 保守纳管(读-合并-写幂等):既有条目一律保留原样——安装器无法可靠推断用户
55
+ * 写下 `.comet/` 条目的原始意图(实测载体用整目录形态,该目录中仍有 Comet 资产),
56
+ * 故只做「缺失时追加」,不改写用户其他内容(无关行/注释/既有行尾风格)。
57
+ * 源仓库自身跳过:`.flow-comet/` 在源仓库是权威源(需被版本控制跟踪),
58
+ * 整目录忽略会把权威源新增文件静默排除出版本控制。
59
+ */
60
+ export function manageGitignore(target) {
61
+ if (fs.existsSync(path.join(target, RUNTIME_DIR, 'skills', 'flow-comet', 'SKILL.md'))) {
62
+ console.log(`[flow-comet] .gitignore 纳管跳过: 当前目录是 flow-comet 源仓库(${RUNTIME_DIR}/ 为权威源,需保持被版本控制跟踪)`);
63
+ return;
64
+ }
65
+ const gitignorePath = path.join(target, '.gitignore');
66
+ let existing = '';
67
+ let fileExists = false;
68
+ try {
69
+ existing = fs.readFileSync(gitignorePath, 'utf8');
70
+ fileExists = true;
71
+ } catch (err) {
72
+ // 只有「确实不存在」才是首次纳管;访问类故障(EACCES/EPERM/EIO…)必须原样抛出中止——
73
+ // 按空内容继续会让下面的写回把用户既有 .gitignore **截断**为仅含受管条目
74
+ // (判定语义见 isMissingPathError;调用点契约即「失败即中止,可重跑自愈」)。
75
+ if (!isMissingPathError(err)) {
76
+ throw err;
77
+ }
78
+ }
79
+ if (existing.split(/\r?\n/).some(isRuntimeDirIgnoreLine)) {
80
+ console.log(`[flow-comet] .gitignore 已含 ${RUNTIME_DIR}/ 条目——保持原样(幂等)`);
81
+ return;
82
+ }
83
+ const eol = existing.includes('\r\n') ? '\r\n' : '\n';
84
+ const appended = ['# flow-comet 运行时文件(不随仓库分发)', `${RUNTIME_DIR}/`].join(eol);
85
+ const separator = !fileExists || existing === '' || existing.endsWith('\n') ? '' : eol;
86
+ fs.writeFileSync(gitignorePath, existing + separator + appended + eol, 'utf8');
87
+ console.log(`[flow-comet] .gitignore 追加 ${RUNTIME_DIR}/ 条目(既有内容原样保留): ${gitignorePath}`);
88
+ }
89
+ // ---------- settings.local.json 注入(Claude Code 平台;参考 comet installClaudeCodeHooks) ----------
90
+
91
+ /** 判断 hook 命令是否为"已管理的 comet hook"(注入时替换,保证幂等)。
92
+ * 精确匹配:归一化命令(去前缀、统一分隔符)后必须包含
93
+ * 'comet-hook-guard.mjs' 作为脚本路径(而非任意位置子串),防误伤用户自定义 hook。
94
+ */
95
+ function isManagedHookCommand(command) {
96
+ if (typeof command !== 'string' || command.trim() === '') {
97
+ return false;
98
+ }
99
+ const normalized = command.replace(/\\/g, '/').trim();
100
+ // 提取命令中的脚本路径(node <path> 或直接 <path>)——容忍外层引号(含空格路径防护形态):
101
+ // 引号由可选的 ["']? 吸收、不并入捕获组,basename 判等保持形态无关(旧相对形态 / 变量引用
102
+ // 形态 / 绝对路径形态 / 带引号形态均识别)。
103
+ const pathMatch = normalized.match(/(?:^|\s)["']?([^\s"']+\.mjs)["']?(?:\s|$)/);
104
+ if (!pathMatch) {
105
+ return false;
106
+ }
107
+ const scriptPath = pathMatch[1].split('/').pop();
108
+ return scriptPath === MANAGED_HOOK_COMMAND_MARKER;
109
+ }
110
+
111
+ /**
112
+ * 合并 hook 组:已有组中过滤掉已管理的 comet hook 命令;新组按 matcher 合并进
113
+ * 同 matcher 的既有组(或新建组)。参考 comet mergeHookGroups。
114
+ */
115
+ function mergeHookGroups(existingGroups, newGroups) {
116
+ const mergedGroups = (Array.isArray(existingGroups) ? existingGroups : []).map((group) => {
117
+ if (!group || typeof group !== 'object' || Array.isArray(group) || !Array.isArray(group.hooks)) {
118
+ return group;
119
+ }
120
+ const hadManagedHook = group.hooks.some((hook) => isManagedHookCommand(hook && hook.command));
121
+ const filtered = group.hooks.filter((hook) => !isManagedHookCommand(hook && hook.command));
122
+ // 只删除「含托管 hook 且过滤后为空」的组:matcher 演进(如 Write|Edit → Write|Edit|Bash)
123
+ // 会使旧托管组过滤为空,此时删除防配置污染(与 Codex purge 路径一致);
124
+ // 用户空组/纯用户组保留(不动用户配置——2026-08-16 修复:此前统一删空组会误删用户空 matcher 组)
125
+ if (hadManagedHook && filtered.length === 0) return null;
126
+ return { ...group, hooks: filtered };
127
+ }).filter(Boolean);
128
+ for (const newGroup of newGroups) {
129
+ const existingIndex = mergedGroups.findIndex(
130
+ (group) =>
131
+ group &&
132
+ typeof group === 'object' &&
133
+ !Array.isArray(group) &&
134
+ group.matcher === newGroup.matcher &&
135
+ Array.isArray(group.hooks)
136
+ );
137
+ if (existingIndex >= 0) {
138
+ const existing = mergedGroups[existingIndex];
139
+ mergedGroups[existingIndex] = { ...existing, hooks: [...existing.hooks, ...newGroup.hooks] };
140
+ } else {
141
+ mergedGroups.push(newGroup);
142
+ }
143
+ }
144
+ return mergedGroups;
145
+ }
146
+
147
+ /**
148
+ * 注入 comet hook 到 settings.local.json(Claude Code 平台):
149
+ * 读现有 settings(缺失 → {})→ 保留全部既有字段(permissions 等)→
150
+ * 只更新 hooks.PreToolUse(过滤已管理 comet hook + 合并新 hook)→ 写回。
151
+ *
152
+ * fail-safe(T-FIX-13 审查修复):
153
+ * - settings 文件存在但 JSON 非法 → 抛错退出(不静默覆盖,避免用户内容丢失)
154
+ * - hooks.PreToolUse 非数组(手写变体/对象形式)→ 保留原值 + 警告(不注入,
155
+ * 避免破坏用户结构;提示手动配置)
156
+ */
157
+ export function injectSettingsHook(claudeDir) {
158
+ const settingsPath = path.join(claudeDir, 'settings.local.json');
159
+ let settings = {};
160
+ let fileExists = false;
161
+ try {
162
+ const raw = fs.readFileSync(settingsPath, 'utf8');
163
+ fileExists = true;
164
+ const parsed = JSON.parse(raw);
165
+ if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
166
+ settings = parsed;
167
+ } else {
168
+ throw new Error('settings 顶层必须是 JSON 对象');
169
+ }
170
+ } catch (err) {
171
+ if (fileExists) {
172
+ // 文件存在但非法:fail-safe——不覆盖用户内容,报错退出
173
+ throw new Error(
174
+ `settings.local.json 已存在但内容非法(${err.message})——为保护用户配置,中止注入。` +
175
+ `请修复该文件后重试,或手动添加 hook 配置(见 README 方案 B)。`
176
+ );
177
+ }
178
+ // 文件缺失:视为空对象(首次安装)
179
+ settings = {};
180
+ }
181
+ const existingHooks = settings.hooks && typeof settings.hooks === 'object' && !Array.isArray(settings.hooks)
182
+ ? settings.hooks
183
+ : {};
184
+ const newGroup = {
185
+ // R5: matcher 含 Bash——协调者禁令物理化(Bash 写源码命令同样被 hook 检测拦截;
186
+ // hook 对无写路径的 Bash 命令(如 git/查询)放行)
187
+ matcher: 'Write|Edit|Bash',
188
+ hooks: [
189
+ {
190
+ type: 'command',
191
+ // 项目根锚定(全平台统一形态):node ${CLAUDE_PROJECT_DIR}/.claude/skills/.../comet-hook-guard.mjs
192
+ // —— CC 以 /bin/bash -c 执行 hook 命令(含 Windows),POSIX 词形 + 正斜杠为唯一可用形态。
193
+ // 运行期由 CC 注入的变量展开;单一事实来源 = PROJECT_ROOT_ENV_VAR + projectRootGuardScriptRef。
194
+ command: `node ${projectRootGuardScriptRef('.claude')}`,
195
+ },
196
+ ],
197
+ };
198
+ if (existingHooks.PreToolUse !== undefined && !Array.isArray(existingHooks.PreToolUse)) {
199
+ // PreToolUse 非数组(手写变体):保留原值 + 警告,不注入(避免破坏用户结构)
200
+ console.error(
201
+ '[flow-comet] 警告: settings.local.json 的 hooks.PreToolUse 不是数组(可能是手写变体)——' +
202
+ '为保护用户配置,未注入 comet hook。请手动添加(见 README 方案 B)。'
203
+ );
204
+ return settings;
205
+ }
206
+ const merged = mergeHookGroups(existingHooks.PreToolUse, [newGroup]);
207
+ settings.hooks = { ...existingHooks, PreToolUse: merged };
208
+ fs.mkdirSync(claudeDir, { recursive: true });
209
+ fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n', 'utf8');
210
+ return settings;
211
+ }
212
+ // ---------- Codex 平台注入 + AGENTS.md 托管区(codex/dsh 共用) ----------
213
+
214
+ /**
215
+ * 注入 comet hook 到 .codex/hooks.json(Codex 平台):
216
+ * 读现有 hooks(缺失 → {})→ 过滤已管理 comet hook(命令含 comet-hook-guard.mjs)→
217
+ * 合并新组(matcher "*"——Codex PreToolUse 只拦截 Bash 工具,写路径经 PowerShell/Bash 命令,
218
+ * 必须匹配所有 Bash 调用;命令带 --platform codex 平台标记)→ 写回。
219
+ * 结构:顶层 "hooks" 包裹层(Codex 与 Claude Code 同构——{"hooks":{"PreToolUse":[...]}};
220
+ * 实测缺包裹层 hook 不加载)。
221
+ * fail-safe:文件存在但 JSON 非法 → 抛错退出(保护用户配置)。
222
+ */
223
+ export function injectCodexHook(codexDir, target) {
224
+ const hooksPath = path.join(codexDir, 'hooks.json');
225
+ let hooks = {};
226
+ let fileExists = false;
227
+ try {
228
+ const raw = fs.readFileSync(hooksPath, 'utf8');
229
+ fileExists = true;
230
+ const parsed = JSON.parse(raw);
231
+ if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
232
+ hooks = parsed;
233
+ } else {
234
+ throw new Error('hooks.json 顶层必须是 JSON 对象');
235
+ }
236
+ } catch (err) {
237
+ if (fileExists) {
238
+ throw new Error(
239
+ `.codex/hooks.json 已存在但内容非法(${err.message})——为保护用户配置,中止注入。请修复该文件后重试。`
240
+ );
241
+ }
242
+ hooks = {};
243
+ }
244
+ const existingHooks = hooks.hooks && typeof hooks.hooks === 'object' && !Array.isArray(hooks.hooks)
245
+ ? hooks.hooks
246
+ : {};
247
+ const existingGroups = Array.isArray(existingHooks.PreToolUse) ? existingHooks.PreToolUse : [];
248
+ // D6 查证结论(2026-08,openai/codex 官方仓库 main 分支):
249
+ // - hooks.json 的 command 经 shell 执行:Windows = %COMSPEC% 回退 cmd.exe /C;POSIX = $SHELL
250
+ // 回退 /bin/sh -lc(codex-rs/hooks/src/engine/command_runner.rs 的 build_command /
251
+ // default_shell_command);子进程环境 = 会话环境快照 + 条目级 env 映射,current_dir = 会话工作目录。
252
+ // - 无等价项目根变量:全仓 Rust 检索 CODEX_PROJECT_DIR / CLAUDE_PROJECT_DIR / project_dir
253
+ // 均 0 命中(GitHub code search,openai/codex);$PWD/%CD% 展开的是"会话启动目录"而非
254
+ // 项目根契约,子目录启动即漂移——不构成 CLAUDE_PROJECT_DIR 的等价锚点。
255
+ // → 按 D6 预授权退化分支:安装期把 target 绝对路径字面注入(path.join)。
256
+ // ⚠️ 迁移目录需重跑安装器:绝对路径随安装位置固化,项目移动/换 checkout 后必须重新运行
257
+ // 本安装器刷新 hooks.json(旧条目按脚本 basename 仍被 isManagedHookCommand 识别并在
258
+ // 重跑时被过滤替换为新位置——幂等自愈,不会产生重复条目)。
259
+ // 注:上游 HookHandlerConfig::Command 另有 command_windows 平台分字段(declarations.rs);
260
+ // 本安装器逐机注入,写入路径与宿主 OS 天然一致,无需分字段双写。
261
+ const guardAbsolutePath = path.join(target, '.agents', 'skills', 'flow-comet', 'scripts', MANAGED_HOOK_COMMAND_MARKER);
262
+ const newGroup = {
263
+ matcher: '*',
264
+ hooks: [
265
+ {
266
+ type: 'command',
267
+ command: `node ${guardAbsolutePath} before_tool --platform codex`,
268
+ },
269
+ ],
270
+ };
271
+ const merged = mergeHookGroups(existingGroups, [newGroup]);
272
+ hooks.hooks = { ...existingHooks, PreToolUse: merged };
273
+ fs.mkdirSync(codexDir, { recursive: true });
274
+ fs.writeFileSync(hooksPath, JSON.stringify(hooks, null, 2) + '\n', 'utf8');
275
+ return hooks;
276
+ }
277
+ /**
278
+ * 注入 Codex hook 启用配置到 .codex/config.toml(Codex 平台):
279
+ * hooks 默认关闭——需 [features] hooks = true(部分版本 codex_hooks = true;双写兼容)。
280
+ * 幂等:已有 [features] 段时合并缺失键,不覆盖用户其他配置。
281
+ */
282
+ export function injectCodexConfig(codexDir) {
283
+ const configPath = path.join(codexDir, 'config.toml');
284
+ let content = '';
285
+ try {
286
+ content = fs.readFileSync(configPath, 'utf8');
287
+ } catch { /* 文件缺失 = 首次安装 */ }
288
+ if (content.includes('[features]')) {
289
+ // 已有 [features] 段:一次性补齐全部缺失键(分次 replace 会因插入点被前次消耗而失配;
290
+ // CRLF 行尾与文件尾无换行均须匹配——(\[features\])(?:\r?\n|$) 覆盖)
291
+ const missing = [];
292
+ if (!/^hooks\s*=/m.test(content)) missing.push('hooks = true');
293
+ if (!/^codex_hooks\s*=/m.test(content)) missing.push('codex_hooks = true');
294
+ if (missing.length > 0) {
295
+ content = content.replace(/(\[features\])(?:\r?\n|$)/, '$1\r\n' + missing.join('\r\n') + '\r\n');
296
+ }
297
+ } else {
298
+ const trimmed = content.trim();
299
+ content = (trimmed ? trimmed + '\n\n' : '') + '[features]\nhooks = true\ncodex_hooks = true\n';
300
+ }
301
+ fs.mkdirSync(codexDir, { recursive: true });
302
+ fs.writeFileSync(configPath, content, 'utf8');
303
+ }
304
+ /**
305
+ * 注入 rules 到 AGENTS.md 托管区(Codex/dsh 平台共用——AGENTS.md 是两平台指令
306
+ * 唯一自动加载路径;.codex/rules/ 是命令批准规则目录,不混用)。
307
+ * 读现有 AGENTS.md(缺失 → 空)→ 移除旧托管区(幂等)→ 托管区内联 orchestration 全文
308
+ * → 保留托管区外用户内容 → 写回。托管区标记不变(任一平台卸载可清,另一平台重装恢复)。
309
+ * `rulesSrc` 由调用方给出(本模块不推导仓库路径——那会与 installer-platforms 形成循环依赖)。
310
+ */
311
+ export function injectManagedRules(target, stats, rulesSrc) {
312
+ if (!fs.existsSync(rulesSrc)) return false;
313
+ const rulesFile = path.join(rulesSrc, 'flow-comet-orchestration.md');
314
+ if (!fs.existsSync(rulesFile)) return false;
315
+ const rulesText = fs.readFileSync(rulesFile, 'utf8');
316
+ const agentsPath = path.join(target, 'AGENTS.md');
317
+ let existing = '';
318
+ try {
319
+ existing = fs.readFileSync(agentsPath, 'utf8');
320
+ } catch { /* 文件缺失 = 首次安装 */ }
321
+ const stripped = stripManagedBlock(existing, MANAGED_AGENTS_START, MANAGED_AGENTS_END);
322
+ const managedBlock =
323
+ MANAGED_AGENTS_START + '\n' +
324
+ rulesText.trim() + '\n' +
325
+ MANAGED_AGENTS_END + '\n';
326
+ const merged = (stripped.trim() ? stripped.trim() + '\n\n' : '') + managedBlock;
327
+ fs.writeFileSync(agentsPath, merged, 'utf8');
328
+ stats.files++;
329
+ return true;
330
+ }
331
+ /**
332
+ * 移除 .codex/hooks.json 中的托管 hook 条目(purge 语义:移除而非注入——保留用户条目;
333
+ * 重建流程会重新注入新托管条目)。文件非法 JSON 时不动(保护用户配置)。
334
+ */
335
+ export function removeManagedCodexHooks(codexDir) {
336
+ const hooksPath = path.join(codexDir, 'hooks.json');
337
+ if (!fs.existsSync(hooksPath)) return;
338
+ let hooks;
339
+ try {
340
+ hooks = JSON.parse(fs.readFileSync(hooksPath, 'utf8'));
341
+ } catch { return; } // 非法 JSON 不触碰(保护用户配置)
342
+ const outer = hooks && typeof hooks === 'object' && !Array.isArray(hooks) ? hooks : {};
343
+ const inner = outer.hooks && typeof outer.hooks === 'object' && !Array.isArray(outer.hooks) ? outer.hooks : {};
344
+ if (!Array.isArray(inner.PreToolUse)) return;
345
+ inner.PreToolUse = inner.PreToolUse
346
+ .map((group) => (
347
+ group && typeof group === 'object' && !Array.isArray(group) && Array.isArray(group.hooks)
348
+ ? { ...group, hooks: group.hooks.filter((hook) => !isManagedHookCommand(hook && hook.command)) }
349
+ : group
350
+ ))
351
+ .filter((group) => group && typeof group === 'object' && Array.isArray(group.hooks) && group.hooks.length > 0);
352
+ outer.hooks = inner;
353
+ fs.writeFileSync(hooksPath, JSON.stringify(outer, null, 2) + '\n', 'utf8');
354
+ }
355
+ // ---------- dsh 平台注入 ----------
356
+
357
+ /**
358
+ * $DSH_HOME 解析(dsh 平台——与 dsh CLI 同款默认):显式 DSH_HOME 环境变量 > ~/.dsh。
359
+ */
360
+ export function resolveDshHome() {
361
+ if (process.env.DSH_HOME) return path.resolve(process.env.DSH_HOME);
362
+ return path.join(os.homedir(), '.dsh');
363
+ }
@@ -0,0 +1,220 @@
1
+ /**
2
+ * installer-loader.mjs — 桥接 loader 的版本比对与托管块注入(prepare-env 的逻辑层模块)
3
+ *
4
+ * 为什么版本比对与 cordis patch 同处一个模块:两者都作用于「$DSH_HOME 全局挂载的桥接 loader」
5
+ * 这一条生命周期链——loader 覆盖前先报版本方向(首次安装 / 升级 / 降级 / 版本一致),再按同一个
6
+ * loader 路径生成 cordis.patch.yml 的托管块;而托管块的插入与移除又共用同一幂等替换边界
7
+ * (stripManagedBlock,AGENTS.md 托管区亦复用它)。拆成两处会让「loader 路径 → patch 引用」的
8
+ * 对应关系失去单一落点,两处路径推导一旦漂移,patch 会静默指向不存在的文件。
9
+ *
10
+ * 依赖方向:本模块是叶子(只用 node 内置模块);installer-hooks 与 installer-platforms 依赖它。
11
+ */
12
+ import fs from 'node:fs';
13
+ import path from 'node:path';
14
+ import { pathToFileURL } from 'node:url';
15
+
16
+ // $DSH_HOME/cordis.patch.yml 托管块标记(dsh 平台 home patch 注入——幂等替换边界;
17
+ // 参照本机既有惯例:# --- dsh-skin managed --- ... # --- end dsh-skin managed ---)
18
+ const MANAGED_CORDIS_START = '# --- flow-comet managed ---';
19
+ const MANAGED_CORDIS_END = '# --- end flow-comet managed ---';
20
+ // ---------- loader 覆盖前版本比对(全局挂载的桥接 loader 生命周期治理) ----------
21
+
22
+ // 版本戳锚点正则(标记行格式契约:独立整行、行首无缩进、冒号后恰一个空格、行尾无其它字符;
23
+ // 格式禁动——安装器与 bridge-check 双侧提取以此为准;技能包自包含,语义同值复刻不跨模块 import)。
24
+ const BRIDGE_VERSION_RE = /^\/\/ BRIDGE_VERSION: ([0-9]+\.[0-9]+\.[0-9]+(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?)$/m;
25
+
26
+ /**
27
+ * 从 loader 文件提取版本戳(同一锚点正则)。返回 { ok:true, version };
28
+ * 文件缺失/读取失败/无标记行 → { ok:false, reason }(调用方告警兜底,不抛错)。
29
+ */
30
+ function extractBridgeVersion(loaderPath) {
31
+ let text;
32
+ try {
33
+ text = fs.readFileSync(loaderPath, 'utf8');
34
+ } catch {
35
+ return { ok: false, reason: '文件读取失败' };
36
+ }
37
+ const match = BRIDGE_VERSION_RE.exec(text);
38
+ if (match) return { ok: true, version: match[1] };
39
+ // 标记行存在但形态非法(区别于「无标记行」)——仍走既有警告路径,原因精确可诊断
40
+ const loose = /^\/\/ BRIDGE_VERSION: (.*)$/m.exec(text);
41
+ return loose
42
+ ? { ok: false, reason: '版本戳形态非法(非语义化版本: ' + loose[1] + ')' }
43
+ : { ok: false, reason: '未提取到版本戳标记行' };
44
+ }
45
+
46
+ /**
47
+ * 语义化版本数值序比较(覆盖前判定方向):major.minor.patch 逐段按数值比较
48
+ * (如 1.10.0 > 1.6.0——非字典序);核心版本相等时按语义化版本规则处理预发布后缀
49
+ * (如 1.6.0-alpha.1 < 1.6.0)。返回 -1 / 0 / 1。
50
+ */
51
+ function compareBridgeVersions(a, b) {
52
+ const parse = (v) => {
53
+ const text = String(v);
54
+ const dash = text.indexOf('-');
55
+ const core = (dash === -1 ? text : text.slice(0, dash)).split('.').map((seg) => parseInt(seg, 10));
56
+ return { core, pre: dash === -1 ? null : text.slice(dash + 1) };
57
+ };
58
+ const av = parse(a);
59
+ const bv = parse(b);
60
+ const coreLen = Math.max(av.core.length, bv.core.length);
61
+ for (let i = 0; i < coreLen; i++) {
62
+ const x = av.core[i] ?? 0;
63
+ const y = bv.core[i] ?? 0;
64
+ if (x !== y) return x < y ? -1 : 1;
65
+ }
66
+ const ap = av.pre !== null;
67
+ const bp = bv.pre !== null;
68
+ if (ap !== bp) return ap ? -1 : 1; // 预发布 < 正式版
69
+ if (!ap) return 0;
70
+ const ai = av.pre.split('.');
71
+ const bi = bv.pre.split('.');
72
+ const preLen = Math.max(ai.length, bi.length);
73
+ for (let i = 0; i < preLen; i++) {
74
+ if (i >= ai.length) return -1; // 更短标识符列表是更长列表的前缀 → 更小
75
+ if (i >= bi.length) return 1;
76
+ const x = ai[i];
77
+ const y = bi[i];
78
+ if (x === y) continue;
79
+ const xn = /^\d+$/.test(x) ? parseInt(x, 10) : null;
80
+ const yn = /^\d+$/.test(y) ? parseInt(y, 10) : null;
81
+ if (xn !== null && yn !== null) return xn < yn ? -1 : 1;
82
+ if (xn !== null) return -1; // 数字标识符 < 字母标识符(语义化版本规则)
83
+ if (yn !== null) return 1;
84
+ return x < y ? -1 : 1;
85
+ }
86
+ return 0;
87
+ }
88
+
89
+ /**
90
+ * 覆盖前版本比对明示:从权威源 loader 与已装 loader 各提取版本戳,按数值序输出
91
+ * 首次安装 / 升级 A→B / 降级 A→B / 版本一致 四类结论之一(人读、带 [flow-comet] 前缀)。
92
+ * 任一侧提取失败(文件缺失/无标记行)→ 告警并跳过比对——不抛错、不中断安装;
93
+ * 覆盖动作(copyFileSync)由调用方照常执行,幂等语义不变。
94
+ */
95
+ export function reportLoaderVersionTransition(loaderSrc, loaderDst) {
96
+ if (!fs.existsSync(loaderDst)) {
97
+ console.log('[flow-comet] 桥接 loader 首次安装($DSH_HOME/plugins 无已装 loader)');
98
+ return;
99
+ }
100
+ const src = extractBridgeVersion(loaderSrc);
101
+ const installed = extractBridgeVersion(loaderDst);
102
+ if (!src.ok || !installed.ok) {
103
+ const failedSide = !src.ok ? '权威源 loader' : '已装 loader';
104
+ const reason = !src.ok ? src.reason : installed.reason;
105
+ console.warn(
106
+ `[flow-comet] 警告: ${failedSide} 版本戳提取失败(${reason})——跳过版本比对,继续覆盖安装`
107
+ );
108
+ return;
109
+ }
110
+ const a = installed.version;
111
+ const b = src.version;
112
+ const cmp = compareBridgeVersions(a, b);
113
+ if (cmp < 0) {
114
+ console.log(`[flow-comet] 桥接 loader 升级 ${a} → ${b}`);
115
+ } else if (cmp > 0) {
116
+ console.log(`[flow-comet] 桥接 loader 降级 ${a} → ${b}`);
117
+ } else {
118
+ console.log(`[flow-comet] 桥接 loader 版本一致(${a})`);
119
+ }
120
+ }
121
+
122
+ /**
123
+ * 极简 YAML 形状校验(零依赖——用于 cordis.patch.yml 的 fail-safe 判定):
124
+ * 文件须为顶层 YAML 列表形态(行形态:注释 / 空行 / 顶层 `- 条目` / 条目下缩进内容 / 文档分隔符),
125
+ * 无法识别(二进制、顶层 map 形态等)→ 返回 false——调用方据此 fail-safe 不覆盖(保护用户配置)。
126
+ */
127
+ function isSimpleYamlText(text) {
128
+ return text.split(/\r?\n/).every((line) => {
129
+ const t = line.trimEnd();
130
+ if (t.trim() === '') return true; // 空行
131
+ if (/^\s*#/.test(t)) return true; // 注释
132
+ if (/^\s*---\s*$/.test(t)) return true; // 文档分隔符
133
+ if (/^\s*-\s+\S/.test(t)) return true; // 顶层列表条目
134
+ if (/^\s+\S/.test(t)) return true; // 条目下缩进内容(键值/嵌套列表;YAML 允许 1 空格缩进)
135
+ return false;
136
+ });
137
+ }
138
+
139
+ /**
140
+ * 注入桥接 loader 托管块到 $DSH_HOME/cordis.patch.yml(dsh 平台 home patch——
141
+ * 读-合并-写,L-008 非破坏):
142
+ * 读现有 cordis.patch.yml(缺失 → 空)→ 移除旧托管块(幂等)→ 托管块内联 loader 的
143
+ * file:// 引用(**insert 形态**:无 id 的顶层 `- insert:` 条目内嵌插件行
144
+ * `- id: dsh-flow-comet-bridge` + `name: 'file:///<abs 路径>'`——dsh-app-boot 的
145
+ * applyEntryPatches 语义是 id-targeted patch(id 必须已存在于配置树);无 id 的
146
+ * `insert:` 顶层条目才执行 data.push 追加新插件行,是 home patch 新增插件的唯一正确形态;
147
+ * 旧的 `- id: ... + name:` patch 形态对不存在的 id 报 entry not found 并跳过——
148
+ * loader 从不加载 → 拦截整链静默失效)
149
+ * → 保留托管块外既有块(dsh-skin 等)→ 写回。
150
+ * fail-safe:文件存在但内容无法识别为 YAML → 抛错退出不覆盖(参照 injectSettingsHook 模式)。
151
+ */
152
+ export function injectDshCordisPatch(dshHome, loaderPath) {
153
+ const patchPath = path.join(dshHome, 'cordis.patch.yml');
154
+ let existing = '';
155
+ let fileExists = false;
156
+ try {
157
+ existing = fs.readFileSync(patchPath, 'utf8');
158
+ fileExists = true;
159
+ } catch { /* 文件缺失 = 首次安装 */ }
160
+ if (fileExists && !isSimpleYamlText(existing)) {
161
+ throw new Error(
162
+ `cordis.patch.yml 已存在但内容无法解析为 YAML(${patchPath})——为保护用户配置,中止注入。` +
163
+ `请修复该文件(顶层 YAML 列表形态)后重试,或手动添加桥接 loader 引用。`
164
+ );
165
+ }
166
+ const stripped = stripManagedBlock(existing, MANAGED_CORDIS_START, MANAGED_CORDIS_END);
167
+ const fileUrl = pathToFileURL(loaderPath).href;
168
+ const managedBlock =
169
+ MANAGED_CORDIS_START + '\n' +
170
+ '- insert:\n' +
171
+ ' - id: dsh-flow-comet-bridge\n' +
172
+ ` name: '${fileUrl.replace(/'/g, "''")}'\n` +
173
+ MANAGED_CORDIS_END + '\n';
174
+ const merged = (stripped.trim() ? stripped.trim() + '\n\n' : '') + managedBlock;
175
+ fs.mkdirSync(dshHome, { recursive: true });
176
+ fs.writeFileSync(patchPath, merged, 'utf8');
177
+ return merged;
178
+ }
179
+
180
+ /**
181
+ * 移除 $DSH_HOME/cordis.patch.yml 中的托管块(purge 语义:移除而非注入——保留 dsh-skin
182
+ * 等既有块与用户内容)。文件缺失 → 跳过;内容无法识别为 YAML → 不动(fail-safe 保护
183
+ * 用户配置)。移除后文件为空 → 删除文件本身。返回删除清单条目(供 purge 打印)。
184
+ */
185
+ export function removeDshCordisPatch(dshHome) {
186
+ const patchPath = path.join(dshHome, 'cordis.patch.yml');
187
+ const removed = [];
188
+ if (!fs.existsSync(patchPath)) return removed;
189
+ let content;
190
+ try {
191
+ content = fs.readFileSync(patchPath, 'utf8');
192
+ } catch { return removed; }
193
+ if (!content.includes(MANAGED_CORDIS_START)) return removed;
194
+ if (!isSimpleYamlText(content)) {
195
+ // 无法识别 → 不触碰(fail-safe 语义与注入一致——保护用户配置)
196
+ return removed;
197
+ }
198
+ const stripped = stripManagedBlock(content, MANAGED_CORDIS_START, MANAGED_CORDIS_END);
199
+ const trimmed = stripped.trim();
200
+ if (trimmed) {
201
+ fs.writeFileSync(patchPath, trimmed + '\n', 'utf8');
202
+ } else {
203
+ fs.rmSync(patchPath, { force: true });
204
+ }
205
+ removed.push(patchPath + '(托管块)');
206
+ return removed;
207
+ }
208
+
209
+ function escapeRegExp(value) {
210
+ return String(value).replace(/[|\\{}()[\]^$+?.]/g, '\\$&');
211
+ }
212
+
213
+ // 移除托管块(幂等替换边界):start 标记到 end 标记(含尾随换行)之间的全部内容。
214
+ // 注入与清理共用——AGENTS.md 托管区 / cordis.patch.yml 托管块(L-008 读-合并-写)。
215
+ export function stripManagedBlock(content, startMarker, endMarker) {
216
+ return content.replace(
217
+ new RegExp(escapeRegExp(startMarker) + '[\\s\\S]*?' + escapeRegExp(endMarker) + '\\n?'),
218
+ ''
219
+ );
220
+ }