flow-comet 1.6.2 → 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.
- package/.flow-comet/skills/flow-comet/INSTALLED_VERSION +1 -1
- package/.flow-comet/skills/flow-comet/SKILL.md +64 -46
- package/.flow-comet/skills/flow-comet/reference/KNOWN-ISSUES-template.md +1 -1
- package/.flow-comet/skills/flow-comet/reference/commit-discipline.md +32 -0
- package/.flow-comet/skills/flow-comet/reference/dirty-worktree.md +1 -1
- package/.flow-comet/skills/flow-comet/{GUIDANCE.md → reference/entry-detail.md} +18 -28
- package/.flow-comet/skills/flow-comet/reference/fix-loop.md +57 -0
- package/.flow-comet/skills/flow-comet/reference/platform-facts.md +58 -0
- package/.flow-comet/skills/flow-comet/reference/replan.md +23 -0
- package/.flow-comet/skills/flow-comet/scripts/comet-check.mjs +5 -4
- package/.flow-comet/skills/flow-comet/scripts/comet-hook-guard.mjs +266 -25
- package/.flow-comet/skills/flow-comet/scripts/context-init.mjs +2 -2
- package/.flow-comet/skills/flow-comet/scripts/evolve.mjs +6 -6
- package/.flow-comet/skills/flow-comet/scripts/guard-self-test.mjs +67 -16325
- package/.flow-comet/skills/flow-comet/scripts/health.mjs +1 -1
- package/.flow-comet/skills/flow-comet/scripts/items/a.mjs +1030 -0
- package/.flow-comet/skills/flow-comet/scripts/items/b.mjs +830 -0
- package/.flow-comet/skills/flow-comet/scripts/items/c.mjs +781 -0
- package/.flow-comet/skills/flow-comet/scripts/items/d.mjs +99 -0
- package/.flow-comet/skills/flow-comet/scripts/items/e.mjs +185 -0
- package/.flow-comet/skills/flow-comet/scripts/items/f.mjs +90 -0
- package/.flow-comet/skills/flow-comet/scripts/items/g.mjs +59 -0
- package/.flow-comet/skills/flow-comet/scripts/items/h.mjs +815 -0
- package/.flow-comet/skills/flow-comet/scripts/items/i.mjs +77 -0
- package/.flow-comet/skills/flow-comet/scripts/items/j.mjs +75 -0
- package/.flow-comet/skills/flow-comet/scripts/items/k.mjs +1427 -0
- package/.flow-comet/skills/flow-comet/scripts/items/l.mjs +275 -0
- package/.flow-comet/skills/flow-comet/scripts/items/m.mjs +614 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/count-derivation.mjs +97 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/fix-loop-node.mjs +196 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-evidence-gates.mjs +553 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-gates.mjs +837 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-routing.mjs +404 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-state-io.mjs +404 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-template-fidelity.mjs +302 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-uidesign.mjs +133 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/reentry-node.mjs +237 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/replan-node.mjs +209 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/state-branch.mjs +49 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/state-bridgecheck.mjs +201 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-admin.mjs +141 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-flow.mjs +700 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-recovery.mjs +578 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/state-determine.mjs +52 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/state-evolve-hint.mjs +55 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/state-explain.mjs +106 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/state-intelscan.mjs +58 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/state-io.mjs +147 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/state-skillmarkers.mjs +189 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/system-fixtures.mjs +1441 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/task-graph.mjs +471 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/test-assertions.mjs +509 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/test-fixtures.mjs +1228 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/test-helpers.mjs +237 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/text-anchor-checks.mjs +2484 -0
- package/.flow-comet/skills/flow-comet/scripts/protocol-utils.mjs +2 -2
- package/.flow-comet/skills/flow-comet/scripts/route-node.mjs +73 -1077
- package/.flow-comet/skills/flow-comet/scripts/scenarios/a.mjs +966 -0
- package/.flow-comet/skills/flow-comet/scripts/scenarios/b.mjs +1233 -0
- package/.flow-comet/skills/flow-comet/scripts/scenarios/c.mjs +1382 -0
- package/.flow-comet/skills/flow-comet/scripts/scenarios/d.mjs +483 -0
- package/.flow-comet/skills/flow-comet/scripts/scenarios/e.mjs +1388 -0
- package/.flow-comet/skills/flow-comet/scripts/scenarios/f.mjs +1466 -0
- package/.flow-comet/skills/flow-comet/scripts/scenarios/g.mjs +1364 -0
- package/.flow-comet/skills/flow-comet/scripts/scenarios/h.mjs +1287 -0
- package/.flow-comet/skills/flow-comet/scripts/scenarios/i.mjs +1436 -0
- package/.flow-comet/skills/flow-comet/scripts/scenarios/j.mjs +1384 -0
- package/.flow-comet/skills/flow-comet/scripts/scenarios/k.mjs +1338 -0
- package/.flow-comet/skills/flow-comet/scripts/scenarios/l.mjs +1484 -0
- package/.flow-comet/skills/flow-comet/scripts/scenarios/m.mjs +971 -0
- package/.flow-comet/skills/flow-comet/scripts/state-schema.mjs +14 -1
- package/.flow-comet/skills/flow-comet/scripts/system-test.mjs +58 -6692
- package/.flow-comet/skills/flow-comet/scripts/time-utils.mjs +4 -4
- package/.flow-comet/skills/flow-comet/scripts/workflow-guard.mjs +151 -2428
- package/.flow-comet/skills/flow-comet/scripts/workflow-handoff.mjs +116 -9
- package/.flow-comet/skills/flow-comet/scripts/workflow-state.mjs +29 -2086
- package/.flow-comet/skills/flow-comet-archive/SKILL.md +10 -19
- package/.flow-comet/skills/flow-comet-change/SKILL.md +2 -3
- package/.flow-comet/skills/flow-comet-compose/SKILL.md +1 -1
- package/.flow-comet/skills/flow-comet-design/SKILL.md +6 -6
- package/.flow-comet/skills/flow-comet-execute/SKILL.md +58 -16
- package/.flow-comet/skills/flow-comet-integration/SKILL.md +8 -5
- package/.flow-comet/skills/flow-comet-open/SKILL.md +5 -1
- package/.flow-comet/skills/flow-comet-plan/GUIDANCE.md +1 -1
- package/.flow-comet/skills/flow-comet-plan/SKILL.md +8 -8
- package/.flow-comet/skills/flow-comet-review/SKILL.md +9 -12
- package/.flow-comet/skills/flow-comet-subagent-execute/SKILL.md +59 -16
- package/.flow-comet/skills/flow-comet-task/SKILL.md +3 -2
- package/.flow-comet/skills/flow-comet-ui-design/SKILL.md +3 -3
- package/.flow-comet/skills/flow-comet-verify/SKILL.md +8 -17
- package/README.md +53 -70
- package/package.json +3 -2
- package/scripts/dsh-bridge.mjs +59 -26
- package/scripts/lib/installer-cleanup.mjs +152 -0
- package/scripts/lib/installer-flowkit.mjs +119 -0
- package/scripts/lib/installer-hooks.mjs +363 -0
- package/scripts/lib/installer-loader.mjs +220 -0
- package/scripts/lib/installer-migrate.mjs +236 -0
- package/scripts/lib/installer-platforms.mjs +314 -0
- package/scripts/prepare-env.mjs +36 -1164
- package/.flow-comet/skills/flow-comet/reference/TEST-MATRIX.md +0 -116
- package/.flow-comet/skills/flow-comet/reference/composition-report.md +0 -65
- package/.flow-comet/skills/flow-comet/reference/dsh-platform.md +0 -184
- package/.flow-comet/skills/flow-comet/reference/resolved-skills.json +0 -661
- package/.flow-comet/skills/flow-comet/reference/skill-review.md +0 -13
- package/.flow-comet/skills/flow-comet/reference/subagents/script-author.md +0 -7
- package/.flow-comet/skills/flow-comet/reference/worktree-notes.md +0 -70
package/scripts/dsh-bridge.mjs
CHANGED
|
@@ -16,6 +16,15 @@
|
|
|
16
16
|
// spawn cwd 必须 = 会话项目根(相对 file_path 按 cwd 解析——
|
|
17
17
|
// cwd≠项目根会 fail-open;不得以设 env 替代 cwd)。协议文件天然在
|
|
18
18
|
// 项目内(skill 包 reference/ 随树复制)——无需 FLOW_COMET_PROTOCOL 机制。
|
|
19
|
+
// 5.5 身份信号透传(「D9 实现位置修订」/ ADR-014 决策 5):spawn 时注入 env
|
|
20
|
+
// FLOW_COMET_AGENT_DEPTH = agentDepth(exec) 的数字字符串(0 = 协调者/缺失,
|
|
21
|
+
// 正整数 = 子代理)**并同时注入桥接通道标记 FLOW_COMET_AGENT_DEPTH_SOURCE =
|
|
22
|
+
// 'dsh-bridge'**(2026-10-07 作用域收紧):守卫要求标记与深度**同时在场**才接受
|
|
23
|
+
// env 面身份——CC / Codex 生成的 hook 直接调守卫、不经本桥接,即使继承了深度变量
|
|
24
|
+
// 也不得据此走子代理路径。标记由本文件唯一注入,守卫侧按同一字面判据读取。
|
|
25
|
+
// 身份判定与最小保护集的**整条判据由守卫独占实现**;
|
|
26
|
+
// 桥接只搬运信号,不判保护集、不复制白名单逻辑(L-067 单一权威)。
|
|
27
|
+
// 子代理因此不在桥接侧短路:一律过守卫(AC-20 豁免收窄)。
|
|
19
28
|
// 6. 决策映射:exit 0 → next() 放行;exit 2 → deny(BLOCK 消息 + 恢复指引
|
|
20
29
|
// 透传);其它/异常 → fail-closed deny + WARN。
|
|
21
30
|
//
|
|
@@ -23,12 +32,13 @@
|
|
|
23
32
|
// - 不注册 fs/write-intent 槽位(single-slot 守卫瀑布无 deny 面,
|
|
24
33
|
// 不 shadow 官方 dsh-fs-observation-policy);
|
|
25
34
|
// - 不做 fs/observed 审计(v1 极薄);
|
|
26
|
-
// - 不做技能注册/AGENTS.md
|
|
35
|
+
// - 不做技能注册/AGENTS.md 注入(安装器职责);
|
|
36
|
+
// - 不做身份 / 保护集判定(守卫是唯一判定实现——本文件只透传 depth 信号)。
|
|
27
37
|
//
|
|
28
38
|
// 纯 ESM、零第三方依赖,仅使用 Node.js 内置模块。dsh 官方插件形态:
|
|
29
39
|
// ESM 模块导出 { name, apply },ctx 由 dsh 注入。
|
|
30
40
|
//
|
|
31
|
-
// BRIDGE_VERSION: 1.6.
|
|
41
|
+
// BRIDGE_VERSION: 1.6.4
|
|
32
42
|
|
|
33
43
|
import { spawn } from 'node:child_process';
|
|
34
44
|
import { existsSync, readFileSync, realpathSync } from 'node:fs';
|
|
@@ -40,7 +50,7 @@ import path from 'node:path';
|
|
|
40
50
|
// 值语义 = 当前发布版本(随发布同步更新,与技能包 INSTALLED_VERSION 同值——
|
|
41
51
|
// bridge-check 的版本一致性检查据此判定 loader 与项目副本同版)。
|
|
42
52
|
export const name = 'dsh-flow-comet-bridge';
|
|
43
|
-
export const version = '1.6.
|
|
53
|
+
export const version = '1.6.4';
|
|
44
54
|
|
|
45
55
|
// guard 在项目内的相对路径常量(随 skill 包分发)。
|
|
46
56
|
const HOOK_GUARD_REL = '.dsh/skills/flow-comet/scripts/comet-hook-guard.mjs';
|
|
@@ -98,12 +108,16 @@ export function mapToolInput(canonicalName, args) {
|
|
|
98
108
|
|
|
99
109
|
// ---------------------------------------------------------------------------
|
|
100
110
|
// 项目根包含性:Write/Edit 的 file_path 必须解析后仍位于 projectRoot 内。
|
|
101
|
-
//
|
|
102
|
-
//
|
|
111
|
+
// 插件侧对越界路径直接 fail-closed deny 是**前置层**(该调用不进 guard 子进程),
|
|
112
|
+
// 不再是「补 guard fail-open」:guard 的写入目标解析已收敛为单一实现
|
|
113
|
+
// resolveWriteTarget(comet-hook-guard.mjs),越界返回 insideRunRoot=false /
|
|
114
|
+
// targetRel=null,「runRoot 外写入关断」与 Bash 分支同判拦截(ADR-014 决策 6)——
|
|
115
|
+
// 越界写不再静默放行。
|
|
103
116
|
// Windows 8.3 短路径(如 LONGYI~1)与长路径在词法上不同,直接 path.relative
|
|
104
|
-
//
|
|
105
|
-
//
|
|
106
|
-
//
|
|
117
|
+
// 会把项目内短路径误判为越界;该词法误判的失败方向现为 fail-closed(误 BLOCK),
|
|
118
|
+
// 不再是静默放行,故仍先 realpath 展开已存在部分再执行包含性判断(消误拦)。
|
|
119
|
+
// realpathSync.native:Windows 上 fs.realpathSync(libuv)不展开 8.3 短名,
|
|
120
|
+
// native 变体才会把 LONGYI~1 规范化为 LongYinHaHa(Windows 实证)。
|
|
107
121
|
// ---------------------------------------------------------------------------
|
|
108
122
|
export function realpathExistingPath(p) {
|
|
109
123
|
try {
|
|
@@ -222,12 +236,12 @@ export function sessionCwd(exec) {
|
|
|
222
236
|
return null;
|
|
223
237
|
}
|
|
224
238
|
|
|
225
|
-
//
|
|
239
|
+
// 代理身份读取(dsh 子代理=执行者):dsh 子代理 spawn/fork provider 的
|
|
226
240
|
// childSessionMeta 把 delegationDepth=parentDepth+1 写入子代理 session header
|
|
227
241
|
// (dsh-subagent 源码锚定,rc.6)——协调者=0/缺失,子代理>0。从 exec.agent.session
|
|
228
|
-
// 读取(与 sessionCwd
|
|
229
|
-
//
|
|
230
|
-
//
|
|
242
|
+
// 读取(与 sessionCwd 同级字段)。本纯函数只负责**取值与归一化**(非法值一律 0,
|
|
243
|
+
// fail-closed 语义);身份语义的判定在守卫侧(经 runGuard 以 env 透传),
|
|
244
|
+
// 桥接不自行裁决身份放行(L-067)。
|
|
231
245
|
export function agentDepth(exec) {
|
|
232
246
|
const depth = exec?.agent?.session?.header?.delegationDepth;
|
|
233
247
|
return typeof depth === 'number' && Number.isFinite(depth) && depth > 0 ? depth : 0;
|
|
@@ -274,8 +288,10 @@ export function mapGuardExit(code, stderr, stdout) {
|
|
|
274
288
|
|
|
275
289
|
// ---------------------------------------------------------------------------
|
|
276
290
|
// 判定核心子进程调用(stdin JSON {tool_name, tool_input} -> exit code)
|
|
291
|
+
// agentDepthValue = agentDepth(exec) 的归一化结果(0 = 协调者/缺失;正整数 = 子代理),
|
|
292
|
+
// 以 env FLOW_COMET_AGENT_DEPTH 透传给守卫——守卫侧与载荷 agent_id 归并为同一判据。
|
|
277
293
|
// ---------------------------------------------------------------------------
|
|
278
|
-
function runGuard(projectRoot, canonicalName, toolInput, signal) {
|
|
294
|
+
function runGuard(projectRoot, canonicalName, toolInput, signal, agentDepthValue) {
|
|
279
295
|
return new Promise((resolve) => {
|
|
280
296
|
const guardPath = resolveGuardPath(projectRoot);
|
|
281
297
|
const child = spawn(
|
|
@@ -288,6 +304,17 @@ function runGuard(projectRoot, canonicalName, toolInput, signal) {
|
|
|
288
304
|
stdio: ['pipe', 'pipe', 'pipe'],
|
|
289
305
|
windowsHide: true,
|
|
290
306
|
signal,
|
|
307
|
+
// 身份信号透传(「D9 实现位置修订」/ ADR-014 决策 5):depth 以数字字符串注入
|
|
308
|
+
// 子进程 env,由守卫与载荷 agent_id 归并为**同一判据**(守卫是身份与保护集的
|
|
309
|
+
// 唯一判定实现——桥接不复制保护集判定、不复制白名单逻辑,L-067)。
|
|
310
|
+
// 通道标记(2026-10-07 作用域收紧):与深度**成对**注入,作为「这次调用来自桥接」
|
|
311
|
+
// 的自证;守卫按精确等值校验——标记不在场时深度变量一律不作数(继承形态不成立)。
|
|
312
|
+
// 沿用既有 env 注入形态 {...process.env, VAR}(与 evolve.mjs 的协议 env 同形)。
|
|
313
|
+
env: {
|
|
314
|
+
...process.env,
|
|
315
|
+
FLOW_COMET_AGENT_DEPTH: String(agentDepthValue),
|
|
316
|
+
FLOW_COMET_AGENT_DEPTH_SOURCE: 'dsh-bridge',
|
|
317
|
+
},
|
|
291
318
|
},
|
|
292
319
|
);
|
|
293
320
|
let stdout = '';
|
|
@@ -396,7 +423,7 @@ export function apply(ctx) {
|
|
|
396
423
|
return { kind: 'deny', reason };
|
|
397
424
|
}
|
|
398
425
|
// running(activeChange + status running/undefined):继续走既有第 5 步包含性校验、
|
|
399
|
-
// 5.5
|
|
426
|
+
// 5.5 身份信号透传、第 6 步 guard 判定(身份与保护集统一由守卫裁决)。
|
|
400
427
|
|
|
401
428
|
// 5. 包含性校验(Write/Edit):越界直接 deny,不进 guard。
|
|
402
429
|
if (canonicalName === 'Write' || canonicalName === 'Edit') {
|
|
@@ -410,22 +437,22 @@ export function apply(ctx) {
|
|
|
410
437
|
console.warn(reason);
|
|
411
438
|
return { kind: 'deny', reason };
|
|
412
439
|
}
|
|
413
|
-
// 通过后传规范化长路径(realpath 展开 8.3 短路径)——guard
|
|
414
|
-
//
|
|
415
|
-
//
|
|
440
|
+
// 通过后传规范化长路径(realpath 展开 8.3 短路径)——guard 的写入目标解析
|
|
441
|
+
// resolveWriteTarget 只做词法 path.relative:短路径会被判为根外(targetRel=null),
|
|
442
|
+
// 失败方向是「runRoot 外写入关断」下的**误 BLOCK**(fail-closed),不再是
|
|
443
|
+
// target=null 跳过白名单判定的静默放行。
|
|
416
444
|
const normalizedTarget = realpathExistingPath(path.resolve(projectRoot, mapped.target));
|
|
417
445
|
mapped.target = normalizedTarget;
|
|
418
446
|
mapped.input.file_path = normalizedTarget;
|
|
419
447
|
}
|
|
420
448
|
|
|
421
|
-
// 5.5
|
|
422
|
-
//
|
|
423
|
-
//
|
|
424
|
-
//
|
|
425
|
-
//
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
}
|
|
449
|
+
// 5.5 代理身份信号:agentDepth(exec) > 0 = 子代理(执行者)。桥接**不再短路**——
|
|
450
|
+
// 身份信号随守卫调用透传(env FLOW_COMET_AGENT_DEPTH + 通道标记
|
|
451
|
+
// FLOW_COMET_AGENT_DEPTH_SOURCE),身份判定与最小保护集
|
|
452
|
+
// 拦截的整条判据由守卫独占实现(「D9 实现位置修订」/ ADR-014 决策 5:保护集
|
|
453
|
+
// 判据不得出现第二份实现,L-067)。既有纪律保持:形状 fail-closed 与项目根
|
|
454
|
+
// 包含性校验在上方已执行——子代理也不得越界写项目根外 / 参数形状不符。
|
|
455
|
+
const agentDepthValue = agentDepth(exec);
|
|
429
456
|
|
|
430
457
|
// 6. 项目本地 guard 调用。guard 文件缺失(安装未完成/被删除)-> WARN +
|
|
431
458
|
// next() 放行(不阻断非 flow-comet 语义);spawn 异常(ENOENT 等)->
|
|
@@ -439,7 +466,13 @@ export function apply(ctx) {
|
|
|
439
466
|
return next();
|
|
440
467
|
}
|
|
441
468
|
|
|
442
|
-
const decision = await runGuard(
|
|
469
|
+
const decision = await runGuard(
|
|
470
|
+
projectRoot,
|
|
471
|
+
canonicalName,
|
|
472
|
+
mapped.input,
|
|
473
|
+
exec?.signal,
|
|
474
|
+
agentDepthValue,
|
|
475
|
+
);
|
|
443
476
|
if (decision.kind === 'allow') {
|
|
444
477
|
return next();
|
|
445
478
|
}
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* installer-cleanup.mjs — 生成物镜像目录的定向清理(升级路径残留)
|
|
3
|
+
*
|
|
4
|
+
* 为什么清理独立成模块:判据只有一条——「权威源同一相对路径上不存在同类型条目」,而删除面
|
|
5
|
+
* 必须与本次整树复制的目标根严格对应。每一条 fail-closed(镜像根是链接不跟随 / 真实路径越出
|
|
6
|
+
* 项目根不删 / 符号链接不跟随 / 类型冲突不删 / 清理后仍非空不删)都是**不可放宽**的安全边界:
|
|
7
|
+
* 放宽任何一条,删除动作就可能落到项目之外、或落到用户自有文件上。把它与入口的 CLI / 编排
|
|
8
|
+
* 分开,是为了让「哪些路径允许删」只有一处、可单独审查与测试。
|
|
9
|
+
*
|
|
10
|
+
* 依赖方向:本模块依赖 installer-migrate 的探测原语(lstatIfExists / readdirIfExists——
|
|
11
|
+
* 「该路径确实不存在」的单一判定);反向依赖不存在。
|
|
12
|
+
*/
|
|
13
|
+
import fs from 'node:fs';
|
|
14
|
+
import path from 'node:path';
|
|
15
|
+
|
|
16
|
+
import { lstatIfExists, readdirIfExists } from './installer-migrate.mjs';
|
|
17
|
+
|
|
18
|
+
// ---------- 生成物镜像目录的定向清理(升级路径残留) ----------
|
|
19
|
+
//
|
|
20
|
+
// 缺陷形态(实测):copyTree 只覆盖、不删除 ⇒ 权威源里已删除或改名的文件在已有副本里永久残留。
|
|
21
|
+
// 一次改名 + 一次移出即可在三平台副本各留 8 条残留,且残留会让安装副本跑自身回归套件报
|
|
22
|
+
// 308/309(失败项的失败信息逐条指向残留文件),而权威源同一命令 309/309——落差纯由残留造成。
|
|
23
|
+
//
|
|
24
|
+
// 镜像白名单(唯一允许删除的路径集合,逐条由本次生成动作定义):本次真实 copyTree 的目标根
|
|
25
|
+
// `<skillRoot>/<name>`,其中 <name> ∈ 权威源 `skills/` 下的 `flow-comet*` 目录清单。
|
|
26
|
+
// 命名空间(flow-comet* 前缀)与安装位置(平台技能根)共同构成归属判据;白名单之外的一切路径
|
|
27
|
+
// **永不触碰**。两条 fail-closed 边界(不删,但必须可见):
|
|
28
|
+
// · 整个技能目录不在权威源清单里(`<skillRoot>/flow-comet-fork` 一类):安装器没有生成清单,
|
|
29
|
+
// 用户自建的同命名空间目录与「权威源已移除的技能」在结构上不可区分 ⇒ 归属不可判定,保留;
|
|
30
|
+
// 该形态由显式 `--purge` 处置。
|
|
31
|
+
// · `.claude/rules`(同为 copyTree 目标):路径不含命名空间,无法与用户自有规则文件区分 ⇒
|
|
32
|
+
// 不纳入删除面(同上,`--purge` 处置)。
|
|
33
|
+
//
|
|
34
|
+
// 删除判据只有一条:**权威源同一相对路径上不存在同类型条目**。fail-closed 情形逐条打印、绝不静默:
|
|
35
|
+
// · **镜像根自身**是符号链接/junction(不跟随、不删除——条目层检查拦不住根级穿越:根为链接时
|
|
36
|
+
// `readdirSync` 会跟随进链接目标,删除动作落在**项目之外**,而播报打印的是项目内的表象路径);
|
|
37
|
+
// · **镜像根的真实路径越出目标项目根**(realpath 包含性判据——根或其任一祖先段为链接时,
|
|
38
|
+
// 词法路径仍显示在项目内,只有解析后才能证否;无法证明「在项目内」一律不删);
|
|
39
|
+
// · 条目是符号链接(不跟随、不删除——防穿越到目标项目之外);
|
|
40
|
+
// · 权威源同路径在场但类型不同(文件 ↔ 目录):归属不可判定,留给复制阶段的既有语义;
|
|
41
|
+
// · 目录清理后仍非空(其中含非残留内容 = 用户文件)→ 只删残留子孙,目录本身保留。
|
|
42
|
+
// 幂等:重复运行零残留可删 ⇒ 零输出、零报错;删除动作逐条打印(输出可核对)。
|
|
43
|
+
/**
|
|
44
|
+
* realpath 解析:返回真实路径,**解析不出即 null**(路径不存在 / 悬空链接 / 权限或 IO 故障一视同仁)。
|
|
45
|
+
* 与 lstatIfExists「访问类故障原样抛出」的取舍不同——本函数只服务**删除前的包含性判据**,
|
|
46
|
+
* 调用方约定为 fail-closed(null ⇒ 不删并打印原因):解析不出就**证明不了**在项目内,
|
|
47
|
+
* 此时中止安装比静默放行危险,而静默放行又比不删危险。
|
|
48
|
+
* 优先 `realpathSync.native`:Windows 上 libuv 实现不展开 8.3 短名(实测 `LONGYI~1` 形态),
|
|
49
|
+
* 而词法形态不同的两侧直接比较会把项目内路径误判为越界——本仓既有同判据(dsh-bridge 的
|
|
50
|
+
* 包含性检查)已登记该平台事实,此处沿用同一取值口径(失败方向仍是 fail-closed:误判 = 不删)。
|
|
51
|
+
*/
|
|
52
|
+
function realpathOrNull(target) {
|
|
53
|
+
try {
|
|
54
|
+
return fs.realpathSync.native(target);
|
|
55
|
+
} catch {
|
|
56
|
+
return null;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/**
|
|
61
|
+
* 真实路径包含性:`target` 解析后的真实路径是否仍在 `root` 解析后的真实路径之内。
|
|
62
|
+
* 两侧都先 realpath——根或祖先段是链接时词法路径会骗人(Windows 8.3 短名 / 平台临时目录链接同理)。
|
|
63
|
+
* 任一解析失败 ⇒ false(fail-closed);`path.relative` 的 `..` 前缀与绝对路径都判越界。
|
|
64
|
+
*/
|
|
65
|
+
function isRealPathInside(target, root) {
|
|
66
|
+
const targetReal = realpathOrNull(target);
|
|
67
|
+
const rootReal = realpathOrNull(root);
|
|
68
|
+
if (targetReal === null || rootReal === null) return false;
|
|
69
|
+
const rel = path.relative(rootReal, targetReal);
|
|
70
|
+
return rel === '' || (rel !== '..' && !rel.startsWith('..' + path.sep) && !path.isAbsolute(rel));
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
function pruneMirrorEntries(srcRoot, dstRoot, report, projectRoot) {
|
|
74
|
+
// 根级 fail-closed(**进入递归/枚举之前**):镜像根自身是链接 ⇒ 不跟随;真实路径越出目标项目根
|
|
75
|
+
// ⇒ 不删。条目层的 entry.isSymbolicLink() 只覆盖根以下的条目,拦不住根级的符号链接/junction。
|
|
76
|
+
const rootStat = lstatIfExists(dstRoot);
|
|
77
|
+
if (rootStat === null) return; // 镜像根不在场(首次安装)——无残留可清
|
|
78
|
+
if (rootStat.isSymbolicLink()) {
|
|
79
|
+
report.skipped.push(`${dstRoot}(镜像根是符号链接/junction——不跟随、不删除,防穿越到目标项目之外)`);
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
if (!isRealPathInside(dstRoot, projectRoot)) {
|
|
83
|
+
report.skipped.push(`${dstRoot}(真实路径 ${realpathOrNull(dstRoot) || '无法解析'} 越出目标项目根 ${realpathOrNull(projectRoot) || '无法解析'}——归属不可判定,不删)`);
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
86
|
+
const entries = readdirIfExists(dstRoot);
|
|
87
|
+
if (entries === null) return; // TOCTOU:lstat 后、枚举前被移走——无残留可清(判定同 lstatIfExists 口径)
|
|
88
|
+
for (const entry of entries) {
|
|
89
|
+
const srcPath = path.join(srcRoot, entry.name);
|
|
90
|
+
const dstPath = path.join(dstRoot, entry.name);
|
|
91
|
+
if (entry.isSymbolicLink()) {
|
|
92
|
+
report.skipped.push(`${dstPath}(符号链接——不跟随、不删除)`);
|
|
93
|
+
continue;
|
|
94
|
+
}
|
|
95
|
+
const srcStat = lstatIfExists(srcPath);
|
|
96
|
+
const isDir = entry.isDirectory();
|
|
97
|
+
if (srcStat && isDir === srcStat.isDirectory()) {
|
|
98
|
+
// 权威源在场且同类型:目录递归下探,文件保留(内容由 copyTree 覆盖)
|
|
99
|
+
if (isDir) pruneMirrorEntries(srcPath, dstPath, report, projectRoot);
|
|
100
|
+
continue;
|
|
101
|
+
}
|
|
102
|
+
if (srcStat) {
|
|
103
|
+
report.skipped.push(`${dstPath}(权威源同路径类型不同——归属不可判定,不删)`);
|
|
104
|
+
continue;
|
|
105
|
+
}
|
|
106
|
+
if (isDir) {
|
|
107
|
+
// 权威源无该目录 ⇒ 其中全部条目都属残留:先递归清空,再连同目录本身移除
|
|
108
|
+
pruneMirrorEntries(srcPath, dstPath, report, projectRoot);
|
|
109
|
+
const left = readdirIfExists(dstPath);
|
|
110
|
+
if (left === null) continue; // 递归中已被移除(与其祖先同批)
|
|
111
|
+
if (left.length > 0) {
|
|
112
|
+
report.skipped.push(`${dstPath}(清理后仍非空——保留其中非残留内容)`);
|
|
113
|
+
continue;
|
|
114
|
+
}
|
|
115
|
+
fs.rmdirSync(dstPath);
|
|
116
|
+
report.removed.push(dstPath);
|
|
117
|
+
continue;
|
|
118
|
+
}
|
|
119
|
+
if (entry.isFile()) {
|
|
120
|
+
fs.rmSync(dstPath, { force: true });
|
|
121
|
+
report.removed.push(dstPath);
|
|
122
|
+
continue;
|
|
123
|
+
}
|
|
124
|
+
report.skipped.push(`${dstPath}(既非普通文件也非目录——不删)`);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
/**
|
|
129
|
+
* 平台镜像清理总入口:对本次安装的每个技能镜像根(`<skillRoot>/<name>` ← `skills/<name>`)
|
|
130
|
+
* 做定向清理,逐条打印结果。无残留时零输出(幂等可核对:重复运行不再打印清理项);
|
|
131
|
+
* fail-closed 保留项以警告逐条打印——保留是**可见的决定**,不是静默跳过。
|
|
132
|
+
* `projectRoot` = 本次安装的目标项目根:**删除面的包含性上界**(镜像根 realpath 必须落在其内,
|
|
133
|
+
* 见 pruneMirrorEntries 的根级判据)。
|
|
134
|
+
*/
|
|
135
|
+
export function cleanStaleMirrorEntries(skillsSrc, skillRoot, skillNames, projectRoot) {
|
|
136
|
+
const report = { removed: [], skipped: [] };
|
|
137
|
+
for (const name of skillNames) {
|
|
138
|
+
pruneMirrorEntries(path.join(skillsSrc, name), path.join(skillRoot, name), report, projectRoot);
|
|
139
|
+
}
|
|
140
|
+
if (report.removed.length > 0) {
|
|
141
|
+
console.log(`[flow-comet] 镜像清理: 已删除 ${report.removed.length} 项(权威源已不存在的生成物)`);
|
|
142
|
+
for (const p of report.removed) {
|
|
143
|
+
console.log(` - 已删除: ${p}`);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
if (report.skipped.length > 0) {
|
|
147
|
+
console.warn(`[flow-comet] 警告: 镜像清理保留 ${report.skipped.length} 项(fail-closed——无法判定归属即不删):`);
|
|
148
|
+
for (const p of report.skipped) {
|
|
149
|
+
console.warn(` - 保留: ${p}`);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* installer-flowkit.mjs — flow-kit 上游快照获取链路(prepare-env 的逻辑层模块)
|
|
3
|
+
*
|
|
4
|
+
* 非破坏是这条链路的全部要点:已存在的目录一律只读不动(只读 HEAD、只读 origin 判定归属),
|
|
5
|
+
* 归属不可确认即跳过并给手动指引;clone / checkout 的失败**不抛错**——外网故障不得绑架安装器
|
|
6
|
+
* 的其余职责(技能树、规则、hook 注入照常完成,进程照常 exit 0)。把这条链路独立成模块,是为
|
|
7
|
+
* 了让「什么情况下会改动用户目录」只有一个落点可审——答案必须是「只有目标不存在时」。
|
|
8
|
+
*
|
|
9
|
+
* 依赖方向:本模块是叶子(只用 node 内置模块与 git 命令)。
|
|
10
|
+
*/
|
|
11
|
+
import fs from 'node:fs';
|
|
12
|
+
import path from 'node:path';
|
|
13
|
+
import { execFileSync } from 'node:child_process';
|
|
14
|
+
|
|
15
|
+
// ---------- flow-kit 获取链路(ADR-008 / DESIGN D1~D6——平台无关,main 平台循环前调用一次) ----------
|
|
16
|
+
|
|
17
|
+
// 锁定点常量(D2):上游 github.com/rihebty/flow-kit 实测无 tag,commit 是唯一精确锚;
|
|
18
|
+
// 升级锁定点 = 显式修改此常量并记 CHANGELOG,不做自动跟随(2026-08-23 ls-remote 实测 == 上游 HEAD)。
|
|
19
|
+
const FLOW_KIT_UPSTREAM_URL = 'https://github.com/rihebty/flow-kit.git';
|
|
20
|
+
const FLOW_KIT_LOCKED_COMMIT = '9b5dda7206ae841230f118348d660ad8d0ae2830';
|
|
21
|
+
// git 网络调用统一超时(D5——沿用 resolveInstalledVersion 的 execFileSync timeout 先例风格)
|
|
22
|
+
const FLOW_KIT_GIT_TIMEOUT_MS = 60000;
|
|
23
|
+
// 摘要展示用短 sha 长度(git 短哈希惯例——单一来源,clone 成功/已有/指引三处引用)
|
|
24
|
+
const FLOW_KIT_SHORT_SHA_LEN = 7;
|
|
25
|
+
|
|
26
|
+
/** 提取 git 调用失败信息首行(execFileSync 错误消息含多行 stderr——警告只留首行) */
|
|
27
|
+
function gitErrorFirstLine(err) {
|
|
28
|
+
return String(err && err.message ? err.message : err).split('\n')[0].trim();
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/** 手动获取指引(clone/checkout 失败或目录非上游克隆时打印——含上游 URL 与目标路径;不抛错) */
|
|
32
|
+
function printFlowKitManualGuide(target) {
|
|
33
|
+
const flowKitDir = path.join(target, 'flow-kit');
|
|
34
|
+
console.warn(`[flow-comet] 手动获取指引: git clone ${FLOW_KIT_UPSTREAM_URL} "${flowKitDir}"`);
|
|
35
|
+
console.warn(`[flow-comet] 然后锁定快照: git -C "${flowKitDir}" checkout --detach ${FLOW_KIT_LOCKED_COMMIT.slice(0, FLOW_KIT_SHORT_SHA_LEN)}`);
|
|
36
|
+
console.warn('[flow-comet] 未获取 flow-kit 时技能协议引用悬空、guard 段名基准退化为内置 fallback——其余安装职责不受影响。');
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/**
|
|
40
|
+
* 归属判定(D3):origin remote URL 匹配上游——本地 config 读取,无网络。
|
|
41
|
+
* 兼容 https / ssh 形态与可选 .git 后缀;读取失败视为不匹配(保守落入"非上游克隆"分支,
|
|
42
|
+
* 绝不改动用户目录)。返回 'match' | 'mismatch' | 'unreadable'。
|
|
43
|
+
*/
|
|
44
|
+
function flowKitOriginStatus(flowKitDir) {
|
|
45
|
+
try {
|
|
46
|
+
const url = execFileSync(
|
|
47
|
+
'git',
|
|
48
|
+
['-C', flowKitDir, 'config', '--get', 'remote.origin.url'],
|
|
49
|
+
{ encoding: 'utf8', timeout: FLOW_KIT_GIT_TIMEOUT_MS }
|
|
50
|
+
).trim().replace(/\.git$/i, '').replace(/\/+$/, '');
|
|
51
|
+
return /github\.com[:/]rihebty\/flow-kit$/i.test(url) ? 'match' : 'mismatch';
|
|
52
|
+
} catch {
|
|
53
|
+
return 'unreadable';
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* 确保 <target>/flow-kit/ 就位(ADR-008 / DESIGN D1~D6——L-008 非破坏哲学:已存在路径一律只读不动):
|
|
59
|
+
* 路径 1 目标不存在 → execFileSync('git',…) 数组参数形态 clone 上游后 detached checkout 到锁定 commit;
|
|
60
|
+
* 路径 2 已存在且 .git 存在且 origin 匹配上游 → 只读 rev-parse HEAD 并输出与锁定点差异影响,绝不改动;
|
|
61
|
+
* 路径 3 已存在但不满足归属判定 → 摘要"非上游克隆,已跳过"+ 手动指引,不改动;
|
|
62
|
+
* 路径 4 clone/checkout 任一失败 → 警告 + 手动获取指引,**不抛错**(D5——外网故障不得绑架安装器
|
|
63
|
+
* 其余职责,进程照常 exit 0);各平台 purge 清单永不包含 flow-kit(D6,见 PLATFORMS 表头注释)。
|
|
64
|
+
*/
|
|
65
|
+
export function ensureFlowKit(target) {
|
|
66
|
+
const flowKitDir = path.join(target, 'flow-kit');
|
|
67
|
+
const shortLock = FLOW_KIT_LOCKED_COMMIT.slice(0, FLOW_KIT_SHORT_SHA_LEN);
|
|
68
|
+
if (!fs.existsSync(flowKitDir)) {
|
|
69
|
+
// 路径 1:目标缺失 → clone + detached checkout 到锁定 commit(D1/D2)
|
|
70
|
+
try {
|
|
71
|
+
execFileSync('git', ['clone', FLOW_KIT_UPSTREAM_URL, flowKitDir], {
|
|
72
|
+
encoding: 'utf8',
|
|
73
|
+
timeout: FLOW_KIT_GIT_TIMEOUT_MS,
|
|
74
|
+
});
|
|
75
|
+
execFileSync('git', ['-C', flowKitDir, 'checkout', '--detach', FLOW_KIT_LOCKED_COMMIT], {
|
|
76
|
+
encoding: 'utf8',
|
|
77
|
+
timeout: FLOW_KIT_GIT_TIMEOUT_MS,
|
|
78
|
+
});
|
|
79
|
+
console.log(`[flow-comet] 已获取 flow-kit(锁定 ${shortLock})`);
|
|
80
|
+
} catch (err) {
|
|
81
|
+
// 路径 4:clone/checkout 任一失败 → WARN + 手动指引,不抛错
|
|
82
|
+
console.warn(`[flow-comet] 警告: flow-kit 自动获取失败(${gitErrorFirstLine(err)})`);
|
|
83
|
+
printFlowKitManualGuide(target);
|
|
84
|
+
}
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
// 目录已存在 → 归属判定(D3:.git 存在 且 origin remote 匹配上游)
|
|
88
|
+
const hasDotGit = fs.existsSync(path.join(flowKitDir, '.git'));
|
|
89
|
+
const originStatus = hasDotGit ? flowKitOriginStatus(flowKitDir) : 'mismatch';
|
|
90
|
+
if (originStatus !== 'match') {
|
|
91
|
+
// 路径 3:同名非克隆目录(或 remote 无法确认归属)→ 跳过 + 指引,绝不改动
|
|
92
|
+
if (originStatus === 'unreadable') {
|
|
93
|
+
console.warn('[flow-comet] 警告: flow-kit 目录存在且含 .git,但 origin remote 读取失败——无法确认归属');
|
|
94
|
+
}
|
|
95
|
+
console.log('[flow-comet] 目录存在但非上游克隆,已跳过');
|
|
96
|
+
printFlowKitManualGuide(target);
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
// 路径 2:上游克隆 → 只读检测并输出差异影响(D4——绝不 fetch/checkout 改动用户克隆)
|
|
100
|
+
try {
|
|
101
|
+
const head = execFileSync('git', ['-C', flowKitDir, 'rev-parse', 'HEAD'], {
|
|
102
|
+
encoding: 'utf8',
|
|
103
|
+
timeout: FLOW_KIT_GIT_TIMEOUT_MS,
|
|
104
|
+
}).trim();
|
|
105
|
+
const shortHead = head.slice(0, FLOW_KIT_SHORT_SHA_LEN);
|
|
106
|
+
console.log(`[flow-comet] 已有 flow-kit(HEAD=${shortHead},推荐锁定点=${shortLock})`);
|
|
107
|
+
if (head === FLOW_KIT_LOCKED_COMMIT) {
|
|
108
|
+
console.log('[flow-comet] 当前 HEAD 与推荐锁定点一致。');
|
|
109
|
+
} else {
|
|
110
|
+
console.warn(
|
|
111
|
+
`[flow-comet] 差异影响: 当前 HEAD 与推荐锁定点不一致——guard 段名基准与协议引用可能偏离安装器锁定内容` +
|
|
112
|
+
`(安装器绝不改动已有克隆;如需对齐请手动执行 git -C "${flowKitDir}" fetch 后 checkout --detach ${shortLock})`
|
|
113
|
+
);
|
|
114
|
+
}
|
|
115
|
+
} catch (err) {
|
|
116
|
+
// HEAD 只读失败同样不改动、不中断安装(保守降级为警告)
|
|
117
|
+
console.warn(`[flow-comet] 警告: flow-kit HEAD 读取失败(${gitErrorFirstLine(err)}),已跳过比对`);
|
|
118
|
+
}
|
|
119
|
+
}
|