flow-comet 1.6.5 → 1.8.0
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 +32 -18
- package/.flow-comet/skills/flow-comet/reference/commit-discipline.md +2 -2
- package/.flow-comet/skills/flow-comet/reference/decision-points.md +5 -5
- package/.flow-comet/skills/flow-comet/reference/dirty-worktree.md +1 -1
- package/.flow-comet/skills/flow-comet/reference/entry-detail.md +30 -11
- package/.flow-comet/skills/flow-comet/reference/fix-loop.md +4 -4
- package/.flow-comet/skills/flow-comet/reference/init-detection.md +1 -1
- package/.flow-comet/skills/flow-comet/reference/platform-facts.md +2 -2
- package/.flow-comet/skills/flow-comet/reference/post-archive-handoff.md +264 -0
- package/.flow-comet/skills/flow-comet/reference/recovery.md +1 -1
- package/.flow-comet/skills/flow-comet/reference/replan.md +1 -1
- package/.flow-comet/skills/flow-comet/scripts/comet-check.mjs +1 -0
- package/.flow-comet/skills/flow-comet/scripts/comet-hook-guard.mjs +270 -30
- package/.flow-comet/skills/flow-comet/scripts/context-init.mjs +26 -23
- package/.flow-comet/skills/flow-comet/scripts/guard-self-test.mjs +14 -94
- package/.flow-comet/skills/flow-comet/scripts/items/a.mjs +122 -11
- package/.flow-comet/skills/flow-comet/scripts/items/b.mjs +79 -40
- package/.flow-comet/skills/flow-comet/scripts/items/c.mjs +11 -9
- package/.flow-comet/skills/flow-comet/scripts/items/e.mjs +52 -10
- package/.flow-comet/skills/flow-comet/scripts/items/f.mjs +1 -1
- package/.flow-comet/skills/flow-comet/scripts/items/h.mjs +128 -56
- package/.flow-comet/skills/flow-comet/scripts/items/k.mjs +357 -3
- package/.flow-comet/skills/flow-comet/scripts/items/l.mjs +26 -1
- package/.flow-comet/skills/flow-comet/scripts/items/m.mjs +6 -2
- package/.flow-comet/skills/flow-comet/scripts/items/n.mjs +29 -21
- package/.flow-comet/skills/flow-comet/scripts/lib/ac-coverage.mjs +317 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/fix-loop-node.mjs +4 -15
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-artifact-skeleton.mjs +47 -5
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-evidence-gates.mjs +357 -219
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-gates.mjs +725 -309
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-routing.mjs +182 -54
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-state-io.mjs +8 -6
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-template-fidelity.mjs +224 -83
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-uidesign.mjs +17 -28
- package/.flow-comet/skills/flow-comet/scripts/lib/lessons-hits.mjs +160 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/run-root.mjs +21 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/section-body.mjs +92 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-admin.mjs +61 -33
- package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-flow.mjs +663 -205
- package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-recovery.mjs +68 -9
- package/.flow-comet/skills/flow-comet/scripts/lib/state-determine.mjs +11 -4
- package/.flow-comet/skills/flow-comet/scripts/lib/state-explain.mjs +92 -13
- package/.flow-comet/skills/flow-comet/scripts/lib/state-io.mjs +232 -11
- package/.flow-comet/skills/flow-comet/scripts/lib/state-skillmarkers.mjs +140 -74
- package/.flow-comet/skills/flow-comet/scripts/lib/system-fixtures.mjs +8 -4
- package/.flow-comet/skills/flow-comet/scripts/lib/task-graph.mjs +84 -31
- package/.flow-comet/skills/flow-comet/scripts/lib/test-assertions.mjs +0 -3
- package/.flow-comet/skills/flow-comet/scripts/lib/test-fixtures.mjs +248 -24
- package/.flow-comet/skills/flow-comet/scripts/lib/test-helpers.mjs +63 -3
- package/.flow-comet/skills/flow-comet/scripts/lib/text-anchor-checks.mjs +181 -8
- package/.flow-comet/skills/flow-comet/scripts/lib/wave-projection.mjs +340 -0
- package/.flow-comet/skills/flow-comet/scripts/protocol-utils.mjs +132 -20
- package/.flow-comet/skills/flow-comet/scripts/route-node.mjs +12 -5
- package/.flow-comet/skills/flow-comet/scripts/scenarios/a.mjs +1564 -54
- package/.flow-comet/skills/flow-comet/scripts/scenarios/b.mjs +1489 -38
- package/.flow-comet/skills/flow-comet/scripts/scenarios/c.mjs +1466 -243
- package/.flow-comet/skills/flow-comet/scripts/scenarios/d.mjs +743 -24
- package/.flow-comet/skills/flow-comet/scripts/scenarios/e.mjs +220 -92
- package/.flow-comet/skills/flow-comet/scripts/scenarios/f.mjs +657 -21
- package/.flow-comet/skills/flow-comet/scripts/scenarios/g.mjs +41 -27
- package/.flow-comet/skills/flow-comet/scripts/scenarios/h.mjs +285 -9
- package/.flow-comet/skills/flow-comet/scripts/scenarios/i.mjs +7 -6
- package/.flow-comet/skills/flow-comet/scripts/scenarios/j.mjs +21 -15
- package/.flow-comet/skills/flow-comet/scripts/scenarios/k.mjs +8 -5
- package/.flow-comet/skills/flow-comet/scripts/scenarios/l.mjs +45 -36
- package/.flow-comet/skills/flow-comet/scripts/scenarios/m.mjs +2 -2
- package/.flow-comet/skills/flow-comet/scripts/scenarios/n.mjs +2381 -85
- package/.flow-comet/skills/flow-comet/scripts/state-schema.mjs +135 -2
- package/.flow-comet/skills/flow-comet/scripts/workflow-guard.mjs +143 -16
- package/.flow-comet/skills/flow-comet/scripts/workflow-handoff.mjs +339 -103
- package/.flow-comet/skills/flow-comet/scripts/workflow-state.mjs +5 -2
- package/.flow-comet/skills/flow-comet-archive/SKILL.md +33 -11
- package/.flow-comet/skills/flow-comet-change/SKILL.md +1 -1
- package/.flow-comet/skills/flow-comet-design/SKILL.md +5 -3
- package/.flow-comet/skills/flow-comet-dev/SKILL.md +2 -2
- package/.flow-comet/skills/flow-comet-execute/SKILL.md +37 -13
- package/.flow-comet/skills/flow-comet-integration/SKILL.md +10 -4
- package/.flow-comet/skills/flow-comet-plan/GUIDANCE.md +1 -1
- package/.flow-comet/skills/flow-comet-plan/SKILL.md +13 -6
- package/.flow-comet/skills/flow-comet-review/SKILL.md +21 -12
- package/.flow-comet/skills/flow-comet-subagent-execute/GUIDANCE.md +1 -1
- package/.flow-comet/skills/flow-comet-subagent-execute/SKILL.md +43 -18
- package/.flow-comet/skills/flow-comet-task/SKILL.md +4 -2
- package/.flow-comet/skills/flow-comet-ui-design/SKILL.md +2 -2
- package/.flow-comet/skills/flow-comet-verify/SKILL.md +1 -1
- package/README.md +2 -2
- package/package.json +1 -1
- package/scripts/dsh-bridge.mjs +238 -21
package/scripts/dsh-bridge.mjs
CHANGED
|
@@ -28,6 +28,13 @@
|
|
|
28
28
|
// 6. 决策映射:exit 0 → next() 放行;exit 2 → deny(BLOCK 消息 + 恢复指引
|
|
29
29
|
// 透传);其它/异常 → fail-closed deny + WARN。
|
|
30
30
|
//
|
|
31
|
+
// 0.2.2 / dsh-ops 适配(2026-11-06):
|
|
32
|
+
// - dsh-ops 0.5.0 用独立工具名暴露写入面(ops_write_file/ops_edit_file/ops_bash),
|
|
33
|
+
// 本桥接同样归一化到 Write/Edit/Bash;OPS 单目标(copy/move/remove)映射为 Write,
|
|
34
|
+
// 多目标(replace/batch)运行中按组拒绝;
|
|
35
|
+
// - PTC run_code 进程内的 node:fs 写不经过 tools/pre-execute:默认放行(已记录边界),
|
|
36
|
+
// 不做隐藏开关,空闲与运行中一致。
|
|
37
|
+
//
|
|
31
38
|
// 明确不做的(旧 dsh 插件功能废弃):
|
|
32
39
|
// - 不注册 fs/write-intent 槽位(single-slot 守卫瀑布无 deny 面,
|
|
33
40
|
// 不 shadow 官方 dsh-fs-observation-policy);
|
|
@@ -38,7 +45,7 @@
|
|
|
38
45
|
// 纯 ESM、零第三方依赖,仅使用 Node.js 内置模块。dsh 官方插件形态:
|
|
39
46
|
// ESM 模块导出 { name, apply },ctx 由 dsh 注入。
|
|
40
47
|
//
|
|
41
|
-
// BRIDGE_VERSION: 1.
|
|
48
|
+
// BRIDGE_VERSION: 1.8.0
|
|
42
49
|
|
|
43
50
|
import { spawn } from 'node:child_process';
|
|
44
51
|
import { existsSync, readFileSync, realpathSync } from 'node:fs';
|
|
@@ -50,7 +57,7 @@ import path from 'node:path';
|
|
|
50
57
|
// 值语义 = 当前发布版本(随发布同步更新,与技能包 INSTALLED_VERSION 同值——
|
|
51
58
|
// bridge-check 的版本一致性检查据此判定 loader 与项目副本同版)。
|
|
52
59
|
export const name = 'dsh-flow-comet-bridge';
|
|
53
|
-
export const version = '1.
|
|
60
|
+
export const version = '1.8.0';
|
|
54
61
|
|
|
55
62
|
// guard 在项目内的相对路径常量(随 skill 包分发)。
|
|
56
63
|
const HOOK_GUARD_REL = '.dsh/skills/flow-comet/scripts/comet-hook-guard.mjs';
|
|
@@ -67,6 +74,15 @@ export function normalizeToolName(toolName) {
|
|
|
67
74
|
const lower = toolName.toLowerCase();
|
|
68
75
|
if (lower === 'write' || lower === 'writefile' || lower === 'file-write') return 'Write';
|
|
69
76
|
if (lower === 'edit' || lower === 'editfile' || lower === 'file-edit') return 'Edit';
|
|
77
|
+
// dsh-ops(0.5.0)用独立工具名暴露写入面:官方 write/edit/bash/pwsh 之外
|
|
78
|
+
// 必须同样归一化,否则在启用 dsh-ops 的桌面(hidePwsh + 动态工具)上
|
|
79
|
+
// 写入绕过白名单 = fail-open。ops_write_file/ops_edit_file 用 `path`,
|
|
80
|
+
// mapToolInput 已接受 args.path;ops_bash 的 command 形态直接映射,
|
|
81
|
+
// script_path 形态在 apply 第 4 步跳过形状映射,由第 4.6 步默认放行
|
|
82
|
+
// (脚本体不在命令文本里,共享解析器非 bash 专用)。
|
|
83
|
+
if (lower === 'ops_write_file') return 'Write';
|
|
84
|
+
if (lower === 'ops_edit_file') return 'Edit';
|
|
85
|
+
if (lower === 'ops_bash') return 'Bash';
|
|
70
86
|
// Bash 写命令拦截必须覆盖 Windows 默认 PowerShell 工具形态——dsh 注册名为
|
|
71
87
|
// 'pwsh'(dsh-tool-pwsh 源码实证),缺失会 canonicalName=null → next() 放行,
|
|
72
88
|
// 模型用 Set-Content 等 PowerShell 写命令即可绕过整链拦截(fail-open 缺口)。
|
|
@@ -83,6 +99,62 @@ export function normalizeToolName(toolName) {
|
|
|
83
99
|
return null;
|
|
84
100
|
}
|
|
85
101
|
|
|
102
|
+
// dsh-ops 文件类工具:copy/move 的写目标是 `to`、remove 是 `path`,三者按 Write
|
|
103
|
+
// 映射(move 的源端 path 另判一次);replace/batch 才是真多目标,运行态按组拒绝。
|
|
104
|
+
// 空闲态由流程态门放行。
|
|
105
|
+
const OPS_FILE_OPERATION_TOOLS = new Set([
|
|
106
|
+
'ops_copy',
|
|
107
|
+
'ops_move',
|
|
108
|
+
'ops_remove',
|
|
109
|
+
'ops_replace',
|
|
110
|
+
'ops_batch',
|
|
111
|
+
]);
|
|
112
|
+
|
|
113
|
+
export function isOpsFileOperationTool(toolName) {
|
|
114
|
+
if (typeof toolName !== 'string') return false;
|
|
115
|
+
return OPS_FILE_OPERATION_TOOLS.has(toolName.toLowerCase());
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
// copy/move 的目标是 `to`、remove 的目标是 `path`(schema 已确定);这三者可按单目标
|
|
119
|
+
// 交给 Write 判定,只有 replace/batch 才是真多目标、保留组拒绝。
|
|
120
|
+
const OPS_SINGLE_TARGET_TOOLS = new Set(['ops_copy', 'ops_move', 'ops_remove']);
|
|
121
|
+
|
|
122
|
+
export function isSingleTargetOpsFileTool(toolName) {
|
|
123
|
+
if (typeof toolName !== 'string') return false;
|
|
124
|
+
return OPS_SINGLE_TARGET_TOOLS.has(toolName.toLowerCase());
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
export function mapSingleTargetOpsFileTool(toolName, args) {
|
|
128
|
+
if (!args || typeof args !== 'object' || Array.isArray(args)) {
|
|
129
|
+
return { ok: false, reason: '工具参数缺失或非对象' };
|
|
130
|
+
}
|
|
131
|
+
const raw = toolName.toLowerCase() === 'ops_remove' ? args.path : args.to;
|
|
132
|
+
if (typeof raw !== 'string' || raw.trim() === '') {
|
|
133
|
+
return { ok: false, reason: toolName + ' 缺少目标路径' };
|
|
134
|
+
}
|
|
135
|
+
return { ok: true, target: raw, input: { file_path: raw } };
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
// ops_move 有两个写面:源端 path 被 unlink(删除/移动),目的端 to 被写入。
|
|
139
|
+
// 单目标映射只拿 to 会漏掉源端(可移走 state/协议/源码),所以源端单独取 path,
|
|
140
|
+
// 由调用方按 Write 语义再判一次。
|
|
141
|
+
export function mapOpsMoveSource(args) {
|
|
142
|
+
if (!args || typeof args !== 'object' || Array.isArray(args)) {
|
|
143
|
+
return { ok: false, reason: 'ops_move 参数缺失或非对象' };
|
|
144
|
+
}
|
|
145
|
+
if (typeof args.path !== 'string' || args.path.trim() === '') {
|
|
146
|
+
return { ok: false, reason: 'ops_move 缺少源路径' };
|
|
147
|
+
}
|
|
148
|
+
return { ok: true, target: args.path, input: { file_path: args.path } };
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
// PTC transport:run_code 进程内可直接写文件,桥接只看到外层调用——这是已记录边界。
|
|
152
|
+
// 默认放行(PTC 是主要使用方式,拒绝会冻死流程);host 工具子调用仍逐个经过
|
|
153
|
+
// tools/pre-execute 判定。没有隐藏的严格模式开关。
|
|
154
|
+
export function isPtcTransport(toolName) {
|
|
155
|
+
return typeof toolName === 'string' && toolName.toLowerCase() === 'run_code';
|
|
156
|
+
}
|
|
157
|
+
|
|
86
158
|
// 参数映射:归一化工具名 + 工具参数 -> guard 契约输入。
|
|
87
159
|
// 形状不符/缺关键字段 -> { ok: false, reason }(fail-closed,不静默放行)。
|
|
88
160
|
export function mapToolInput(canonicalName, args) {
|
|
@@ -366,11 +438,32 @@ export function apply(ctx) {
|
|
|
366
438
|
// 内部异常(如 spawn 异常竞态下 child.stdin.end 抛 TypeError)→ WARN + fail-closed
|
|
367
439
|
// deny——不静默、不挂起、不放行(监听器未捕获异常对 dsh 未定义,可能挂起或 fail-open)。
|
|
368
440
|
try {
|
|
369
|
-
// 1. 工具名归一化:非 Write/Edit/Bash
|
|
370
|
-
|
|
371
|
-
|
|
441
|
+
// 1. 工具名归一化:非 Write/Edit/Bash 且非受控例外不处理(放行)。
|
|
442
|
+
// 受控例外:
|
|
443
|
+
// - PTC transport(run_code):默认放行(进程内直写是已记录边界);
|
|
444
|
+
// - OPS 单目标工具(copy/move/remove):目标确定,映射为 Write 交给 guard;
|
|
445
|
+
// - OPS 多目标工具(replace/batch):运行中按组拒绝。
|
|
446
|
+
const toolName = typeof exec?.name === 'string' ? exec.name : '';
|
|
447
|
+
const canonicalName = normalizeToolName(toolName);
|
|
448
|
+
const ptcTransport = isPtcTransport(toolName);
|
|
449
|
+
const opsFileOperation = isOpsFileOperationTool(toolName);
|
|
450
|
+
const singleTargetOps = isSingleTargetOpsFileTool(toolName);
|
|
451
|
+
if (!canonicalName && !ptcTransport && !opsFileOperation && !singleTargetOps) {
|
|
372
452
|
return next();
|
|
373
453
|
}
|
|
454
|
+
// ops_bash 的 script_path 形态:命令体在文件里,mapToolInput 无法静态判定。
|
|
455
|
+
// 空闲态维持原行为(放行),运行态在第 4.6 步拒绝。
|
|
456
|
+
const args = exec?.arguments;
|
|
457
|
+
const scriptPathOnly =
|
|
458
|
+
canonicalName === 'Bash' &&
|
|
459
|
+
args &&
|
|
460
|
+
typeof args === 'object' &&
|
|
461
|
+
!Array.isArray(args) &&
|
|
462
|
+
typeof args.script_path === 'string' &&
|
|
463
|
+
args.script_path.trim() !== '' &&
|
|
464
|
+
!(typeof args.command === 'string' && args.command.trim() !== '') &&
|
|
465
|
+
!(typeof args.cmd === 'string' && args.cmd.trim() !== '') &&
|
|
466
|
+
!(typeof args.script === 'string' && args.script.trim() !== '');
|
|
374
467
|
|
|
375
468
|
// 2. 会话 cwd:无法确定 -> next()(窄监听 fail-open 于非判定场景)。
|
|
376
469
|
const cwd = sessionCwd(exec);
|
|
@@ -388,18 +481,47 @@ export function apply(ctx) {
|
|
|
388
481
|
return next();
|
|
389
482
|
}
|
|
390
483
|
|
|
391
|
-
//
|
|
392
|
-
//
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
484
|
+
// 3.5 身份信号先于路径判据(ADR-014 决策 2):下面的 workdir 拒绝与多目标组拒绝
|
|
485
|
+
// 只作用于协调者(agentDepth === 0)。子代理是执行者,这些拒绝若前置于身份判定,
|
|
486
|
+
// 会让运行中的流程失去 ops_replace / ops_batch 等执行工具。
|
|
487
|
+
const agentDepthValue = agentDepth(exec);
|
|
488
|
+
const isCoordinator = agentDepthValue === 0;
|
|
489
|
+
|
|
490
|
+
// 3.6 Bash 类工具的绝对 workdir 在项目根外:相对写入的真实落点与 guard 按项目根
|
|
491
|
+
// 解析的结果不一致(实测 fail-open)。按工具语义(有 workdir)判定而不是按别名,
|
|
492
|
+
// 避免换工具名绕过;仅绝对路径、仅协调者、仅运行态(空闲由 4.5 放行)。
|
|
493
|
+
// 相对 workdir 与命令内 cd 是已记录边界,不在此处误拦。
|
|
494
|
+
let workdirOutsideProject = false;
|
|
495
|
+
if (
|
|
496
|
+
isCoordinator &&
|
|
497
|
+
canonicalName === 'Bash' &&
|
|
498
|
+
args &&
|
|
499
|
+
typeof args === 'object' &&
|
|
500
|
+
!Array.isArray(args) &&
|
|
501
|
+
typeof args.workdir === 'string' &&
|
|
502
|
+
args.workdir.trim() !== '' &&
|
|
503
|
+
path.isAbsolute(args.workdir)
|
|
504
|
+
) {
|
|
505
|
+
workdirOutsideProject = !isPathInsideProjectRoot(projectRoot, args.workdir);
|
|
506
|
+
}
|
|
507
|
+
|
|
508
|
+
// 4. 参数映射(仅 canonical 写工具 + OPS 单目标):形状不符/缺关键字段 ->
|
|
509
|
+
// WARN + fail-closed deny。D5:形状 fail-closed 任意态生效(含空闲态)。
|
|
510
|
+
let mapped = null;
|
|
511
|
+
if ((canonicalName && !scriptPathOnly) || singleTargetOps) {
|
|
512
|
+
mapped = canonicalName && !scriptPathOnly
|
|
513
|
+
? mapToolInput(canonicalName, exec?.arguments)
|
|
514
|
+
: mapSingleTargetOpsFileTool(toolName, exec?.arguments);
|
|
515
|
+
if (!mapped.ok) {
|
|
516
|
+
const reason =
|
|
517
|
+
'dsh-flow-comet-bridge: 工具 ' +
|
|
518
|
+
String(exec?.name) +
|
|
519
|
+
' 参数形状不符(' +
|
|
520
|
+
mapped.reason +
|
|
521
|
+
')——fail-closed 拒绝';
|
|
522
|
+
console.warn(reason);
|
|
523
|
+
return { kind: 'deny', reason };
|
|
524
|
+
}
|
|
403
525
|
}
|
|
404
526
|
|
|
405
527
|
// 4.5 流程态门(DESIGN D1/D2,2026-08-20)——修复 v1「包含性校验无条件生效」的
|
|
@@ -422,11 +544,59 @@ export function apply(ctx) {
|
|
|
422
544
|
console.warn(reason);
|
|
423
545
|
return { kind: 'deny', reason };
|
|
424
546
|
}
|
|
547
|
+
|
|
548
|
+
// 4.6 运行态的受控例外:
|
|
549
|
+
// - run_code:默认放行(进程内直写是已记录边界;host 子调用仍逐个判定);
|
|
550
|
+
// - ops_bash 的绝对 workdir 在项目根外:拒绝(fail-open 缓解;相对 workdir、
|
|
551
|
+
// 命令内 cd、官方 bash/pwsh 是已记录边界);
|
|
552
|
+
// - script_path:默认放行(脚本体不在命令文本里,共享解析器非 bash 专用);
|
|
553
|
+
// - replace/batch:真多目标,按组拒绝;copy/move/remove 已在第 4 步映射为 Write。
|
|
554
|
+
if (workdirOutsideProject) {
|
|
555
|
+
const reason =
|
|
556
|
+
'dsh-flow-comet-bridge: Bash 类工具(' +
|
|
557
|
+
toolName +
|
|
558
|
+
')的 workdir 解析到项目根之外,运行中无法保证写入目标与白名单判定一致——拒绝;请在项目内执行,或结束/归档当前流程';
|
|
559
|
+
console.warn(reason);
|
|
560
|
+
return { kind: 'deny', reason };
|
|
561
|
+
}
|
|
562
|
+
if (scriptPathOnly) {
|
|
563
|
+
// 协调者的 script_path 是两步绕过:先把脚本写进白名单目录(.specs/),再执行它
|
|
564
|
+
// 去写源码——脚本体不在命令文本里,共享解析器(codexWriteTargetsFromCommand)
|
|
565
|
+
// 并非 bash 专用,无法判定内容。运行中的协调者拒绝;子代理是执行者,放行。
|
|
566
|
+
if (isCoordinator) {
|
|
567
|
+
const reason =
|
|
568
|
+
'dsh-flow-comet-bridge: 运行中的协调者不能用 ops_bash 的 script_path(脚本体不在命令文本里,写入目标无法判定)——请改用 command 形式,或结束/归档当前流程';
|
|
569
|
+
console.warn(reason);
|
|
570
|
+
return { kind: 'deny', reason };
|
|
571
|
+
}
|
|
572
|
+
return next();
|
|
573
|
+
}
|
|
574
|
+
if (ptcTransport) {
|
|
575
|
+
// PTC 默认放行:它是主要使用方式;进程内直写是已记录边界。
|
|
576
|
+
// 不做隐藏开关;host 工具子调用仍逐个经过 tools/pre-execute 判定。
|
|
577
|
+
return next();
|
|
578
|
+
}
|
|
579
|
+
if (opsFileOperation && !singleTargetOps) {
|
|
580
|
+
// 只有 replace/batch 是真多目标;copy/move/remove 已在第 4 步映射为 Write。
|
|
581
|
+
// 协调者按组拒绝;子代理是执行者,identity 通道放行(最小保护集不覆盖这两个形态,
|
|
582
|
+
// 已在分发参考页记录)。
|
|
583
|
+
if (isCoordinator) {
|
|
584
|
+
const reason =
|
|
585
|
+
'dsh-flow-comet-bridge: OPS 多目标工具 "' +
|
|
586
|
+
toolName +
|
|
587
|
+
'" 在流程运行中的目标无法逐项判定,协调者按组拒绝——请在流程外执行,或结束/归档当前流程';
|
|
588
|
+
console.warn(reason);
|
|
589
|
+
return { kind: 'deny', reason };
|
|
590
|
+
}
|
|
591
|
+
return next();
|
|
592
|
+
}
|
|
425
593
|
// running(activeChange + status running/undefined):继续走既有第 5 步包含性校验、
|
|
426
594
|
// 5.5 身份信号透传、第 6 步 guard 判定(身份与保护集统一由守卫裁决)。
|
|
595
|
+
// OPS 单目标工具以 Write 的语义进入包含性校验与 guard。
|
|
596
|
+
const guardToolName = canonicalName || (singleTargetOps ? 'Write' : null);
|
|
427
597
|
|
|
428
598
|
// 5. 包含性校验(Write/Edit):越界直接 deny,不进 guard。
|
|
429
|
-
if (
|
|
599
|
+
if (guardToolName === 'Write' || guardToolName === 'Edit') {
|
|
430
600
|
if (!isPathInsideProjectRoot(projectRoot, mapped.target)) {
|
|
431
601
|
const reason =
|
|
432
602
|
'dsh-flow-comet-bridge: 写入目标 "' +
|
|
@@ -446,13 +616,40 @@ export function apply(ctx) {
|
|
|
446
616
|
mapped.input.file_path = normalizedTarget;
|
|
447
617
|
}
|
|
448
618
|
|
|
449
|
-
// 5.5 代理身份信号:agentDepth(exec) > 0 =
|
|
619
|
+
// 5.5 代理身份信号:agentDepth(exec) > 0 = 子代理(执行者,已在 3.5 读出)。桥接**不再短路**——
|
|
450
620
|
// 身份信号随守卫调用透传(env FLOW_COMET_AGENT_DEPTH + 通道标记
|
|
451
621
|
// FLOW_COMET_AGENT_DEPTH_SOURCE),身份判定与最小保护集
|
|
452
622
|
// 拦截的整条判据由守卫独占实现(「D9 实现位置修订」/ ADR-014 决策 5:保护集
|
|
453
623
|
// 判据不得出现第二份实现,L-067)。既有纪律保持:形状 fail-closed 与项目根
|
|
454
624
|
// 包含性校验在上方已执行——子代理也不得越界写项目根外 / 参数形状不符。
|
|
455
|
-
|
|
625
|
+
// 5.6 ops_move 的源端:path 会被 unlink,按 Write 语义单独判一次(目的端已在
|
|
626
|
+
// 上方按 to 判过)。先做包含性校验,再在 guard 存在时跑同一 guard。
|
|
627
|
+
let moveSource = null;
|
|
628
|
+
if (toolName.toLowerCase() === 'ops_move') {
|
|
629
|
+
const sourceMapped = mapOpsMoveSource(exec?.arguments);
|
|
630
|
+
if (!sourceMapped.ok) {
|
|
631
|
+
const reason =
|
|
632
|
+
'dsh-flow-comet-bridge: 工具 ops_move 参数形状不符(' +
|
|
633
|
+
sourceMapped.reason +
|
|
634
|
+
')——fail-closed 拒绝';
|
|
635
|
+
console.warn(reason);
|
|
636
|
+
return { kind: 'deny', reason };
|
|
637
|
+
}
|
|
638
|
+
if (!isPathInsideProjectRoot(projectRoot, sourceMapped.target)) {
|
|
639
|
+
const reason =
|
|
640
|
+
'dsh-flow-comet-bridge: ops_move 的源路径 "' +
|
|
641
|
+
sourceMapped.target +
|
|
642
|
+
'" 不在项目根 "' +
|
|
643
|
+
projectRoot +
|
|
644
|
+
'" 内——越界移动已拒绝,未进入 guard 判定';
|
|
645
|
+
console.warn(reason);
|
|
646
|
+
return { kind: 'deny', reason };
|
|
647
|
+
}
|
|
648
|
+
const normalizedSource = realpathExistingPath(path.resolve(projectRoot, sourceMapped.target));
|
|
649
|
+
sourceMapped.target = normalizedSource;
|
|
650
|
+
sourceMapped.input.file_path = normalizedSource;
|
|
651
|
+
moveSource = sourceMapped;
|
|
652
|
+
}
|
|
456
653
|
|
|
457
654
|
// 6. 项目本地 guard 调用。guard 文件缺失(安装未完成/被删除)-> WARN +
|
|
458
655
|
// next() 放行(不阻断非 flow-comet 语义);spawn 异常(ENOENT 等)->
|
|
@@ -466,9 +663,29 @@ export function apply(ctx) {
|
|
|
466
663
|
return next();
|
|
467
664
|
}
|
|
468
665
|
|
|
666
|
+
if (moveSource) {
|
|
667
|
+
const sourceDecision = await runGuard(
|
|
668
|
+
projectRoot,
|
|
669
|
+
'Write',
|
|
670
|
+
moveSource.input,
|
|
671
|
+
exec?.signal,
|
|
672
|
+
agentDepthValue,
|
|
673
|
+
);
|
|
674
|
+
if (sourceDecision.kind === 'deny') {
|
|
675
|
+
return { kind: 'deny', reason: sourceDecision.reason };
|
|
676
|
+
}
|
|
677
|
+
if (sourceDecision.kind !== 'allow') {
|
|
678
|
+
const reason =
|
|
679
|
+
'dsh-flow-comet-bridge: ops_move 源端判定失败(fail-closed 拒绝): ' +
|
|
680
|
+
sourceDecision.message;
|
|
681
|
+
console.warn(reason);
|
|
682
|
+
return { kind: 'deny', reason };
|
|
683
|
+
}
|
|
684
|
+
}
|
|
685
|
+
|
|
469
686
|
const decision = await runGuard(
|
|
470
687
|
projectRoot,
|
|
471
|
-
|
|
688
|
+
guardToolName,
|
|
472
689
|
mapped.input,
|
|
473
690
|
exec?.signal,
|
|
474
691
|
agentDepthValue,
|