dsh-swarm-console 0.2.1 → 0.2.2

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.
@@ -1,177 +1,214 @@
1
- /**
2
- * D5/D6 · verify v1 的宿主无关核心。
3
- * 三工具的纯逻辑 + 卡片 act 的调用者判定,便于不装 DSH 就能单测。
4
- * 状态用进程内 Map(v1,不做持久化;D8 明确不做多阶段状态机)。
5
- */
6
- import { freezeContract } from './contract.js'
7
- import { makeEvidence, evidenceHash } from './evidence.js'
8
- import { decide } from './gate.js'
9
- import { runChecks } from './checks.js'
10
- import { loadPolicy, policyToChecks } from './policy.js'
11
-
12
- const contracts = new Map()
13
- const runs = new Map()
14
-
15
- /**
16
- * P0-4 · 运行状态键 = `${sessionId}:${contractId}`,隔离不同会话的同号契约。
17
- * sessionId 缺省 'default'(宿主拿不到时用)。
18
- */
19
- export function runKey(contractId, sessionId = 'default') {
20
- return `${sessionId}:${contractId}`
21
- }
22
-
23
- /** verify_contract:冻结契约,返回 id。 */
24
- export function verifyContract(input, store = contracts) {
25
- const c = freezeContract(input)
26
- store.set(c.id, { contract: c, frozenAt: c.frozenAt })
27
- return { contractId: c.id }
28
- }
29
-
30
- /**
31
- * verify_run:跑策略 → 三态判定。
32
- * H1 证据先于验收:evidence 缺失时不判 GREEN(gate 的 R1 已保证)。
33
- * policy runner 由调用方注入(composePolicy),这里只做编排与落盘。
34
- */
35
- export function verifyRun({ contractId, sessionId, evidenceInput, runPolicy, checkDeps, usePolicy }, store = contracts, runStore = runs) {
36
- const rk = runKey(contractId, sessionId)
37
- const entry = store.get(contractId)
38
- if (!entry) return { decision: 'RED', reasons: [`未知 contractId ${contractId}`], evidenceHash: '' }
39
-
40
- // 0.2.0 P0-3:显式要求用策略且未给 checks 时,按 policy 生成检查请求
41
- if (usePolicy === true && !evidenceInput && typeof runPolicy !== 'function') {
42
- const policy = loadPolicy(entry.contract.policyId || 'code-change')
43
- evidenceInput = { checks: policyToChecks(policy, entry.contract) }
44
- }
45
-
46
- // H1:既没有证据输入、也没有策略来产出证据 → 直接判 YELLOW,不伪造证据
47
- if (!evidenceInput && typeof runPolicy !== 'function') {
48
- const d = decide(entry.contract, { checks: [], artifacts: [] })
49
- const ev = makeEvidence({ contractId })
50
- const hash = evidenceHash(ev)
51
- runStore.set(rk, { decision: d.decision, at: new Date().toISOString(), evidenceHash: hash, missing: d.missing, reproCmd: d.reproCmd })
52
- return {
53
- decision: d.decision, reasons: d.reasons, evidenceHash: hash,
54
- missing: d.missing,
55
- ...(d.reproCmd ? { reproCmd: d.reproCmd } : {}),
56
- }
57
- }
58
-
59
- // 0.2.0:checks 是请求,由插件真实执行(模型自报 ok 被忽略并记 warning)
60
- const evidence = typeof runPolicy === 'function'
61
- ? runPolicy(entry.contract, evidenceInput)
62
- : (() => {
63
- const executed = runChecks(evidenceInput?.checks ?? [], checkDeps)
64
- return makeEvidence({
65
- contractId,
66
- ...evidenceInput,
67
- checks: executed.checks,
68
- warnings: [...(evidenceInput?.warnings ?? []), ...executed.warnings],
69
- })
70
- })()
71
-
72
- const d = decide(entry.contract, evidence)
73
- const hash = evidenceHash(evidence)
74
- runStore.set(rk, { decision: d.decision, at: new Date().toISOString(), evidenceHash: hash, missing: d.missing, reproCmd: d.reproCmd })
75
- return {
76
- decision: d.decision,
77
- reasons: d.reasons,
78
- evidenceHash: hash,
79
- missing: d.missing,
80
- ...(Array.isArray(evidence.warnings) && evidence.warnings.length > 0 ? { warnings: evidence.warnings } : {}),
81
- ...(d.reproCmd ? { reproCmd: d.reproCmd } : {}),
82
- }
83
- }
84
-
85
- /** verify_status:最近一次 decision 与时间。 */
86
- export function verifyStatus({ contractId, sessionId }, runStore = runs) {
87
- const r = runStore.get(runKey(contractId, sessionId))
88
- // 未知契约返回 known:false,不落进 GREEN/YELLOW/RED 三态(评审必改3)
89
- if (!r) return { known: false }
90
- return {
91
- known: true,
92
- decision: r.decision,
93
- at: r.at,
94
- ...(r.reproCmd ? { reproCmd: r.reproCmd } : {}),
95
- ...(Array.isArray(r.missing) && r.missing.length > 0 ? { missing: r.missing } : {}),
96
- ...(r.approved === true ? { approved: true, approvedAt: r.approvedAt } : {}),
97
- ...(r.stale === true ? { stale: true } : {}),
98
- }
99
- }
100
-
101
- /**
102
- * H3 · act() 的调用者守卫。
103
- * 非用户(subagent / 代码发起 / 无 session)→ refused + 记拒绝事件。
104
- * @returns {{status:'refused',reason}|null} null 表示允许继续
105
- */
106
- export function guardCaller(agent, record) {
107
- const origin = agent?.session?.header?.origin
108
- const fromAgent = origin === 'subagent' || agent?.fromAgent === true || agent?.origin === 'subagent'
109
- const live = agent && typeof agent === 'object' && !agent.disposed
110
- if (!live || fromAgent) {
111
- const reason = !live ? 'not-live-root' : 'agent-initiated-not-user'
112
- if (typeof record === 'function') {
113
- record(agent, { callId: agent?.callId ?? 'unknown', action: 'dsh-swarm-console/gate', phase: 'refused', data: { reason } })
114
- }
115
- return { status: 'refused', reason }
116
- }
117
- return null
118
- }
119
-
120
- /** 供测试隔离用的空 store。 */
121
- export function newStores() {
122
- return { contracts: new Map(), runs: new Map() }
123
- }
124
-
125
- // ── v1 放行入口:斜杠命令核心(宿主无关)─────────────────────────────
126
- // 命令只能由用户触发(斜杠命令不走模型工具),H3 由结构保证,不靠 act 守卫。
127
- // 状态与 verify 同源:契约在 contracts,最近决定在 runs,approved 也写回 runs。
128
-
129
- /** /gate-approve:非 GREEN 拒绝;证据过期拒绝;GREEN 记 approved 返回成功。 */
130
- export function gateApprove({ contractId, sessionId, expectedHash }, store = contracts, runStore = runs) {
131
- if (!store.has(contractId)) return { kind: 'error', text: `未知契约 ${contractId}` }
132
- const rk = runKey(contractId, sessionId)
133
- const r = runStore.get(rk)
134
- if (!r) return { kind: 'error', text: '尚无门禁决定,请先执行 verify_run' }
135
- if (r.decision !== 'GREEN') {
136
- return { kind: 'error', text: `非 GREEN 不可放行,请先 /gate-retry ${contractId}` }
137
- }
138
- // P0-4:evidenceHash 与最近一次 verify_run 不一致 → 证据已过期
139
- if (expectedHash !== undefined && r.evidenceHash !== expectedHash) {
140
- return { kind: 'error', text: '证据已过期,请重新 verify_run' }
141
- }
142
- runStore.set(rk, { ...r, approved: true, approvedAt: new Date().toISOString(), by: 'user', stale: false })
143
- return { kind: 'success', text: `契约 ${contractId} 已由用户放行(approved)` }
144
- }
145
-
146
- /** /gate-retry:空证据重算 → YELLOW;保留 approved 但置 stale、清 approvedAt。 */
147
- export function gateRetry({ contractId, sessionId }, store = contracts, runStore = runs) {
148
- if (!store.has(contractId)) return { kind: 'error', text: `未知契约 ${contractId}` }
149
- const rk = runKey(contractId, sessionId)
150
- const before = runStore.get(rk)
151
- const wasApproved = before?.approved === true
152
- const r = verifyRun({ contractId, sessionId, evidenceInput: undefined }, store, runStore)
153
- // verifyRun 覆盖了整条记录,把旧的 approved/stale 语义补回来
154
- const after = runStore.get(rk)
155
- if (wasApproved) runStore.set(rk, { ...after, approved: true, stale: true, approvedAt: undefined, by: before.by })
156
- else runStore.set(rk, { ...after, stale: true })
157
- const now = verifyStatus({ contractId, sessionId }, runStore)
158
- return {
159
- kind: 'success',
160
- text: `契约 ${contractId} 已重算:${r.decision} @ ${now.at}${wasApproved ? ' [stale](原放行已失效)' : ''}。需重新执行 verify_run 补证据后才可能转 GREEN。`,
161
- }
162
- }
163
-
164
- /** /gate-status:最近决定 + 时间 + 是否 approved / stale;未知契约 error。 */
165
- export function gateStatus({ contractId, sessionId }, store = contracts, runStore = runs) {
166
- if (!store.has(contractId)) return { kind: 'error', text: `未知契约 ${contractId}` }
167
- const r = runStore.get(runKey(contractId, sessionId))
168
- if (!r) return { kind: 'success', text: `契约 ${contractId} 尚无门禁决定` }
169
- const approved = r.approved === true
170
- const stale = r.stale === true
171
- const head = `契约 ${contractId}:最近决定 ${r.decision} @ ${r.at}${stale ? ' [stale]' : ''}${approved ? `;已由 ${r.by ?? 'user'} 放行${stale ? '(已过期)' : ` @ ${r.approvedAt}`}` : ';尚未放行'}`
172
- // H2 可见性:RED 必须把复现命令亮给用户,YELLOW 必须把缺失证据亮出来
173
- const extra = []
174
- if (r.reproCmd) extra.push(`复现:${r.reproCmd}`)
175
- if (Array.isArray(r.missing) && r.missing.length > 0) extra.push(`缺失证据:${r.missing.join(';')}`)
176
- return { kind: 'success', text: [head, ...extra].join('\n') }
177
- }
1
+ /**
2
+ * D5/D6 · verify v1 的宿主无关核心。
3
+ * 三工具的纯逻辑 + 卡片 act 的调用者判定,便于不装 DSH 就能单测。
4
+ * 状态用进程内 Map(v1,不做持久化;D8 明确不做多阶段状态机)。
5
+ */
6
+ import { freezeContract } from './contract.js'
7
+ import { makeEvidence, evidenceHash } from './evidence.js'
8
+ import { decide } from './gate.js'
9
+ import { runChecks } from './checks.js'
10
+ import { loadPolicy, policyToChecks } from './policy.js'
11
+
12
+ const contracts = new Map()
13
+ const runs = new Map()
14
+
15
+ /**
16
+ * P0-4 · 运行状态键 = `${sessionId}:${contractId}`,隔离不同会话的同号契约。
17
+ * sessionId 缺省 'default'(宿主拿不到时用)。
18
+ */
19
+ export function runKey(contractId, sessionId = 'default') {
20
+ return `${sessionId}:${contractId}`
21
+ }
22
+
23
+ /** verify_contract:冻结契约,返回 id。 */
24
+ export function verifyContract(input, store = contracts) {
25
+ const c = freezeContract(input)
26
+ store.set(c.id, { contract: c, frozenAt: c.frozenAt })
27
+ return { contractId: c.id }
28
+ }
29
+
30
+ /**
31
+ * verify_run:跑策略 → 三态判定。
32
+ * H1 证据先于验收:evidence 缺失时不判 GREEN(gate 的 R1 已保证)。
33
+ * policy runner 由调用方注入(composePolicy),这里只做编排与落盘。
34
+ */
35
+ export function verifyRun({ contractId, sessionId, evidenceInput, runPolicy, checkDeps, usePolicy }, store = contracts, runStore = runs) {
36
+ const rk = runKey(contractId, sessionId)
37
+ const entry = store.get(contractId)
38
+ if (!entry) return { decision: 'RED', reasons: [`未知 contractId ${contractId}`], evidenceHash: '' }
39
+
40
+ // 0.2.0 P0-3:显式要求用策略且未给 checks 时,按 policy 生成检查请求
41
+ if (usePolicy === true && !evidenceInput && typeof runPolicy !== 'function') {
42
+ const policy = loadPolicy(entry.contract.policyId || 'code-change')
43
+ evidenceInput = { checks: policyToChecks(policy, entry.contract) }
44
+ }
45
+
46
+ // H1:既没有证据输入、也没有策略来产出证据 → 直接判 YELLOW,不伪造证据
47
+ if (!evidenceInput && typeof runPolicy !== 'function') {
48
+ const d = decide(entry.contract, { checks: [], artifacts: [] })
49
+ const ev = makeEvidence({ contractId })
50
+ const hash = evidenceHash(ev)
51
+ runStore.set(rk, { decision: d.decision, at: new Date().toISOString(), evidenceHash: hash, missing: d.missing, reproCmd: d.reproCmd })
52
+ return {
53
+ decision: d.decision, reasons: d.reasons, evidenceHash: hash,
54
+ missing: d.missing,
55
+ ...(d.reproCmd ? { reproCmd: d.reproCmd } : {}),
56
+ }
57
+ }
58
+
59
+ // 0.2.0:checks 是请求,由插件真实执行(模型自报 ok 被忽略并记 warning)
60
+ const evidence = typeof runPolicy === 'function'
61
+ ? runPolicy(entry.contract, evidenceInput)
62
+ : (() => {
63
+ const executed = runChecks(evidenceInput?.checks ?? [], checkDeps)
64
+ return makeEvidence({
65
+ contractId,
66
+ ...evidenceInput,
67
+ checks: executed.checks,
68
+ warnings: [...(evidenceInput?.warnings ?? []), ...executed.warnings],
69
+ })
70
+ })()
71
+
72
+ const d = decide(entry.contract, evidence)
73
+ const hash = evidenceHash(evidence)
74
+ runStore.set(rk, { decision: d.decision, at: new Date().toISOString(), evidenceHash: hash, missing: d.missing, reproCmd: d.reproCmd })
75
+ return {
76
+ decision: d.decision,
77
+ reasons: d.reasons,
78
+ evidenceHash: hash,
79
+ missing: d.missing,
80
+ ...(Array.isArray(evidence.warnings) && evidence.warnings.length > 0 ? { warnings: evidence.warnings } : {}),
81
+ ...(d.reproCmd ? { reproCmd: d.reproCmd } : {}),
82
+ }
83
+ }
84
+
85
+ /** verify_status:最近一次 decision 与时间。 */
86
+ export function verifyStatus({ contractId, sessionId }, runStore = runs) {
87
+ const r = runStore.get(runKey(contractId, sessionId))
88
+ // 未知契约返回 known:false,不落进 GREEN/YELLOW/RED 三态(评审必改3)
89
+ if (!r) return { known: false }
90
+ return {
91
+ known: true,
92
+ decision: r.decision,
93
+ at: r.at,
94
+ ...(r.reproCmd ? { reproCmd: r.reproCmd } : {}),
95
+ ...(Array.isArray(r.missing) && r.missing.length > 0 ? { missing: r.missing } : {}),
96
+ ...(r.approved === true ? { approved: true, approvedAt: r.approvedAt } : {}),
97
+ ...(r.stale === true ? { stale: true } : {}),
98
+ }
99
+ }
100
+
101
+ /**
102
+ * H3 · act() 的调用者守卫。
103
+ * 非用户(subagent / 代码发起 / 无 session)→ refused + 记拒绝事件。
104
+ * @returns {{status:'refused',reason}|null} null 表示允许继续
105
+ */
106
+ export function guardCaller(agent, record) {
107
+ const origin = agent?.session?.header?.origin
108
+ const fromAgent = origin === 'subagent' || agent?.fromAgent === true || agent?.origin === 'subagent'
109
+ const live = agent && typeof agent === 'object' && !agent.disposed
110
+ if (!live || fromAgent) {
111
+ const reason = !live ? 'not-live-root' : 'agent-initiated-not-user'
112
+ if (typeof record === 'function') {
113
+ record(agent, { callId: agent?.callId ?? 'unknown', action: 'dsh-swarm-console/gate', phase: 'refused', data: { reason } })
114
+ }
115
+ return { status: 'refused', reason }
116
+ }
117
+ return null
118
+ }
119
+
120
+ /** 供测试隔离用的空 store。 */
121
+ export function newStores() {
122
+ return { contracts: new Map(), runs: new Map() }
123
+ }
124
+
125
+ // ── v1 放行入口:斜杠命令核心(宿主无关)─────────────────────────────
126
+ // 命令只能由用户触发(斜杠命令不走模型工具),H3 由结构保证,不靠 act 守卫。
127
+ // 状态与 verify 同源:契约在 contracts,最近决定在 runs,approved 也写回 runs。
128
+
129
+ /**
130
+ * 契约 id 解析:支持精确 id 与唯一前缀。
131
+ * @returns {{id?:string, error?:string}}
132
+ */
133
+ export function resolveContractId(input, store = contracts) {
134
+ const raw = String(input ?? '').trim()
135
+ if (raw === '') return { error: '缺少契约 id' }
136
+ if (store.has(raw)) return { id: raw }
137
+ const hits = [...store.keys()].filter((k) => k.startsWith(raw))
138
+ if (hits.length === 1) return { id: hits[0] }
139
+ if (hits.length === 0) return { error: `未知契约 ${raw}` }
140
+ return { error: `前缀 ${raw} 命中多个契约:${hits.join(', ')}` }
141
+ }
142
+
143
+ /** /gate-approve:非 GREEN 拒绝;证据过期拒绝;GREEN 记 approved 返回成功。 */
144
+ export function gateApprove({ contractId, sessionId, expectedHash }, store = contracts, runStore = runs) {
145
+ const resolved = resolveContractId(contractId, store)
146
+ if (resolved.error) return { kind: 'error', text: resolved.error }
147
+ contractId = resolved.id
148
+ const rk = runKey(contractId, sessionId)
149
+ const r = runStore.get(rk)
150
+ if (!r) return { kind: 'error', text: '尚无门禁决定,请先执行 verify_run' }
151
+ if (r.decision !== 'GREEN') {
152
+ return { kind: 'error', text: `非 GREEN 不可放行,请先 /gate-retry ${contractId}` }
153
+ }
154
+ // P0-4:evidenceHash 与最近一次 verify_run 不一致 → 证据已过期
155
+ if (expectedHash !== undefined && r.evidenceHash !== expectedHash) {
156
+ return { kind: 'error', text: '证据已过期,请重新 verify_run' }
157
+ }
158
+ runStore.set(rk, { ...r, approved: true, approvedAt: new Date().toISOString(), by: 'user', stale: false })
159
+ return { kind: 'success', text: `契约 ${contractId} 已由用户放行(approved)` }
160
+ }
161
+
162
+ /** /gate-retry:空证据重算 → YELLOW;保留 approved 但置 stale、清 approvedAt。 */
163
+ export function gateRetry({ contractId, sessionId }, store = contracts, runStore = runs) {
164
+ const resolved = resolveContractId(contractId, store)
165
+ if (resolved.error) return { kind: 'error', text: resolved.error }
166
+ contractId = resolved.id
167
+ const rk = runKey(contractId, sessionId)
168
+ const before = runStore.get(rk)
169
+ const wasApproved = before?.approved === true
170
+ const r = verifyRun({ contractId, sessionId, evidenceInput: undefined }, store, runStore)
171
+ // verifyRun 覆盖了整条记录,把旧的 approved/stale 语义补回来
172
+ const after = runStore.get(rk)
173
+ if (wasApproved) runStore.set(rk, { ...after, approved: true, stale: true, approvedAt: undefined, by: before.by })
174
+ else runStore.set(rk, { ...after, stale: true })
175
+ const now = verifyStatus({ contractId, sessionId }, runStore)
176
+ return {
177
+ kind: 'success',
178
+ text: `契约 ${contractId} 已重算:${r.decision} @ ${now.at}${wasApproved ? ' [stale](原放行已失效)' : ''}。需重新执行 verify_run 补证据后才可能转 GREEN。`,
179
+ }
180
+ }
181
+
182
+ /** /gate-status:无参列出当前会话契约;有参(支持前缀)显示单条详情。 */
183
+ export function gateStatus({ contractId, sessionId } = {}, store = contracts, runStore = runs) {
184
+ const raw = String(contractId ?? '').trim()
185
+
186
+ // 无参:列出全部契约(按最近决定时间倒序)
187
+ if (raw === '') {
188
+ const rows = [...store.keys()].map((id) => ({ id, run: runStore.get(runKey(id, sessionId)) }))
189
+ if (rows.length === 0) return { kind: 'success', text: '当前会话还没有冻结任何契约(先执行 verify_contract)' }
190
+ rows.sort((a, b) => String(b.run?.at ?? '').localeCompare(String(a.run?.at ?? '')))
191
+ const lines = rows.map(({ id, run }) => {
192
+ if (!run) return `- ${id} 未跑校验`
193
+ const flags = [run.decision]
194
+ if (run.stale === true) flags.push('[stale]')
195
+ flags.push(run.approved === true ? '已放行' : '尚未放行')
196
+ return `- ${id} ${flags.join(' ')} @ ${run.at ?? '-'}`
197
+ })
198
+ return { kind: 'success', text: [`当前会话契约(${rows.length}):`, ...lines].join('\n') }
199
+ }
200
+
201
+ const resolved = resolveContractId(raw, store)
202
+ if (resolved.error) return { kind: 'error', text: resolved.error }
203
+ const id = resolved.id
204
+ const r = runStore.get(runKey(id, sessionId))
205
+ if (!r) return { kind: 'success', text: `契约 ${id} 尚无门禁决定` }
206
+ const approved = r.approved === true
207
+ const stale = r.stale === true
208
+ const head = `契约 ${id}:最近决定 ${r.decision} @ ${r.at}${stale ? ' [stale]' : ''}${approved ? `;已由 ${r.by ?? 'user'} 放行${stale ? '(已过期)' : ` @ ${r.approvedAt}`}` : ';尚未放行'}`
209
+ // H2 可见性:RED 必须把复现命令亮给用户,YELLOW 必须把缺失证据亮出来
210
+ const extra = []
211
+ if (r.reproCmd) extra.push(`复现:${r.reproCmd}`)
212
+ if (Array.isArray(r.missing) && r.missing.length > 0) extra.push(`缺失证据:${r.missing.join(';')}`)
213
+ return { kind: 'success', text: [head, ...extra].join('\n') }
214
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dsh-swarm-console",
3
- "version": "0.2.1",
3
+ "version": "0.2.2",
4
4
  "type": "module",
5
5
  "description": "Run one external agent from DSH, with a visible gate (v0.1 · 门禁可用,画布开发中).",
6
6
  "keywords": [