dsh-kingdom 0.8.0 → 2.0.0

package/lib/adapter/dsh-usage.js

@@ -0,0 +1,159 @@
+import { readDshSessionEvents } from './dsh-session-events.js';
+const count = (value) => typeof value === 'number' && Number.isSafeInteger(value) && value >= 0;
+const record = (value) => value !== null && typeof value === 'object' && !Array.isArray(value);
+const messageId = (event) => event.data?.id ?? (record(event.data?.message) ? event.data.message.id : undefined);
+export function normalizeDshUsageCounts(value) {
+    if (!record(value) || !count(value.uncachedInputTokens) || !count(value.outputTokens) || !count(value.totalTokens))
+        return null;
+    const result = {
+        uncachedInputTokens: value.uncachedInputTokens, outputTokens: value.outputTokens, totalTokens: value.totalTokens,
+    };
+    for (const key of ['cacheReadTokens', 'cacheWriteTokens', 'reasoningTokens']) {
+        if (value[key] !== undefined) {
+            if (!count(value[key]))
+                return null;
+            result[key] = value[key];
+        }
+    }
+    const knownPrompt = result.uncachedInputTokens + (result.cacheReadTokens ?? 0) + (result.cacheWriteTokens ?? 0);
+    const exactPrompt = result.totalTokens - result.outputTokens;
+    if (!count(knownPrompt) || !count(exactPrompt) || exactPrompt < knownPrompt
+        || (result.reasoningTokens !== undefined && result.reasoningTokens > result.outputTokens)
+        || (result.cacheReadTokens !== undefined && result.cacheWriteTokens !== undefined && exactPrompt !== knownPrompt))
+        return null;
+    if (value.routes !== undefined) {
+        if (!Array.isArray(value.routes) || value.routes.length > 128)
+            return null;
+        const routes = [];
+        for (const route of value.routes) {
+            if (!record(route) || typeof route.provider !== 'string' || typeof route.model !== 'string'
+                || !route.provider.trim() || !route.model.trim() || route.provider.length > 256 || route.model.length > 256)
+                return null;
+            routes.push({ provider: route.provider, model: route.model });
+        }
+        result.routes = routes;
+    }
+    return result;
+}
+function hasUsage(event) {
+    let sample = event.data?.usage;
+    if (sample === undefined && Array.isArray(event.data?.stream)) {
+        for (const item of event.data.stream) {
+            if (record(item) && item.type === 'chunk' && record(item.chunk) && item.chunk.type === 'usage')
+                sample = item.chunk.usage;
+        }
+    }
+    return record(sample) && count(sample.inputTokens) && count(sample.outputTokens);
+}
+/** Pure extraction from an already acquired snapshot; no persistence or model calls. */
+export function extractDshDispatchUsage(events, runtimeDispatchRef, deriveTurnUsage) {
+    const base = { type: 'DshDispatchUsage/v1', source: 'provider-reported', runtimeDispatchRef,
+        turn: null, fromSeq: null, throughSeq: null,
+        observedRequests: 0, reportedRequests: 0, usage: null };
+    const unavailable = (reasonCode) => ({ ...base, status: 'UNAVAILABLE', reasonCode });
+    if (events === null)
+        return unavailable('EVENTS_UNREADABLE');
+    if (!runtimeDispatchRef.trim() || runtimeDispatchRef.length > 256)
+        return unavailable('DISPATCH_REF_INVALID');
+    const users = events.map((event, index) => event.type === 'user/message' && messageId(event) === runtimeDispatchRef ? index : -1).filter(index => index >= 0);
+    if (users.length !== 1)
+        return unavailable(users.length === 0 ? 'DISPATCH_NOT_ADMITTED' : 'DISPATCH_AMBIGUOUS');
+    const userIndex = users[0];
+    const receipts = events.map((event, index) => event.type === 'agent/inbox/spliced' && Array.isArray(event.data?.inserted)
+        && event.data.inserted.some(item => record(item) && item.id === runtimeDispatchRef) ? index : -1).filter(index => index >= 0);
+    if (receipts.length > 1 || (receipts.length === 1 && receipts[0] > userIndex))
+        return unavailable('DISPATCH_AMBIGUOUS');
+    const receiptIndex = receipts[0] ?? userIndex;
+    let start = -1;
+    // Modern DSH opens the turn before admitting its user/message. Legacy
+    // events-only sessions may admit the user before turn/start.
+    for (let i = userIndex - 1; i >= (receipts.length ? receiptIndex : 0); i--) {
+        if (events[i].type === 'turn/end')
+            break;
+        if (events[i].type === 'turn/start') {
+            start = i;
+            break;
+        }
+    }
+    if (start < 0)
+        start = events.findIndex((event, index) => index > userIndex && event.type === 'turn/start');
+    if (start < 0 || !count(events[start].data?.turn))
+        return unavailable('TURN_NOT_OBSERVED');
+    const turn = events[start].data.turn;
+    base.turn = turn;
+    base.fromSeq = count(events[start].seq) ? events[start].seq : null;
+    let end = -1;
+    for (let i = start + 1; i < events.length; i++) {
+        if (events[i].type === 'turn/start')
+            return unavailable('TURN_BOUNDARY_AMBIGUOUS');
+        if (events[i].type === 'turn/end') {
+            if (events[i].data?.turn !== turn)
+                return unavailable('TURN_BOUNDARY_AMBIGUOUS');
+            end = i;
+            break;
+        }
+    }
+    if (end >= 0 && userIndex > end)
+        return unavailable('DISPATCH_OUTSIDE_TURN');
+    const through = end >= 0 ? end : events.length - 1;
+    base.throughSeq = count(events[through]?.seq) ? events[through].seq : null;
+    for (let i = Math.min(receiptIndex, start); i <= through; i++) {
+        if (events[i].type === 'user/message' && messageId(events[i]) !== runtimeDispatchRef)
+            return unavailable('FOREIGN_INPUT');
+    }
+    const local = events.slice(start, through + 1);
+    if (local.some(event => event.seq !== undefined)) {
+        for (let i = 0; i < local.length; i++) {
+            if (!count(local[i].seq) || (i > 0 && local[i].seq !== local[i - 1].seq + 1))
+                return unavailable('EVENT_SEQUENCE_INVALID');
+        }
+    }
+    let slot = -1;
+    const reported = new Set();
+    for (const event of local) {
+        if (event.type === 'step/start' || event.type === 'llm/retry-started') {
+            if (event.data?.turn !== turn || !count(event.data?.step))
+                return unavailable('REQUEST_BOUNDARY_AMBIGUOUS');
+            slot++;
+            base.observedRequests++;
+        }
+        if ((event.type === 'assistant/message' || event.type === 'assistant/attempt') && hasUsage(event) && slot >= 0)
+            reported.add(slot);
+    }
+    base.reportedRequests = reported.size;
+    if (deriveTurnUsage === null)
+        return { ...base, status: 'UNAVAILABLE', reasonCode: 'USAGE_READER_UNAVAILABLE' };
+    if (end < 0)
+        return { ...base, status: reported.size ? 'PARTIAL' : 'UNAVAILABLE', reasonCode: 'TURN_IN_PROGRESS' };
+    let usage;
+    try {
+        usage = normalizeDshUsageCounts(deriveTurnUsage(local));
+    }
+    catch {
+        return { ...base, status: 'UNAVAILABLE', reasonCode: 'USAGE_READER_FAILED' };
+    }
+    if (usage === null || base.observedRequests === 0)
+        return { ...base, status: reported.size ? 'PARTIAL' : 'UNAVAILABLE', reasonCode: 'USAGE_INCOMPLETE' };
+    return { ...base, status: 'COMPLETE', reasonCode: null, usage };
+}
+let publicUsageReader;
+/** Optional public package export; never deep-import private runtime files. */
+export function loadDshUsageReader() {
+    publicUsageReader ??= (async () => {
+        try {
+            const publicEntry = '@deepseek-ai/dsh-token-meter/client';
+            const module = await import(publicEntry);
+            return record(module) && typeof module.deriveTurnTokenUsage === 'function'
+                ? module.deriveTurnTokenUsage : null;
+        }
+        catch {
+            return null;
+        }
+    })();
+    return publicUsageReader;
+}
+export async function observeDshDispatchUsage(session, runtimeDispatchRef) {
+    const reader = await loadDshUsageReader();
+    return extractDshDispatchUsage(readDshSessionEvents(session), runtimeDispatchRef, reader);
+}
+//# sourceMappingURL=dsh-usage.js.map

package/lib/adapter/dsh-usage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dsh-usage.js","sourceRoot":"","sources":["../../src/adapter/dsh-usage.ts"],"names":[],"mappings":"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"}

package/lib/capability/admin.js

@@ -0,0 +1,72 @@
+/**
+ * Public Owner capability-ceiling administration.
+ *
+ * The ceiling is an existing v4 Kingdom fact.  This module only exposes the
+ * smallest supported write path for it: the direct `/kingdom` Owner Control
+ * handler may submit a boolean capability allow-list, which is validated,
+ * persisted, and audited. Agent sessions and legacy OWNER.session_id are not
+ * an authority source.
+ * It deliberately does not change capability-gate ordering or execution
+ * semantics.
+ */
+import { randomUUID } from 'node:crypto';
+import { requireAdmin } from '../core/binding.js';
+function parseCeiling(json) {
+    let parsed;
+    try {
+        parsed = JSON.parse(json);
+    }
+    catch {
+        return { ok: false, message: '错误：capability ceiling 必须是合法 JSON 对象。' };
+    }
+    if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+        return { ok: false, message: '错误：capability ceiling 必须是 JSON 对象（capability 名称 → boolean）。' };
+    }
+    const entries = Object.entries(parsed);
+    for (const [capability, allowed] of entries) {
+        if (capability.trim().length === 0 || typeof allowed !== 'boolean') {
+            return { ok: false, message: '错误：capability ceiling 的每个 key 必须是非空 capability 名称，value 必须是 boolean。' };
+        }
+    }
+    return { ok: true, value: Object.fromEntries(entries.map(([key, value]) => [key.trim(), value])) };
+}
+/**
+ * Set or clear the existing Owner Ceiling fact through the direct Owner
+ * Control plane. A runtime-derived principal or a session id supplied in
+ * tool arguments is never accepted here.
+ */
+export function setCapabilityCeiling(store, input, auth) {
+    const admin = requireAdmin(store, input.kingdomId, auth, { operation: 'ceiling', input });
+    if (!admin.ok)
+        return `CONFIG_DENIED: ${admin.message}`;
+    let normalized = null;
+    let value = null;
+    if (input.ceilingJson !== null) {
+        const parsed = parseCeiling(input.ceilingJson);
+        if (!parsed.ok)
+            return `CONFIG_DENIED: ${parsed.message}`;
+        value = parsed.value;
+        normalized = JSON.stringify(value);
+    }
+    store.setKingdomCapabilityCeiling(input.kingdomId, normalized);
+    store.appendEvent({
+        event_id: randomUUID(),
+        kingdom_id: input.kingdomId,
+        event_type: 'CAPABILITY_CEILING_UPDATED',
+        actor_role: 'OWNER',
+        actor_id: admin.ownerControl ? admin.ownerPrincipalId : admin.owner?.binding_id ?? null,
+        target_type: 'kingdom',
+        target_id: input.kingdomId,
+        payload_json: JSON.stringify({
+            ceiling: value,
+            cleared: value === null,
+            source: admin.eventSource.source_channel === 'LOCAL_OWNER_GUI' ? 'local-owner-gui' : 'direct-owner-slash',
+            ...admin.eventSource,
+        }),
+        created_at: new Date().toISOString(),
+    });
+    return value === null
+        ? 'Owner Capability Ceiling 已清空；governed persistent execution 将继续 fail-closed，直到重新配置。'
+        : `Owner Capability Ceiling 已配置（${Object.keys(value).length} 项）；下一步由已授权的 Supervisor Agent Session 提交本次 Grant 进入既有 Capability Gate；Owner 仍通过 direct /kingdom Slash 管理 Ceiling。`;
+}
+//# sourceMappingURL=admin.js.map

package/lib/capability/admin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/capability/admin.ts"],"names":[],"mappings":"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"}

package/lib/capability/dsh-enforcement.js

@@ -1,3 +1,4 @@
+import { readDshSessionEvents } from '../adapter/dsh-session-events.js';
 /**
  * 真实工具面 shape 归一化（Owner S4 seam 裁决 · A/B 组合）。
  * 接受：字符串数组 / `[{name, description, parameters}, …]`（真实 `tools.schemas()` 实证 shape）/
@@ -64,10 +65,45 @@ const disposerRegistry = new WeakMap();
 function sessionKey(context) {
     return context.agent.session;
 }
+function hasToolEnforcementSeam(tools) {
+    return typeof tools?.restrict === 'function' && typeof tools?.guard === 'function';
+}
+/**
+ * 尝试拆除全部 disposer；失败项继续留在 registry，便于 recovery 重试。
+ * disposer 抛错只能证明 teardown UNKNOWN，不能被转换为 ok:true。
+ */
+function disposeDisposers(context, disposers) {
+    let disposed = 0;
+    const failures = [];
+    const remaining = [];
+    disposers.forEach((dispose, index) => {
+        try {
+            dispose();
+            disposed++;
+        }
+        catch (error) {
+            failures.push({
+                index,
+                detail: error instanceof Error ? error.message : String(error),
+            });
+            remaining.push(dispose);
+        }
+    });
+    if (remaining.length > 0)
+        disposerRegistry.set(sessionKey(context), remaining);
+    else
+        disposerRegistry.delete(sessionKey(context));
+    return { disposed, failures };
+}
+/** 只接受本次 setter 调用后追加、且字段值精确匹配的政策事件。 */
+function hasAppendedPolicyEvent(context, startIndex, type, field, expected) {
+    const events = readDshSessionEvents(context.agent.session);
+    return events !== null && events.slice(startIndex).some((event) => event.type === type && event.data?.[field] === expected);
+}
 /**
  * 从真实 DSH API 重建 context-bound RuntimeEnforceableSet（Owner S4 seam 裁决：A∩B）。
  *
- * - A = **Runtime Tool Inventory**：`tools.schemas()`（实证返回 `[{name,description,parameters}]`）；
+ * - A = **Runtime Tool Inventory**：`tools.schemas()`（实证返回 `[{name,description,parameters}]`），但只有当前 context 同时有 `restrict` 与 `guard` 才能证明 A 可 enforce；
  * - B = **Actual Agent Preset / Session Tool Surface**：仅用 `context.agentPresetId`（真实 agent preset：
  *   standard/code/minimal/…）调 `presets.resolveMountable(agentPresetId)`（await + catch，**禁止未处理
  *   rejection 泄漏**——BLOCKER #2 根因）；`permission/preset` 事件值是 PermissionPresetService 的预设名
@@ -75,7 +111,9 @@ function sessionKey(context) {
  * - **Runtime Enforceable Tool Set = A ∩ B**；任一来源无法证明 → 空（fail-closed，不默认放行）。
  */
 export async function readEnforceableSet(context, deps) {
-    const events = context.agent.session.events;
+    const events = readDshSessionEvents(context.agent.session);
+    if (events === null)
+        return { tools: [], sandboxMode: null, approvalPolicy: null, presetId: null };
     const sandboxEvents = events.filter(e => e.type === 'sandbox/mode');
     const approvalEvents = events.filter(e => e.type === 'approval/policy');
     const presetEvents = events.filter(e => e.type === 'permission/preset');
@@ -86,8 +124,12 @@ export async function readEnforceableSet(context, deps) {
     const lastApproval = lastApprovalRaw === 'never' || lastApprovalRaw === 'ask' ? lastApprovalRaw : null;
     // permission/preset 事件值 = PermissionPresetService 预设名（materialize 的 permission.set 用）；非 agentPresetId
     const lastPermissionPreset = typeof lastPresetRaw === 'string' ? lastPresetRaw : null;
-    // A：Runtime Tool Inventory（真实 schemas API；解析失败 → 空 → fail-closed）
-    const inventory = normalizeToolInventory(context.agent.ctx.tools?.schemas?.());
+    // A：Runtime Tool Inventory（真实 schemas API；解析失败 → 空 → fail-closed）。
+    // schemas 只有声明能力；没有当前 Session 的 restrict/guard seam 时，不能进入
+    // RuntimeEnforceableSet，即使 schemas 本身列出了 pwsh。
+    const inventory = hasToolEnforcementSeam(context.agent.ctx.tools)
+        ? normalizeToolInventory(context.agent.ctx.tools?.schemas?.())
+        : [];
     // B：Actual Agent Preset / Session Tool Surface
     //    仅用 context.agentPresetId（真实 agent preset）；await + try/catch 消费一切 rejection（BLOCKER #2 修复）
     let surface = [];
@@ -107,7 +149,9 @@ export async function readEnforceableSet(context, deps) {
         surface = inventory;
     }
     // Enforceable = A ∩ B
-    const tools = inventory.filter(name => surface.includes(name));
+    const tools = hasToolEnforcementSeam(context.agent.ctx.tools)
+        ? inventory.filter(name => surface.includes(name))
+        : [];
     return {
         tools,
         sandboxMode: lastSandbox ?? null,
@@ -124,8 +168,12 @@ export async function materializeDshEnforcement(deps, context, request) {
     const disposers = [];
     const applied = [];
     const toolsApi = context.agent.ctx.tools;
+    const beforeEvents = readDshSessionEvents(context.agent.session);
+    if (beforeEvents === null)
+        return { ok: false, evidenceJson: null, reasons: ['Session event snapshot unreadable; enforcement not attempted'] };
+    const policyEventStart = beforeEvents.length;
     // 1) 工具面：restrict（允许清单）+ guard（单调拒绝，body 不执行）
-    if (!toolsApi?.restrict || !toolsApi?.guard) {
+    if (!hasToolEnforcementSeam(toolsApi)) {
         reasons.push('agent.ctx.tools 无 restrict/guard（工具面无法 enforce）');
     }
     else {
@@ -146,10 +194,17 @@ export async function materializeDshEnforcement(deps, context, request) {
         }
     }
     // 2) 领地写边界 + 禁扩权：一键 preset 或逐 knob
-    if (request.presetId && deps.permission) {
+    const presetPath = typeof request.presetId === 'string' && request.presetId.length > 0;
+    let permissionApplied = false;
+    if (presetPath) {
+        if (!deps.permission) {
+            reasons.push('permission preset 服务缺失（preset path 无法证明）');
+        }
         try {
-            deps.permission.set(context.agent.session, request.presetId);
-            applied.push(`permission:preset=${request.presetId}`);
+            if (deps.permission) {
+                deps.permission.set(context.agent.session, request.presetId);
+                permissionApplied = true;
+            }
         }
         catch (error) {
             reasons.push(`permission preset 应用失败: ${error instanceof Error ? error.message : String(error)}`);
@@ -162,7 +217,6 @@ export async function materializeDshEnforcement(deps, context, request) {
         else {
             try {
                 deps.sandboxPolicy.setSandboxMode(context.agent.session, request.sandboxMode);
-                applied.push(`sandbox:mode=${request.sandboxMode}`);
             }
             catch (error) {
                 reasons.push(`sandbox 应用失败: ${error instanceof Error ? error.message : String(error)}`);
@@ -174,30 +228,87 @@ export async function materializeDshEnforcement(deps, context, request) {
         else {
             try {
                 deps.approval.setApprovalPolicy(context.agent.session, request.approvalPolicy);
-                applied.push(`approval:policy=${request.approvalPolicy}`);
             }
             catch (error) {
                 reasons.push(`approval 应用失败: ${error instanceof Error ? error.message : String(error)}`);
             }
         }
     }
-    // 3) 证据核验：策略事件必须落到持久 session 日志（typed evidence 的诚实基础）
-    const types = new Set(context.agent.session.events.map(e => e.type));
-    if (request.sandboxMode !== 'read-only' && !types.has('sandbox/mode')) {
-        reasons.push('sandbox/mode 事件缺失（无法证明领地写边界已生效）');
+    // 3) 证据核验：direct knob 必须看到本次 setter 追加的精确政策事件；
+    //    preset path 还允许 PermissionPresetService.set 对已生效 preset 的合法幂等 no-op，
+    //    但仍必须核对当前 sandbox/approval/preset 三项状态完全匹配。
+    const sandboxEventApplied = hasAppendedPolicyEvent(context, policyEventStart, 'sandbox/mode', 'mode', request.sandboxMode);
+    if (sandboxEventApplied && !presetPath) {
+        applied.push(`sandbox:mode=${request.sandboxMode}`);
+    }
+    else if (!presetPath) {
+        reasons.push(`sandbox/mode 事件缺失或未反映请求模式=${request.sandboxMode}（setter/effective state 无法证明）`);
+    }
+    const approvalEventApplied = hasAppendedPolicyEvent(context, policyEventStart, 'approval/policy', 'policy', request.approvalPolicy);
+    if (approvalEventApplied && !presetPath) {
+        applied.push(`approval:policy=${request.approvalPolicy}`);
     }
-    if (!types.has('approval/policy')) {
-        reasons.push('approval/policy 事件缺失（无法证明禁扩权已生效）');
+    else if (!presetPath) {
+        reasons.push(`approval/policy 事件缺失或未反映请求策略=${request.approvalPolicy}（setter/effective state 无法证明）`);
+    }
+    if (permissionApplied) {
+        const presetEventApplied = hasAppendedPolicyEvent(context, policyEventStart, 'permission/preset', 'preset', request.presetId);
+        if (presetEventApplied)
+            applied.push(`permission:preset=${request.presetId}`);
+        else if (!presetPath)
+            reasons.push(`permission/preset 事件缺失或未反映请求 preset=${request.presetId}`);
     }
-    const evidenceEvents = ['sandbox/mode', 'approval/policy', 'permission/preset'].filter(t => types.has(t));
+    let current = {
+        sandboxMode: null,
+        approvalPolicy: null,
+        presetId: null,
+    };
+    try {
+        const enforceable = await readEnforceableSet(context);
+        current = {
+            sandboxMode: enforceable.sandboxMode,
+            approvalPolicy: enforceable.approvalPolicy,
+            presetId: enforceable.presetId,
+        };
+    }
+    catch (error) {
+        reasons.push(`读取当前 Session effective state 失败: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    if (current.sandboxMode !== request.sandboxMode) {
+        reasons.push(`sandbox effective state=${current.sandboxMode ?? 'none'} 与请求 ${request.sandboxMode} 不一致`);
+    }
+    if (current.approvalPolicy !== request.approvalPolicy) {
+        reasons.push(`approval effective state=${current.approvalPolicy ?? 'none'} 与请求 ${request.approvalPolicy} 不一致`);
+    }
+    if (presetPath && current.presetId !== request.presetId) {
+        reasons.push(`permission preset effective state=${current.presetId ?? 'none'} 与请求 ${request.presetId} 不一致`);
+    }
+    const evidenceEvents = [
+        sandboxEventApplied ? 'sandbox/mode' : null,
+        approvalEventApplied ? 'approval/policy' : null,
+        permissionApplied && hasAppendedPolicyEvent(context, policyEventStart, 'permission/preset', 'preset', request.presetId) ? 'permission/preset' : null,
+    ].filter((type) => type !== null);
     if (evidenceEvents.length > 0)
         applied.push(`events=[${evidenceEvents.join(',')}]`);
+    if (presetPath && permissionApplied && !sandboxEventApplied && !approvalEventApplied && !hasAppendedPolicyEvent(context, policyEventStart, 'permission/preset', 'preset', request.presetId)) {
+        // Existing matching events + a successful preset setter call is the bounded
+        // evidence for the valid idempotent path; do not invent new events.
+        applied.push(`permission:preset=${request.presetId}:idempotent-existing-state`);
+    }
+    if (reasons.length === 0 && deps.toolDisclosure) {
+        try {
+            disposers.push(deps.toolDisclosure.install(context.agent, request.tools));
+            applied.push('tool-disclosure:authorized-native-pilot');
+        }
+        catch (error) {
+            reasons.push(`工具展示试点无法安装: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
     if (reasons.length > 0) {
-        for (const dispose of disposers) {
-            try {
-                dispose();
-            }
-            catch { /* 忽略 */ }
+        disposerRegistry.set(sessionKey(context), disposers);
+        const cleanup = disposeDisposers(context, disposers);
+        if (cleanup.failures.length > 0) {
+            reasons.push(`cleanup 未确认: ${cleanup.failures.map(failure => `#${failure.index} ${failure.detail}`).join('; ')}`);
         }
         return { ok: false, evidenceJson: null, reasons };
     }
@@ -221,20 +332,18 @@ export async function materializeDshEnforcement(deps, context, request) {
 export async function cleanupDshEnforcement(context) {
     const key = sessionKey(context);
     const disposers = disposerRegistry.get(key) ?? [];
-    disposerRegistry.delete(key);
-    let disposed = 0;
-    for (const dispose of disposers) {
-        try {
-            dispose();
-            disposed++;
-        }
-        catch { /* 忽略单个失败 */ }
-    }
+    const summary = disposeDisposers(context, disposers);
     return {
-        ok: true,
+        ok: summary.failures.length === 0,
         evidenceJson: JSON.stringify({
             type: TEARDOWN_EVIDENCE_TYPE,
-            payload: { disposed, sessionRef: context.sessionRef, at: new Date().toISOString() },
+            payload: {
+                disposed: summary.disposed,
+                failed: summary.failures.length,
+                failures: summary.failures,
+                sessionRef: context.sessionRef,
+                at: new Date().toISOString(),
+            },
         }),
     };
 }

package/lib/capability/dsh-enforcement.js.map

@@ -1 +1 @@
-{"version":3,"file":"dsh-enforcement.js","sourceRoot":"","sources":["../../src/capability/dsh-enforcement.ts"],"names":[],"mappings":"AA2DA;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CAAC,KAAc;IACnD,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAA;IAC/B,MAAM,IAAI,GAAG,CAAC,IAAa,EAAE,SAAkB,EAAE,KAAa,EAAQ,EAAE;QACtE,IAAI,KAAK,GAAG,CAAC;YAAE,OAAM;QACrB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;gBAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACpC,OAAM;QACR,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,KAAK,MAAM,IAAI,IAAI,IAAI;gBAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA;YACpD,OAAM;QACR,CAAC;QACD,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,IAA+B,CAAA;YAC9C,gEAAgE;YAChE,iEAAiE;YACjE,IAAI,SAAS,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACjD,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;gBACtB,OAAM;YACR,CAAC;YACD,gDAAgD;YAChD,KAAK,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;gBACjE,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;oBAC9B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;oBACzB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;wBACzB,KAAK,MAAM,IAAI,IAAI,KAAK;4BAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA;oBACvD,CAAC;yBAAM,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBAC9C,mCAAmC;wBACnC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;4BAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;oBACxD,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA;oBAC/B,CAAC;oBACD,OAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAA;IACD,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IACrB,OAAO,CAAC,GAAG,KAAK,CAAC,CAAA;AACnB,CAAC;AAED,kEAAkE;AAClE,SAAS,eAAe,CAAC,KAAc;IACrC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,EAAE,CAAA;IACpD,OAAO,sBAAsB,CAAC,KAAK,CAAC,CAAA;AACtC,CAAC;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,2BAA2B,CAAA;AACpE,MAAM,CAAC,MAAM,sBAAsB,GAAG,mCAAmC,CAAA;AAEzE,mFAAmF;AACnF,MAAM,gBAAgB,GAAG,IAAI,OAAO,EAA0B,CAAA;AAE9D,SAAS,UAAU,CAAC,OAA8B;IAChD,OAAO,OAAO,CAAC,KAAK,CAAC,OAA4B,CAAA;AACnD,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAA8B,EAAE,IAAyB;IAChG,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAA;IAC3C,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,CAAA;IACnE,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAA;IACvE,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,mBAAmB,CAAC,CAAA;IACvE,MAAM,cAAc,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;IACjH,MAAM,eAAe,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAA;IACvH,MAAM,aAAa,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAA;IAC/G,MAAM,WAAW,GAAyC,cAAc,KAAK,WAAW,IAAI,cAAc,KAAK,iBAAiB,IAAI,cAAc,KAAK,oBAAoB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAA;IACnM,MAAM,YAAY,GAA4C,eAAe,KAAK,OAAO,IAAI,eAAe,KAAK,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAA;IAC/I,sGAAsG;IACtG,MAAM,oBAAoB,GAAkB,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAA;IAEpG,kEAAkE;IAClE,MAAM,SAAS,GAAG,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;IAE9E,+CAA+C;IAC/C,+FAA+F;IAC/F,IAAI,OAAO,GAAa,EAAE,CAAA;IAC1B,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;IAC3C,IAAI,aAAa,IAAI,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;QACrD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAA;YACnE,OAAO,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAA;QACrC,CAAC;QAAC,MAAM,CAAC;YACP,yEAAyE;YACzE,OAAO,GAAG,EAAE,CAAA;QACd,CAAC;IACH,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,iFAAiF;QACjF,OAAO,GAAG,SAAS,CAAA;IACrB,CAAC;IAED,sBAAsB;IACtB,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;IAE9D,OAAO;QACL,KAAK;QACL,WAAW,EAAE,WAAW,IAAI,IAAI;QAChC,cAAc,EAAE,YAAY,IAAI,IAAI;QACpC,QAAQ,EAAE,oBAAoB,IAAI,IAAI;KACvC,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,IAAmB,EACnB,OAA8B,EAC9B,OAA2B;IAE3B,MAAM,OAAO,GAAa,EAAE,CAAA;IAC5B,MAAM,SAAS,GAAmB,EAAE,CAAA;IACpC,MAAM,OAAO,GAAa,EAAE,CAAA;IAE5B,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAA;IAExC,8CAA8C;IAC9C,IAAI,CAAC,QAAQ,EAAE,QAAQ,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC;QAC5C,OAAO,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAA;IACjE,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;YAC3D,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAClB,OAAO,CAAC,IAAI,CAAC,mBAAmB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAC3D,MAAM,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;gBACjC,+DAA+D;gBAC/D,qDAAqD;gBACrD,OAAO,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,2BAA2B,IAAI,CAAC,IAAI,EAAE,CAAA;YAC/F,CAAC,CAAC,CAAA;YACF,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAClB,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,YAAY,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QACpF,CAAC;IACH,CAAC;IAED,mCAAmC;IACnC,IAAI,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,CAAC;YACH,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;YAC5D,OAAO,CAAC,IAAI,CAAC,qBAAqB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;QACvD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,2BAA2B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QACnG,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,OAAO,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAA;QACnD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC;gBACH,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;gBAC7E,OAAO,CAAC,IAAI,CAAC,gBAAgB,OAAO,CAAC,WAAW,EAAE,CAAC,CAAA;YACrD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CAAC,iBAAiB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;YACzF,CAAC;QACH,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;QAC9C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC;gBACH,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;gBAC9E,OAAO,CAAC,IAAI,CAAC,mBAAmB,OAAO,CAAC,cAAc,EAAE,CAAC,CAAA;YAC3D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CAAC,kBAAkB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;YAC1F,CAAC;QACH,CAAC;IACH,CAAC;IAED,sDAAsD;IACtD,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;IACpE,IAAI,OAAO,CAAC,WAAW,KAAK,WAAW,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;QACtE,OAAO,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAA;IACjD,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAClC,OAAO,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAA;IAClD,CAAC;IACD,MAAM,cAAc,GAAG,CAAC,cAAc,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IACzG,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,CAAC,IAAI,CAAC,WAAW,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAEnF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC;gBAAC,OAAO,EAAE,CAAA;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;IACnD,CAAC;IAED,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAA;IACpD,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC;QAClC,IAAI,EAAE,yBAAyB;QAC/B,OAAO,EAAE;YACP,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,IAAI;YAClC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,SAAS,CAAC,MAAM;YACxB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,OAAO;YACP,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACrC;KACF,CAAC,CAAA;IACF,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,CAAA;AAC5C,CAAC;AAED,0EAA0E;AAC1E,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAA8B;IACxE,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;IAC/B,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;IACjD,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAC5B,IAAI,QAAQ,GAAG,CAAC,CAAA;IAChB,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE,CAAC;QAChC,IAAI,CAAC;YAAC,OAAO,EAAE,CAAC;YAAC,QAAQ,EAAE,CAAA;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;IACtD,CAAC;IACD,OAAO;QACL,EAAE,EAAE,IAAI;QACR,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC;YAC3B,IAAI,EAAE,sBAAsB;YAC5B,OAAO,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE;SACpF,CAAC;KACH,CAAA;AACH,CAAC"}
+{"version":3,"file":"dsh-enforcement.js","sourceRoot":"","sources":["../../src/capability/dsh-enforcement.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,oBAAoB,EAA8B,MAAM,kCAAkC,CAAA;AA+CnG;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CAAC,KAAc;IACnD,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAA;IAC/B,MAAM,IAAI,GAAG,CAAC,IAAa,EAAE,SAAkB,EAAE,KAAa,EAAQ,EAAE;QACtE,IAAI,KAAK,GAAG,CAAC;YAAE,OAAM;QACrB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;gBAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACpC,OAAM;QACR,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,KAAK,MAAM,IAAI,IAAI,IAAI;gBAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA;YACpD,OAAM;QACR,CAAC;QACD,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,IAA+B,CAAA;YAC9C,gEAAgE;YAChE,iEAAiE;YACjE,IAAI,SAAS,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACjD,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;gBACtB,OAAM;YACR,CAAC;YACD,gDAAgD;YAChD,KAAK,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;gBACjE,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;oBAC9B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;oBACzB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;wBACzB,KAAK,MAAM,IAAI,IAAI,KAAK;4BAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA;oBACvD,CAAC;yBAAM,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBAC9C,mCAAmC;wBACnC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;4BAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;oBACxD,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA;oBAC/B,CAAC;oBACD,OAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAA;IACD,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IACrB,OAAO,CAAC,GAAG,KAAK,CAAC,CAAA;AACnB,CAAC;AAED,kEAAkE;AAClE,SAAS,eAAe,CAAC,KAAc;IACrC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,EAAE,CAAA;IACpD,OAAO,sBAAsB,CAAC,KAAK,CAAC,CAAA;AACtC,CAAC;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,2BAA2B,CAAA;AACpE,MAAM,CAAC,MAAM,sBAAsB,GAAG,mCAAmC,CAAA;AAEzE,mFAAmF;AACnF,MAAM,gBAAgB,GAAG,IAAI,OAAO,EAA0B,CAAA;AAE9D,SAAS,UAAU,CAAC,OAA8B;IAChD,OAAO,OAAO,CAAC,KAAK,CAAC,OAA4B,CAAA;AACnD,CAAC;AAID,SAAS,sBAAsB,CAAC,KAA6C;IAC3E,OAAO,OAAO,KAAK,EAAE,QAAQ,KAAK,UAAU,IAAI,OAAO,KAAK,EAAE,KAAK,KAAK,UAAU,CAAA;AACpF,CAAC;AAYD;;;GAGG;AACH,SAAS,gBAAgB,CAAC,OAA8B,EAAE,SAAkC;IAC1F,IAAI,QAAQ,GAAG,CAAC,CAAA;IAChB,MAAM,QAAQ,GAAsB,EAAE,CAAA;IACtC,MAAM,SAAS,GAAmB,EAAE,CAAA;IACpC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QACnC,IAAI,CAAC;YACH,OAAO,EAAE,CAAA;YACT,QAAQ,EAAE,CAAA;QACZ,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,QAAQ,CAAC,IAAI,CAAC;gBACZ,KAAK;gBACL,MAAM,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC/D,CAAC,CAAA;YACF,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACzB,CAAC;IACH,CAAC,CAAC,CAAA;IACF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC;QAAE,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAA;;QACzE,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;IACjD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAA;AAC/B,CAAC;AAID,wCAAwC;AACxC,SAAS,sBAAsB,CAC7B,OAA8B,EAC9B,UAAkB,EAClB,IAAY,EACZ,KAAa,EACb,QAAgB;IAEhB,MAAM,MAAM,GAAG,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAC1D,OAAO,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,KAAmB,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,QAAQ,CAAC,CAAA;AAC3I,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAA8B,EAAE,IAAyB;IAChG,MAAM,MAAM,GAAG,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAC1D,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;IAClG,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,CAAA;IACnE,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAA;IACvE,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,mBAAmB,CAAC,CAAA;IACvE,MAAM,cAAc,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;IACjH,MAAM,eAAe,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAA;IACvH,MAAM,aAAa,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,SAAS,CAAA;IAC/G,MAAM,WAAW,GAAyC,cAAc,KAAK,WAAW,IAAI,cAAc,KAAK,iBAAiB,IAAI,cAAc,KAAK,oBAAoB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAA;IACnM,MAAM,YAAY,GAA4C,eAAe,KAAK,OAAO,IAAI,eAAe,KAAK,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAA;IAC/I,sGAAsG;IACtG,MAAM,oBAAoB,GAAkB,OAAO,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAA;IAEpG,mEAAmE;IACnE,2DAA2D;IAC3D,+CAA+C;IAC/C,MAAM,SAAS,GAAG,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC;QAC/D,CAAC,CAAC,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC;QAC9D,CAAC,CAAC,EAAE,CAAA;IAEN,+CAA+C;IAC/C,+FAA+F;IAC/F,IAAI,OAAO,GAAa,EAAE,CAAA;IAC1B,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;IAC3C,IAAI,aAAa,IAAI,IAAI,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC;QACrD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAA;YACnE,OAAO,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAA;QACrC,CAAC;QAAC,MAAM,CAAC;YACP,yEAAyE;YACzE,OAAO,GAAG,EAAE,CAAA;QACd,CAAC;IACH,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,iFAAiF;QACjF,OAAO,GAAG,SAAS,CAAA;IACrB,CAAC;IAED,sBAAsB;IACtB,MAAM,KAAK,GAAG,sBAAsB,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC;QAC3D,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClD,CAAC,CAAC,EAAE,CAAA;IAEN,OAAO;QACL,KAAK;QACL,WAAW,EAAE,WAAW,IAAI,IAAI;QAChC,cAAc,EAAE,YAAY,IAAI,IAAI;QACpC,QAAQ,EAAE,oBAAoB,IAAI,IAAI;KACvC,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,IAAmB,EACnB,OAA8B,EAC9B,OAA2B;IAE3B,MAAM,OAAO,GAAa,EAAE,CAAA;IAC5B,MAAM,SAAS,GAAmB,EAAE,CAAA;IACpC,MAAM,OAAO,GAAa,EAAE,CAAA;IAE5B,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAA;IACxC,MAAM,YAAY,GAAG,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAChE,IAAI,YAAY,KAAK,IAAI;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,8DAA8D,CAAC,EAAE,CAAA;IAC9I,MAAM,gBAAgB,GAAG,YAAY,CAAC,MAAM,CAAA;IAE5C,8CAA8C;IAC9C,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtC,OAAO,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAA;IACjE,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;YAC3D,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAClB,OAAO,CAAC,IAAI,CAAC,mBAAmB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAC3D,MAAM,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;gBACjC,+DAA+D;gBAC/D,qDAAqD;gBACrD,OAAO,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,2BAA2B,IAAI,CAAC,IAAI,EAAE,CAAA;YAC/F,CAAC,CAAC,CAAA;YACF,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAClB,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,YAAY,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QACpF,CAAC;IACH,CAAC;IAED,mCAAmC;IACnC,MAAM,UAAU,GAAG,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;IACtF,IAAI,iBAAiB,GAAG,KAAK,CAAA;IAC7B,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAA;QAC1D,CAAC;QACD,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACpB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,QAAS,CAAC,CAAA;gBAC7D,iBAAiB,GAAG,IAAI,CAAA;YAC1B,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,2BAA2B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QACnG,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,OAAO,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAA;QACnD,CAAC;aAAM,CAAC;YACN,IAAI,CAAC;gBACH,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;YAC/E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CAAC,iBAAiB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;YACzF,CAAC;QACH,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;QAC9C,CAAC;aAAM,CAAC;YACN,IAAI,CAAC;gBACH,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;YAChF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CAAC,kBAAkB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;YAC1F,CAAC;QACH,CAAC;IACH,CAAC;IAED,+CAA+C;IAC/C,0EAA0E;IAC1E,gDAAgD;IAChD,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAC1H,IAAI,mBAAmB,IAAI,CAAC,UAAU,EAAE,CAAC;QACvC,OAAO,CAAC,IAAI,CAAC,gBAAgB,OAAO,CAAC,WAAW,EAAE,CAAC,CAAA;IACrD,CAAC;SAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACvB,OAAO,CAAC,IAAI,CAAC,6BAA6B,OAAO,CAAC,WAAW,+BAA+B,CAAC,CAAA;IAC/F,CAAC;IAED,MAAM,oBAAoB,GAAG,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IACnI,IAAI,oBAAoB,IAAI,CAAC,UAAU,EAAE,CAAC;QACxC,OAAO,CAAC,IAAI,CAAC,mBAAmB,OAAO,CAAC,cAAc,EAAE,CAAC,CAAA;IAC3D,CAAC;SAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACvB,OAAO,CAAC,IAAI,CAAC,gCAAgC,OAAO,CAAC,cAAc,+BAA+B,CAAC,CAAA;IACrG,CAAC;IAED,IAAI,iBAAiB,EAAE,CAAC;QACtB,MAAM,kBAAkB,GAAG,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAS,CAAC,CAAA;QAC9H,IAAI,kBAAkB;YAAE,OAAO,CAAC,IAAI,CAAC,qBAAqB,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;aACxE,IAAI,CAAC,UAAU;YAAE,OAAO,CAAC,IAAI,CAAC,uCAAuC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC/F,CAAC;IAED,IAAI,OAAO,GAA+E;QACxF,WAAW,EAAE,IAAI;QACjB,cAAc,EAAE,IAAI;QACpB,QAAQ,EAAE,IAAI;KACf,CAAA;IACD,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAA;QACrD,OAAO,GAAG;YACR,WAAW,EAAE,WAAW,CAAC,WAAW;YACpC,cAAc,EAAE,WAAW,CAAC,cAAc;YAC1C,QAAQ,EAAE,WAAW,CAAC,QAAQ;SAC/B,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,oCAAoC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAC5G,CAAC;IACD,IAAI,OAAO,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC;QAChD,OAAO,CAAC,IAAI,CAAC,2BAA2B,OAAO,CAAC,WAAW,IAAI,MAAM,QAAQ,OAAO,CAAC,WAAW,MAAM,CAAC,CAAA;IACzG,CAAC;IACD,IAAI,OAAO,CAAC,cAAc,KAAK,OAAO,CAAC,cAAc,EAAE,CAAC;QACtD,OAAO,CAAC,IAAI,CAAC,4BAA4B,OAAO,CAAC,cAAc,IAAI,MAAM,QAAQ,OAAO,CAAC,cAAc,MAAM,CAAC,CAAA;IAChH,CAAC;IACD,IAAI,UAAU,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC;QACxD,OAAO,CAAC,IAAI,CAAC,qCAAqC,OAAO,CAAC,QAAQ,IAAI,MAAM,QAAQ,OAAO,CAAC,QAAQ,MAAM,CAAC,CAAA;IAC7G,CAAC;IAED,MAAM,cAAc,GAAG;QACrB,mBAAmB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI;QAC3C,oBAAoB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI;QAC/C,iBAAiB,IAAI,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAS,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI;KACtJ,CAAC,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;IACjD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,CAAC,IAAI,CAAC,WAAW,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACnF,IAAI,UAAU,IAAI,iBAAiB,IAAI,CAAC,mBAAmB,IAAI,CAAC,oBAAoB,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAS,CAAC,EAAE,CAAC;QAC7L,4EAA4E;QAC5E,oEAAoE;QACpE,OAAO,CAAC,IAAI,CAAC,qBAAqB,OAAO,CAAC,QAAQ,4BAA4B,CAAC,CAAA;IACjF,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;QAChD,IAAI,CAAC;YAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAA;QAAC,CAAC;QAC1I,OAAO,KAAK,EAAE,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,eAAe,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAAC,CAAC;IACzG,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAA;QACpD,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QACpD,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,IAAI,CAAC,gBAAgB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACnH,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;IACnD,CAAC;IAED,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAA;IACpD,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC;QAClC,IAAI,EAAE,yBAAyB;QAC/B,OAAO,EAAE;YACP,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,IAAI;YAClC,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,SAAS,CAAC,MAAM;YACxB,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,OAAO;YACP,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACrC;KACF,CAAC,CAAA;IACF,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,CAAA;AAC5C,CAAC;AAED,0EAA0E;AAC1E,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAA8B;IACxE,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;IAC/B,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;IACjD,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;IACpD,OAAO;QACL,EAAE,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;QACjC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC;YAC3B,IAAI,EAAE,sBAAsB;YAC5B,OAAO,EAAE;gBACP,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAC/B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aAC7B;SACF,CAAC;KACH,CAAA;AACH,CAAC"}

package/lib/capability/resolver.js

@@ -22,13 +22,23 @@ export function resolveEffectiveCapability(input) {
     const deniedReasons = [];
     if (ceiling === null) {
         // B-4/B-7：NULL ceiling 的王国不得进入 GOVERNED_PERSISTENT（交集为空，全部拒绝）
-        for (const cap of Object.keys(requirement)) {
+        const relevant = new Set([
+            ...Object.keys(requirement),
+            ...Object.keys(grant).filter(cap => grant[cap] === true),
+        ]);
+        for (const cap of relevant) {
             deniedReasons.push(`${cap}: kingdom 未配置 capability ceiling（B-7：NULL ceiling 不得进入 GOVERNED_PERSISTENT）`);
         }
         return { effective, coverage: 'NONE', deniedReasons };
     }
     const required = Object.keys(requirement).filter(cap => requirement[cap] === true);
-    for (const cap of required) {
+    // Requirement 只用于 coverage 观察；effective 的候选域来自本次 Grant，
+    // 再与 Owner Ceiling 和 context-bound EnforceableSet 求交集。
+    const candidates = new Set([
+        ...required,
+        ...Object.keys(grant).filter(cap => grant[cap] === true),
+    ]);
+    for (const cap of candidates) {
         const granted = grant[cap] === true;
         const ceilingOk = ceiling[cap] === true;
         const enforceableNow = isEnforceable(cap, enforceable);
@@ -49,12 +59,15 @@ export function resolveEffectiveCapability(input) {
     let coverage;
     if (required.length === 0)
         coverage = 'NONE';
-    else if (Object.keys(effective).length === required.length)
-        coverage = 'FULL';
-    else if (Object.keys(effective).length > 0)
-        coverage = 'PARTIAL';
-    else
-        coverage = 'NONE';
+    else {
+        const covered = required.filter(cap => effective[cap] === true).length;
+        if (covered === required.length)
+            coverage = 'FULL';
+        else if (covered > 0)
+            coverage = 'PARTIAL';
+        else
+            coverage = 'NONE';
+    }
     return { effective, coverage, deniedReasons };
 }
 /** 从 effective 集构建 EnforcementPlan 的 tool 面（tool:<name> → name）。 */

package/lib/capability/resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/capability/resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/capability/resolver.ts"],"names":[],"mappings":"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"}