@principles/core 1.270.5 → 1.272.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/dist/runtime-v2/__tests__/admission-gate.test.js +23 -6
- package/dist/runtime-v2/__tests__/admission-gate.test.js.map +1 -1
- package/dist/runtime-v2/__tests__/adversarial-loop.test.js +22 -0
- package/dist/runtime-v2/__tests__/adversarial-loop.test.js.map +1 -1
- package/dist/runtime-v2/__tests__/context-payload-validation.test.js +1 -1
- package/dist/runtime-v2/__tests__/context-payload-validation.test.js.map +1 -1
- package/dist/runtime-v2/__tests__/evaluator-repair-loop.test.js +20 -0
- package/dist/runtime-v2/__tests__/evaluator-repair-loop.test.js.map +1 -1
- package/dist/runtime-v2/__tests__/evidence-guards.test.js +2 -2
- package/dist/runtime-v2/__tests__/evidence-guards.test.js.map +1 -1
- package/dist/runtime-v2/__tests__/golden-path-diagnostician-e2e.test.js +1 -1
- package/dist/runtime-v2/__tests__/golden-path-diagnostician-e2e.test.js.map +1 -1
- package/dist/runtime-v2/__tests__/governance-experience.test.js +19 -0
- package/dist/runtime-v2/__tests__/governance-experience.test.js.map +1 -1
- package/dist/runtime-v2/__tests__/pain-evidence-contract.test.js +3 -3
- package/dist/runtime-v2/__tests__/pain-evidence-contract.test.js.map +1 -1
- package/dist/runtime-v2/__tests__/pain-signal-bridge-result-shaping.test.js +1 -1
- package/dist/runtime-v2/__tests__/pain-signal-bridge-result-shaping.test.js.map +1 -1
- package/dist/runtime-v2/__tests__/rollout-reviewer-verdict-paths.test.js +26 -5
- package/dist/runtime-v2/__tests__/rollout-reviewer-verdict-paths.test.js.map +1 -1
- package/dist/runtime-v2/__tests__/rollout-rule-candidate-contract.test.d.ts +2 -0
- package/dist/runtime-v2/__tests__/rollout-rule-candidate-contract.test.d.ts.map +1 -0
- package/dist/runtime-v2/__tests__/rollout-rule-candidate-contract.test.js +243 -0
- package/dist/runtime-v2/__tests__/rollout-rule-candidate-contract.test.js.map +1 -0
- package/dist/runtime-v2/admission-gate.d.ts +8 -1
- package/dist/runtime-v2/admission-gate.d.ts.map +1 -1
- package/dist/runtime-v2/admission-gate.js +14 -0
- package/dist/runtime-v2/admission-gate.js.map +1 -1
- package/dist/runtime-v2/context-payload.d.ts +9 -3
- package/dist/runtime-v2/context-payload.d.ts.map +1 -1
- package/dist/runtime-v2/context-payload.js +3 -1
- package/dist/runtime-v2/context-payload.js.map +1 -1
- package/dist/runtime-v2/evidence-triage/__tests__/observation-resolver.test.js +2 -2
- package/dist/runtime-v2/evidence-triage/__tests__/observation-resolver.test.js.map +1 -1
- package/dist/runtime-v2/evidence-triage/observation-resolver.d.ts +1 -1
- package/dist/runtime-v2/evidence-triage/observation-resolver.d.ts.map +1 -1
- package/dist/runtime-v2/evidence-triage/observation-resolver.js +2 -2
- package/dist/runtime-v2/evidence-triage/observation-resolver.js.map +1 -1
- package/dist/runtime-v2/evidence-triage/types.d.ts +1 -1
- package/dist/runtime-v2/evidence-triage/types.d.ts.map +1 -1
- package/dist/runtime-v2/evolution/evolution-types.d.ts +8 -4
- package/dist/runtime-v2/evolution/evolution-types.d.ts.map +1 -1
- package/dist/runtime-v2/evolution/evolution-types.js +3 -1
- package/dist/runtime-v2/evolution/evolution-types.js.map +1 -1
- package/dist/runtime-v2/governance-experience-contract.d.ts +16 -16
- package/dist/runtime-v2/governance-experience-contract.d.ts.map +1 -1
- package/dist/runtime-v2/governance-experience-contract.js +4 -1
- package/dist/runtime-v2/governance-experience-contract.js.map +1 -1
- package/dist/runtime-v2/governance-experience.d.ts.map +1 -1
- package/dist/runtime-v2/governance-experience.js +30 -8
- package/dist/runtime-v2/governance-experience.js.map +1 -1
- package/dist/runtime-v2/index.d.ts +11 -1
- package/dist/runtime-v2/index.d.ts.map +1 -1
- package/dist/runtime-v2/index.js +7 -0
- package/dist/runtime-v2/index.js.map +1 -1
- package/dist/runtime-v2/internalization/__tests__/artificer-code-bearing.test.d.ts +2 -0
- package/dist/runtime-v2/internalization/__tests__/artificer-code-bearing.test.d.ts.map +1 -0
- package/dist/runtime-v2/internalization/__tests__/artificer-code-bearing.test.js +114 -0
- package/dist/runtime-v2/internalization/__tests__/artificer-code-bearing.test.js.map +1 -0
- package/dist/runtime-v2/internalization/__tests__/evaluator-gate-authority.test.d.ts +2 -0
- package/dist/runtime-v2/internalization/__tests__/evaluator-gate-authority.test.d.ts.map +1 -0
- package/dist/runtime-v2/internalization/__tests__/evaluator-gate-authority.test.js +256 -0
- package/dist/runtime-v2/internalization/__tests__/evaluator-gate-authority.test.js.map +1 -0
- package/dist/runtime-v2/internalization/__tests__/evaluator-prompt-builder.test.js +1 -1
- package/dist/runtime-v2/internalization/__tests__/internalization-transition-decision.test.js +15 -14
- package/dist/runtime-v2/internalization/__tests__/internalization-transition-decision.test.js.map +1 -1
- package/dist/runtime-v2/internalization/__tests__/owner-decision-architecture.test.d.ts +2 -0
- package/dist/runtime-v2/internalization/__tests__/owner-decision-architecture.test.d.ts.map +1 -0
- package/dist/runtime-v2/internalization/__tests__/owner-decision-architecture.test.js +56 -0
- package/dist/runtime-v2/internalization/__tests__/owner-decision-architecture.test.js.map +1 -0
- package/dist/runtime-v2/internalization/__tests__/owner-decision-review.test.d.ts +2 -0
- package/dist/runtime-v2/internalization/__tests__/owner-decision-review.test.d.ts.map +1 -0
- package/dist/runtime-v2/internalization/__tests__/owner-decision-review.test.js +229 -0
- package/dist/runtime-v2/internalization/__tests__/owner-decision-review.test.js.map +1 -0
- package/dist/runtime-v2/internalization/__tests__/owner-decision.test.d.ts +2 -0
- package/dist/runtime-v2/internalization/__tests__/owner-decision.test.d.ts.map +1 -0
- package/dist/runtime-v2/internalization/__tests__/owner-decision.test.js +1054 -0
- package/dist/runtime-v2/internalization/__tests__/owner-decision.test.js.map +1 -0
- package/dist/runtime-v2/internalization/__tests__/owner-override-resume.test.d.ts +2 -0
- package/dist/runtime-v2/internalization/__tests__/owner-override-resume.test.d.ts.map +1 -0
- package/dist/runtime-v2/internalization/__tests__/owner-override-resume.test.js +328 -0
- package/dist/runtime-v2/internalization/__tests__/owner-override-resume.test.js.map +1 -0
- package/dist/runtime-v2/internalization/__tests__/rule-activation-contract.test.d.ts +2 -0
- package/dist/runtime-v2/internalization/__tests__/rule-activation-contract.test.d.ts.map +1 -0
- package/dist/runtime-v2/internalization/__tests__/rule-activation-contract.test.js +187 -0
- package/dist/runtime-v2/internalization/__tests__/rule-activation-contract.test.js.map +1 -0
- package/dist/runtime-v2/internalization/artificer-code-bearing.d.ts +39 -0
- package/dist/runtime-v2/internalization/artificer-code-bearing.d.ts.map +1 -0
- package/dist/runtime-v2/internalization/artificer-code-bearing.js +33 -0
- package/dist/runtime-v2/internalization/artificer-code-bearing.js.map +1 -0
- package/dist/runtime-v2/internalization/evaluator-output.d.ts +63 -2
- package/dist/runtime-v2/internalization/evaluator-output.d.ts.map +1 -1
- package/dist/runtime-v2/internalization/evaluator-output.js +139 -2
- package/dist/runtime-v2/internalization/evaluator-output.js.map +1 -1
- package/dist/runtime-v2/internalization/evaluator-prompt-builder.d.ts +54 -2
- package/dist/runtime-v2/internalization/evaluator-prompt-builder.d.ts.map +1 -1
- package/dist/runtime-v2/internalization/evaluator-prompt-builder.js +49 -2
- package/dist/runtime-v2/internalization/evaluator-prompt-builder.js.map +1 -1
- package/dist/runtime-v2/internalization/evaluator-runner.d.ts +45 -8
- package/dist/runtime-v2/internalization/evaluator-runner.d.ts.map +1 -1
- package/dist/runtime-v2/internalization/evaluator-runner.js +465 -43
- package/dist/runtime-v2/internalization/evaluator-runner.js.map +1 -1
- package/dist/runtime-v2/internalization/index.d.ts +2 -0
- package/dist/runtime-v2/internalization/index.d.ts.map +1 -1
- package/dist/runtime-v2/internalization/index.js +1 -0
- package/dist/runtime-v2/internalization/index.js.map +1 -1
- package/dist/runtime-v2/internalization/internalization-orchestrator.d.ts.map +1 -1
- package/dist/runtime-v2/internalization/internalization-orchestrator.js +10 -54
- package/dist/runtime-v2/internalization/internalization-orchestrator.js.map +1 -1
- package/dist/runtime-v2/internalization/internalization-transition-decision.d.ts +7 -1
- package/dist/runtime-v2/internalization/internalization-transition-decision.d.ts.map +1 -1
- package/dist/runtime-v2/internalization/internalization-transition-decision.js +9 -2
- package/dist/runtime-v2/internalization/internalization-transition-decision.js.map +1 -1
- package/dist/runtime-v2/internalization/owner-decision-review.d.ts +98 -0
- package/dist/runtime-v2/internalization/owner-decision-review.d.ts.map +1 -0
- package/dist/runtime-v2/internalization/owner-decision-review.js +287 -0
- package/dist/runtime-v2/internalization/owner-decision-review.js.map +1 -0
- package/dist/runtime-v2/internalization/owner-resolution-service.d.ts +100 -0
- package/dist/runtime-v2/internalization/owner-resolution-service.d.ts.map +1 -0
- package/dist/runtime-v2/internalization/owner-resolution-service.js +385 -0
- package/dist/runtime-v2/internalization/owner-resolution-service.js.map +1 -0
- package/dist/runtime-v2/internalization/owner-retry.d.ts +12 -0
- package/dist/runtime-v2/internalization/owner-retry.d.ts.map +1 -1
- package/dist/runtime-v2/internalization/owner-retry.js +23 -0
- package/dist/runtime-v2/internalization/owner-retry.js.map +1 -1
- package/dist/runtime-v2/internalization/owner-review.d.ts +199 -0
- package/dist/runtime-v2/internalization/owner-review.d.ts.map +1 -0
- package/dist/runtime-v2/internalization/owner-review.js +470 -0
- package/dist/runtime-v2/internalization/owner-review.js.map +1 -0
- package/dist/runtime-v2/internalization/peer-runner-contracts.d.ts +5 -1
- package/dist/runtime-v2/internalization/peer-runner-contracts.d.ts.map +1 -1
- package/dist/runtime-v2/internalization/peer-runner-contracts.js.map +1 -1
- package/dist/runtime-v2/internalization/pitask-metadata.d.ts +84 -0
- package/dist/runtime-v2/internalization/pitask-metadata.d.ts.map +1 -1
- package/dist/runtime-v2/internalization/pitask-metadata.js +166 -0
- package/dist/runtime-v2/internalization/pitask-metadata.js.map +1 -1
- package/dist/runtime-v2/internalization/revision-reopen.d.ts +56 -0
- package/dist/runtime-v2/internalization/revision-reopen.d.ts.map +1 -0
- package/dist/runtime-v2/internalization/revision-reopen.js +144 -0
- package/dist/runtime-v2/internalization/revision-reopen.js.map +1 -0
- package/dist/runtime-v2/internalization/rollout-reviewer-runner.d.ts +25 -0
- package/dist/runtime-v2/internalization/rollout-reviewer-runner.d.ts.map +1 -1
- package/dist/runtime-v2/internalization/rollout-reviewer-runner.js +202 -23
- package/dist/runtime-v2/internalization/rollout-reviewer-runner.js.map +1 -1
- package/dist/runtime-v2/internalization/rule-activation-contract.d.ts +35 -0
- package/dist/runtime-v2/internalization/rule-activation-contract.d.ts.map +1 -0
- package/dist/runtime-v2/internalization/rule-activation-contract.js +36 -0
- package/dist/runtime-v2/internalization/rule-activation-contract.js.map +1 -0
- package/dist/runtime-v2/pain-signal-bridge.d.ts +2 -0
- package/dist/runtime-v2/pain-signal-bridge.d.ts.map +1 -1
- package/dist/runtime-v2/pain-signal-bridge.js +4 -3
- package/dist/runtime-v2/pain-signal-bridge.js.map +1 -1
- package/dist/runtime-v2/pain-to-principle-service.d.ts +1 -0
- package/dist/runtime-v2/pain-to-principle-service.d.ts.map +1 -1
- package/dist/runtime-v2/pain-to-principle-service.js +1 -0
- package/dist/runtime-v2/pain-to-principle-service.js.map +1 -1
- package/dist/runtime-v2/runner/__tests__/pain-signal-bridge-admission.test.js +6 -6
- package/dist/runtime-v2/runner/__tests__/pain-signal-bridge-admission.test.js.map +1 -1
- package/dist/runtime-v2/store/context/sqlite-context-assembler.d.ts.map +1 -1
- package/dist/runtime-v2/store/context/sqlite-context-assembler.js +25 -5
- package/dist/runtime-v2/store/context/sqlite-context-assembler.js.map +1 -1
- package/dist/runtime-v2/store/context/sqlite-context-assembler.test.js +39 -9
- package/dist/runtime-v2/store/context/sqlite-context-assembler.test.js.map +1 -1
- package/dist/runtime-v2/store/runtime-state-manager.d.ts +12 -0
- package/dist/runtime-v2/store/runtime-state-manager.d.ts.map +1 -1
- package/dist/runtime-v2/store/runtime-state-manager.js +17 -0
- package/dist/runtime-v2/store/runtime-state-manager.js.map +1 -1
- package/dist/runtime-v2/store/task/__tests__/sqlite-task-store-cas.test.d.ts +2 -0
- package/dist/runtime-v2/store/task/__tests__/sqlite-task-store-cas.test.d.ts.map +1 -0
- package/dist/runtime-v2/store/task/__tests__/sqlite-task-store-cas.test.js +114 -0
- package/dist/runtime-v2/store/task/__tests__/sqlite-task-store-cas.test.js.map +1 -0
- package/dist/runtime-v2/store/task/memory-task-store.d.ts +1 -0
- package/dist/runtime-v2/store/task/memory-task-store.d.ts.map +1 -1
- package/dist/runtime-v2/store/task/memory-task-store.js +8 -0
- package/dist/runtime-v2/store/task/memory-task-store.js.map +1 -1
- package/dist/runtime-v2/store/task/sqlite-task-store.d.ts +20 -0
- package/dist/runtime-v2/store/task/sqlite-task-store.d.ts.map +1 -1
- package/dist/runtime-v2/store/task/sqlite-task-store.js +81 -0
- package/dist/runtime-v2/store/task/sqlite-task-store.js.map +1 -1
- package/dist/runtime-v2/store/task/task-store.d.ts +9 -0
- package/dist/runtime-v2/store/task/task-store.d.ts.map +1 -1
- package/dist/runtime-v2/store/workspace-isolation.test.js +1 -0
- package/dist/runtime-v2/store/workspace-isolation.test.js.map +1 -1
- package/dist/runtime-v2/task-status.d.ts +2 -1
- package/dist/runtime-v2/task-status.d.ts.map +1 -1
- package/dist/runtime-v2/task-status.js +5 -1
- package/dist/runtime-v2/task-status.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,385 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* owner-resolution-service.ts — PRI-629 Owner 裁决的应用层(Console/CLI 共用)。
|
|
3
|
+
*
|
|
4
|
+
* 职责: 校验 reviewKey(stale 防护)→ CAS 写入 OwnerResolutionRecord →
|
|
5
|
+
* 按动作分派:
|
|
6
|
+
* - accept_current / reject_current (verdict override): 写 pending resolution
|
|
7
|
+
* 并把任务原子翻回 pending(保留 runnerDecision/completionIntent — 与
|
|
8
|
+
* owner-retry 的 authority reset 相反);实际效果由 runner 的入口恢复门
|
|
9
|
+
* 在 LLM 之前应用(SPEC §10: pending Owner Resolution 优先于 pending
|
|
10
|
+
* Completion Intent 优先于 normal LLM invocation)。
|
|
11
|
+
* - revise_once: 解析修订目标 → 以 resolution-scoped causeId reopen
|
|
12
|
+
* (幂等)→ 标 applied。不开自动预算,repairIteration 不变(SPEC §11)。
|
|
13
|
+
*
|
|
14
|
+
* 并发语义(SPEC §7): same reviewKey + same action → idempotent success;
|
|
15
|
+
* same reviewKey + different action → already_resolved;全部经
|
|
16
|
+
* updateTaskIfDiagnosticJsonUnchanged 单 SQL conditional mutation。
|
|
17
|
+
*/
|
|
18
|
+
import { createHash } from 'node:crypto';
|
|
19
|
+
import { hydratePITaskRecord, createPITaskDiagnosticJson, mergePITaskMetadata, } from './pitask-metadata.js';
|
|
20
|
+
import { collectOwnerDecisionFacts, computeArtifactContentHash, deriveOwnerDecisionCapability, effectiveDecisionFor, findOwnerResolutionForCurrentEpoch, } from './owner-review.js';
|
|
21
|
+
import { buildOwnerDecisionReview, } from './owner-decision-review.js';
|
|
22
|
+
import { reopenTaskForRevision, resolveRolloutRevisionTarget } from './revision-reopen.js';
|
|
23
|
+
const CAS_ATTEMPTS = 3;
|
|
24
|
+
const OWNER_INSTRUCTION_MAX_CHARS = 500;
|
|
25
|
+
/** RuntimeStateManager → OwnerDecisionFactStore 的窄适配(pi artifacts 经专用 store)。 */
|
|
26
|
+
export function factStoreFromStateManager(stateManager) {
|
|
27
|
+
return {
|
|
28
|
+
getTask: (taskId) => stateManager.getTask(taskId),
|
|
29
|
+
listArtifactsBySourceTask: async (taskId) => {
|
|
30
|
+
const artifacts = await stateManager.piArtifactStore.listBySourceTaskId(taskId);
|
|
31
|
+
return artifacts.map((a) => ({
|
|
32
|
+
artifactId: a.artifactId,
|
|
33
|
+
artifactKind: a.artifactKind,
|
|
34
|
+
validationStatus: a.validationStatus,
|
|
35
|
+
contentJson: a.contentJson,
|
|
36
|
+
sourceTaskId: a.sourceTaskId,
|
|
37
|
+
lineageArtifactIds: a.lineageArtifactIds,
|
|
38
|
+
createdAt: a.createdAt,
|
|
39
|
+
}));
|
|
40
|
+
},
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
export function reviewStoreFromStateManager(stateManager) {
|
|
44
|
+
return {
|
|
45
|
+
...factStoreFromStateManager(stateManager),
|
|
46
|
+
getArtifactById: async (artifactId) => {
|
|
47
|
+
const artifact = await stateManager.piArtifactStore.getArtifactById(artifactId);
|
|
48
|
+
return artifact ? {
|
|
49
|
+
artifactId: artifact.artifactId,
|
|
50
|
+
artifactKind: artifact.artifactKind,
|
|
51
|
+
validationStatus: artifact.validationStatus,
|
|
52
|
+
contentJson: artifact.contentJson,
|
|
53
|
+
sourceTaskId: artifact.sourceTaskId,
|
|
54
|
+
lineageArtifactIds: artifact.lineageArtifactIds,
|
|
55
|
+
createdAt: artifact.createdAt,
|
|
56
|
+
} : null;
|
|
57
|
+
},
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
async function captureEvidencePreconditions(stateManager, review) {
|
|
61
|
+
const preconditions = [];
|
|
62
|
+
for (const source of review.evidence.manifest.sources) {
|
|
63
|
+
const artifact = await stateManager.piArtifactStore.getArtifactById(source.stableId);
|
|
64
|
+
if (!artifact || computeArtifactContentHash(artifact.contentJson) !== source.contentHash) {
|
|
65
|
+
return null;
|
|
66
|
+
}
|
|
67
|
+
preconditions.push({
|
|
68
|
+
artifactId: artifact.artifactId,
|
|
69
|
+
sourceTaskId: artifact.sourceTaskId,
|
|
70
|
+
lineageArtifactIdsJson: JSON.stringify(artifact.lineageArtifactIds),
|
|
71
|
+
contentJson: artifact.contentJson,
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
return preconditions;
|
|
75
|
+
}
|
|
76
|
+
/** revise_once 可选短指导的有界消毒(SPEC §13)— 仅作 revision feedback,非命令。 */
|
|
77
|
+
export function sanitizeOwnerInstruction(raw) {
|
|
78
|
+
if (typeof raw !== 'string')
|
|
79
|
+
return undefined;
|
|
80
|
+
// 控制字符替换为空格;截断到有界长度;空串 → undefined。
|
|
81
|
+
// eslint-disable-next-line no-control-regex -- 剥离控制字符正是本函数的目的(消毒不可信输入)
|
|
82
|
+
const cleaned = raw.replace(/[\u0000-\u001f\u007f]/g, ' ').trim();
|
|
83
|
+
if (!cleaned)
|
|
84
|
+
return undefined;
|
|
85
|
+
return cleaned.slice(0, OWNER_INSTRUCTION_MAX_CHARS);
|
|
86
|
+
}
|
|
87
|
+
/** reviewKey → 确定性 resolutionId(同 reviewKey 重放天然同 id)。 */
|
|
88
|
+
function resolutionIdFor(reviewKey) {
|
|
89
|
+
return `ores_${createHash('sha256').update(reviewKey, 'utf8').digest('hex').slice(0, 20)}`;
|
|
90
|
+
}
|
|
91
|
+
function resolvedOutcome(record, applied, _now) {
|
|
92
|
+
return {
|
|
93
|
+
status: 'resolved',
|
|
94
|
+
resolutionId: record.resolutionId,
|
|
95
|
+
reviewKey: record.reviewKey,
|
|
96
|
+
action: record.action,
|
|
97
|
+
applied,
|
|
98
|
+
...(record.effectiveDecision !== undefined ? { effectiveDecision: record.effectiveDecision } : {}),
|
|
99
|
+
...(record.targetTaskId !== undefined ? { targetTaskId: record.targetTaskId } : {}),
|
|
100
|
+
runnerWillApply: record.action !== 'revise_once' && !applied,
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
async function resolveReviseTarget(deps, piTask) {
|
|
104
|
+
if (!piTask)
|
|
105
|
+
return null;
|
|
106
|
+
if (piTask.taskKind === 'evaluator') {
|
|
107
|
+
// 最新 repair Artificer = 当前依赖链上的 artificer(budget 耗尽的那轮)
|
|
108
|
+
for (const depId of piTask.dependencyTaskIds) {
|
|
109
|
+
const dep = await deps.stateManager.getTask(depId);
|
|
110
|
+
if (dep?.taskKind === 'artificer')
|
|
111
|
+
return { taskId: dep.taskId };
|
|
112
|
+
}
|
|
113
|
+
return null;
|
|
114
|
+
}
|
|
115
|
+
const target = await resolveRolloutRevisionTarget((id) => deps.stateManager.getTask(id), piTask.taskId, piTask.channel ?? 'prompt');
|
|
116
|
+
return target ? { taskId: target.taskId } : null;
|
|
117
|
+
}
|
|
118
|
+
/**
|
|
119
|
+
* revise_once 的驱动/恢复:reopen(causeId 幂等)→ 标 applied。
|
|
120
|
+
* reopen 失败 → 回滚 pending 记录(恢复上一个 diagnosticJson),Owner 可重试。
|
|
121
|
+
*/
|
|
122
|
+
async function rollbackPendingResolution(stateManager, taskId, resolutionId) {
|
|
123
|
+
const raw = await stateManager.getTask(taskId);
|
|
124
|
+
const piTask = raw ? hydratePITaskRecord(raw) : null;
|
|
125
|
+
if (!piTask?.ownerResolutions)
|
|
126
|
+
return;
|
|
127
|
+
const filtered = piTask.ownerResolutions.filter((r) => r.resolutionId !== resolutionId);
|
|
128
|
+
if (filtered.length === piTask.ownerResolutions.length)
|
|
129
|
+
return;
|
|
130
|
+
await stateManager.updateTaskIfDiagnosticJsonUnchanged(taskId, raw?.diagnosticJson ?? null, {
|
|
131
|
+
diagnosticJson: createPITaskDiagnosticJson(mergePITaskMetadata(piTask, { ownerResolutions: filtered })),
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
async function driveReviseOnce(args) {
|
|
135
|
+
const { deps, taskId, record, now, reopen } = args;
|
|
136
|
+
const { stateManager } = deps;
|
|
137
|
+
const { targetTaskId } = record;
|
|
138
|
+
const causeId = record.targetRevisionCauseId ?? `owner-res-${record.resolutionId}`;
|
|
139
|
+
if (!targetTaskId) {
|
|
140
|
+
return { status: 'revise_target_unresolved' };
|
|
141
|
+
}
|
|
142
|
+
const reopenOutcome = await reopen(stateManager, targetTaskId, {
|
|
143
|
+
revisionCauseId: causeId,
|
|
144
|
+
revisionFeedback: record.ownerInstruction,
|
|
145
|
+
reason: 'owner_revise_once',
|
|
146
|
+
});
|
|
147
|
+
if (!reopenOutcome.ok) {
|
|
148
|
+
await rollbackPendingResolution(stateManager, taskId, record.resolutionId);
|
|
149
|
+
return { status: 'revise_reopen_failed', reason: reopenOutcome.reason };
|
|
150
|
+
}
|
|
151
|
+
// reopen 已 materialize → 标 applied(CAS;失败由重放收敛)
|
|
152
|
+
const fresh = await stateManager.getTask(taskId);
|
|
153
|
+
const freshPi = fresh ? hydratePITaskRecord(fresh) : null;
|
|
154
|
+
if (freshPi?.ownerResolutions) {
|
|
155
|
+
const updatedRecords = freshPi.ownerResolutions.map((r) => r.resolutionId === record.resolutionId
|
|
156
|
+
? { ...r, status: 'applied', appliedAt: now() }
|
|
157
|
+
: r);
|
|
158
|
+
const nextMeta = mergePITaskMetadata(freshPi, { ownerResolutions: updatedRecords });
|
|
159
|
+
const updated = await stateManager.updateTaskIfDiagnosticJsonUnchanged(taskId, fresh?.diagnosticJson ?? null, { diagnosticJson: createPITaskDiagnosticJson(nextMeta) });
|
|
160
|
+
if (updated) {
|
|
161
|
+
return {
|
|
162
|
+
status: 'resolved',
|
|
163
|
+
resolutionId: record.resolutionId,
|
|
164
|
+
reviewKey: record.reviewKey,
|
|
165
|
+
action: record.action,
|
|
166
|
+
applied: true,
|
|
167
|
+
targetTaskId,
|
|
168
|
+
runnerWillApply: false,
|
|
169
|
+
};
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
// applied 标记写失败 — reopen 幂等,重放会补标记
|
|
173
|
+
return {
|
|
174
|
+
status: 'resolved',
|
|
175
|
+
resolutionId: record.resolutionId,
|
|
176
|
+
reviewKey: record.reviewKey,
|
|
177
|
+
action: record.action,
|
|
178
|
+
applied: false,
|
|
179
|
+
targetTaskId,
|
|
180
|
+
runnerWillApply: false,
|
|
181
|
+
};
|
|
182
|
+
}
|
|
183
|
+
export async function applyOwnerResolution(deps, args) {
|
|
184
|
+
const { taskId, request, identity } = args;
|
|
185
|
+
const now = deps.now ?? (() => new Date().toISOString());
|
|
186
|
+
const reopen = deps.reopenTaskForRevision ?? reopenTaskForRevision;
|
|
187
|
+
const { stateManager } = deps;
|
|
188
|
+
// 1) Fresh durable facts + capability(不信任请求体中的任何事实断言)。
|
|
189
|
+
const facts = await collectOwnerDecisionFacts(factStoreFromStateManager(stateManager), taskId);
|
|
190
|
+
if (!facts) {
|
|
191
|
+
const raw = await stateManager.getTask(taskId);
|
|
192
|
+
if (!raw)
|
|
193
|
+
return { status: 'not_found' };
|
|
194
|
+
return { status: 'metadata_invalid' };
|
|
195
|
+
}
|
|
196
|
+
const capability = deriveOwnerDecisionCapability(facts);
|
|
197
|
+
const review = request.expectedEvidenceDigest !== undefined
|
|
198
|
+
? await buildOwnerDecisionReview(reviewStoreFromStateManager(stateManager), taskId)
|
|
199
|
+
: null;
|
|
200
|
+
const existingForEpoch = findOwnerResolutionForCurrentEpoch(facts.task);
|
|
201
|
+
if (!capability.eligible && !existingForEpoch) {
|
|
202
|
+
return { status: 'not_decision_capable', blockers: capability.blockers };
|
|
203
|
+
}
|
|
204
|
+
// P1 评审修复 (SPEC §9): 服务端强制 allowedActions——UI 隐藏不够,直接调
|
|
205
|
+
// API 也不得提交 allowedActions 之外的动作 (治理状态完整性)。幂等重放
|
|
206
|
+
// (已存在同 reviewKey resolution) 不受此限——重复同一动作仍返回 resolved。
|
|
207
|
+
if (!existingForEpoch && !capability.allowedActions.includes(request.action)) {
|
|
208
|
+
return {
|
|
209
|
+
status: 'not_decision_capable',
|
|
210
|
+
blockers: [`action_not_permitted:${request.action}`],
|
|
211
|
+
};
|
|
212
|
+
}
|
|
213
|
+
if (!existingForEpoch && request.expectedEvidenceDigest !== undefined) {
|
|
214
|
+
if (!review || review.evidence.digest !== request.expectedEvidenceDigest) {
|
|
215
|
+
return { status: 'stale_owner_decision' };
|
|
216
|
+
}
|
|
217
|
+
if (!review.capability.finalOfferedActions.includes(request.action)) {
|
|
218
|
+
return {
|
|
219
|
+
status: 'not_decision_capable',
|
|
220
|
+
blockers: [`action_not_permitted_by_evidence:${request.action}`],
|
|
221
|
+
};
|
|
222
|
+
}
|
|
223
|
+
if (request.action === 'accept_current'
|
|
224
|
+
&& review.capability.acceptRequirement.kind === 'acknowledge_partial_evidence'
|
|
225
|
+
&& request.acknowledgement?.kind !== 'partial_evidence') {
|
|
226
|
+
return { status: 'evidence_acknowledgement_required' };
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
// 2) Stale 防护 (SPEC §6/§28): 服务端重读 durable facts,逐字段比对请求的
|
|
230
|
+
// expected* 断言 + 重算 reviewKey。任一变化 → 409 stale — Owner 只能
|
|
231
|
+
// 批准自己实际看到的那个版本。已存在同 reviewKey resolution 的
|
|
232
|
+
// idempotent 重放放行到 CAS 段处理。
|
|
233
|
+
if (!existingForEpoch || existingForEpoch.reviewKey !== request.reviewKey) {
|
|
234
|
+
const artifact = facts.decisionArtifact;
|
|
235
|
+
const freshRunId = facts.task.humanReviewContext?.sourceRunId
|
|
236
|
+
?? facts.task.completionIntent?.sourceRunId ?? '';
|
|
237
|
+
const stale = capability.reviewKey !== request.reviewKey
|
|
238
|
+
|| (facts.task.revisionCount ?? 0) !== request.expectedRevisionEpoch
|
|
239
|
+
|| freshRunId !== request.expectedSourceRunId
|
|
240
|
+
|| artifact?.artifactId !== request.expectedSourceArtifactId
|
|
241
|
+
|| artifact?.contentHash !== request.expectedSourceArtifactHash;
|
|
242
|
+
if (stale) {
|
|
243
|
+
return { status: 'stale_owner_decision' };
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
// 3) CAS 段
|
|
247
|
+
for (let attempt = 0; attempt < CAS_ATTEMPTS; attempt++) {
|
|
248
|
+
const raw = await stateManager.getTask(taskId);
|
|
249
|
+
if (!raw)
|
|
250
|
+
return { status: 'not_found' };
|
|
251
|
+
const piTask = hydratePITaskRecord(raw);
|
|
252
|
+
if (!piTask)
|
|
253
|
+
return { status: 'metadata_invalid' };
|
|
254
|
+
const existing = findOwnerResolutionForCurrentEpoch(piTask);
|
|
255
|
+
if (existing) {
|
|
256
|
+
if (existing.reviewKey !== request.reviewKey) {
|
|
257
|
+
// 同 epoch 已被另一个事实快照的裁决占用 — 冲突。
|
|
258
|
+
return { status: 'already_resolved', existingAction: existing.action };
|
|
259
|
+
}
|
|
260
|
+
if (existing.action !== request.action) {
|
|
261
|
+
return { status: 'already_resolved', existingAction: existing.action };
|
|
262
|
+
}
|
|
263
|
+
if (request.expectedEvidenceDigest !== undefined
|
|
264
|
+
&& existing.evidenceDigest !== request.expectedEvidenceDigest) {
|
|
265
|
+
return { status: 'stale_owner_decision' };
|
|
266
|
+
}
|
|
267
|
+
// same reviewKey + same action — idempotent
|
|
268
|
+
if (existing.status === 'applied') {
|
|
269
|
+
return resolvedOutcome(existing, true, now);
|
|
270
|
+
}
|
|
271
|
+
// pending 同动作:
|
|
272
|
+
if (request.action === 'revise_once') {
|
|
273
|
+
return await driveReviseOnce({ deps, reopen, taskId, taskWithRecord: raw, record: existing, now });
|
|
274
|
+
}
|
|
275
|
+
// verdict override pending — 任务应已翻回 pending,等 runner 恢复门应用
|
|
276
|
+
return resolvedOutcome(existing, false, now);
|
|
277
|
+
}
|
|
278
|
+
if (piTask.status !== 'needs_human_review') {
|
|
279
|
+
return { status: 'not_decision_capable', blockers: [`task_status_${piTask.status}`] };
|
|
280
|
+
}
|
|
281
|
+
// Artifacts are persisted independently from task diagnosticJson. Rebuild the
|
|
282
|
+
// bound evidence after the CAS read and immediately before constructing the
|
|
283
|
+
// resolution so a changed artifact cannot reuse the earlier digest/manifest.
|
|
284
|
+
const writeReview = request.expectedEvidenceDigest !== undefined
|
|
285
|
+
? await buildOwnerDecisionReview(reviewStoreFromStateManager(stateManager), taskId)
|
|
286
|
+
: null;
|
|
287
|
+
if (request.expectedEvidenceDigest !== undefined) {
|
|
288
|
+
if (!writeReview || writeReview.evidence.digest !== request.expectedEvidenceDigest) {
|
|
289
|
+
return { status: 'stale_owner_decision' };
|
|
290
|
+
}
|
|
291
|
+
if (!writeReview.capability.finalOfferedActions.includes(request.action)) {
|
|
292
|
+
return {
|
|
293
|
+
status: 'not_decision_capable',
|
|
294
|
+
blockers: [`action_not_permitted_by_evidence:${request.action}`],
|
|
295
|
+
};
|
|
296
|
+
}
|
|
297
|
+
if (request.action === 'accept_current'
|
|
298
|
+
&& writeReview.capability.acceptRequirement.kind === 'acknowledge_partial_evidence'
|
|
299
|
+
&& request.acknowledgement?.kind !== 'partial_evidence') {
|
|
300
|
+
return { status: 'evidence_acknowledgement_required' };
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
const evidencePreconditions = writeReview
|
|
304
|
+
? await captureEvidencePreconditions(stateManager, writeReview)
|
|
305
|
+
: null;
|
|
306
|
+
if (writeReview && evidencePreconditions === null) {
|
|
307
|
+
return { status: 'stale_owner_decision' };
|
|
308
|
+
}
|
|
309
|
+
// 首次写入
|
|
310
|
+
const reviewKey = capability.reviewKey ?? request.reviewKey;
|
|
311
|
+
let record = {
|
|
312
|
+
resolutionId: resolutionIdFor(reviewKey),
|
|
313
|
+
reviewKey,
|
|
314
|
+
action: request.action,
|
|
315
|
+
status: 'pending',
|
|
316
|
+
ownerId: identity.ownerId,
|
|
317
|
+
...(identity.credentialId !== undefined ? { credentialId: identity.credentialId } : {}),
|
|
318
|
+
decidedAt: now(),
|
|
319
|
+
sourceRunId: request.expectedSourceRunId,
|
|
320
|
+
sourceArtifactId: request.expectedSourceArtifactId,
|
|
321
|
+
sourceArtifactHash: request.expectedSourceArtifactHash,
|
|
322
|
+
revisionEpoch: piTask.revisionCount ?? 0,
|
|
323
|
+
machineDecision: piTask.runnerDecision ?? 'needs_revision',
|
|
324
|
+
...(request.action !== 'revise_once'
|
|
325
|
+
? { effectiveDecision: effectiveDecisionFor(piTask.taskKind, request.action) }
|
|
326
|
+
: {}),
|
|
327
|
+
...(request.action === 'revise_once'
|
|
328
|
+
? { ownerInstruction: sanitizeOwnerInstruction(request.ownerInstruction) }
|
|
329
|
+
: {}),
|
|
330
|
+
...(request.expectedEvidenceDigest !== undefined && writeReview
|
|
331
|
+
? {
|
|
332
|
+
evidenceDigest: request.expectedEvidenceDigest,
|
|
333
|
+
evidenceManifest: writeReview.evidence.manifest,
|
|
334
|
+
...(request.acknowledgement !== undefined
|
|
335
|
+
? { evidenceAcknowledgement: request.acknowledgement }
|
|
336
|
+
: {}),
|
|
337
|
+
}
|
|
338
|
+
: {}),
|
|
339
|
+
};
|
|
340
|
+
if (request.action === 'revise_once') {
|
|
341
|
+
const target = await resolveReviseTarget(deps, piTask);
|
|
342
|
+
if (!target) {
|
|
343
|
+
return { status: 'revise_target_unresolved' };
|
|
344
|
+
}
|
|
345
|
+
record = { ...record, targetTaskId: target.taskId, targetRevisionCauseId: `owner-res-${record.resolutionId}` };
|
|
346
|
+
const nextMeta = mergePITaskMetadata(piTask, {
|
|
347
|
+
ownerResolutions: [...(piTask.ownerResolutions ?? []), record],
|
|
348
|
+
});
|
|
349
|
+
const patch = { diagnosticJson: createPITaskDiagnosticJson(nextMeta) };
|
|
350
|
+
const updated = evidencePreconditions
|
|
351
|
+
? await stateManager.updateTaskIfDiagnosticJsonAndArtifactsUnchanged({
|
|
352
|
+
taskId,
|
|
353
|
+
expectedDiagnosticJson: raw.diagnosticJson ?? null,
|
|
354
|
+
artifacts: evidencePreconditions,
|
|
355
|
+
patch,
|
|
356
|
+
})
|
|
357
|
+
: await stateManager.updateTaskIfDiagnosticJsonUnchanged(taskId, raw.diagnosticJson ?? null, patch);
|
|
358
|
+
if (!updated)
|
|
359
|
+
continue; // CAS 冲突 → 重读重试
|
|
360
|
+
return await driveReviseOnce({ deps, reopen, taskId, taskWithRecord: updated, record, now });
|
|
361
|
+
}
|
|
362
|
+
// verdict override: resolution + status 翻转同一 mutation
|
|
363
|
+
const nextMeta = mergePITaskMetadata(piTask, {
|
|
364
|
+
ownerResolutions: [...(piTask.ownerResolutions ?? []), record],
|
|
365
|
+
});
|
|
366
|
+
const patch = {
|
|
367
|
+
status: 'pending',
|
|
368
|
+
attemptCount: 0,
|
|
369
|
+
diagnosticJson: createPITaskDiagnosticJson(nextMeta),
|
|
370
|
+
};
|
|
371
|
+
const updated = evidencePreconditions
|
|
372
|
+
? await stateManager.updateTaskIfDiagnosticJsonAndArtifactsUnchanged({
|
|
373
|
+
taskId,
|
|
374
|
+
expectedDiagnosticJson: raw.diagnosticJson ?? null,
|
|
375
|
+
artifacts: evidencePreconditions,
|
|
376
|
+
patch,
|
|
377
|
+
})
|
|
378
|
+
: await stateManager.updateTaskIfDiagnosticJsonUnchanged(taskId, raw.diagnosticJson ?? null, patch);
|
|
379
|
+
if (!updated)
|
|
380
|
+
continue;
|
|
381
|
+
return resolvedOutcome(record, false, now);
|
|
382
|
+
}
|
|
383
|
+
return { status: 'cas_conflict' };
|
|
384
|
+
}
|
|
385
|
+
//# sourceMappingURL=owner-resolution-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"owner-resolution-service.js","sourceRoot":"","sources":["../../../src/runtime-v2/internalization/owner-resolution-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,18 @@ export type OwnerRetryOutcome = {
|
|
|
30
30
|
status: 'requeued';
|
|
31
31
|
taskKind: string;
|
|
32
32
|
previousStatus: string;
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* PRI-629 Recover guard: decision-capable 人工裁决(或本 epoch 已有
|
|
36
|
+
* resolution)不允许 authority reset — Recover 不是治理出口(SPEC §17/INV-06)。
|
|
37
|
+
* 出口 = 治理焦点的 Owner Decision(open_governance_focus)。
|
|
38
|
+
*/
|
|
39
|
+
| {
|
|
40
|
+
status: 'rejected';
|
|
41
|
+
taskKind: string;
|
|
42
|
+
previousStatus: string;
|
|
43
|
+
reason: 'owner_decision_required';
|
|
44
|
+
nextAction: 'open_governance_focus';
|
|
33
45
|
};
|
|
34
46
|
/**
|
|
35
47
|
* 对单个 needs_human_review 任务执行 Owner authority reset(→ pending)。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"owner-retry.d.ts","sourceRoot":"","sources":["../../../src/runtime-v2/internalization/owner-retry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"owner-retry.d.ts","sourceRoot":"","sources":["../../../src/runtime-v2/internalization/owner-retry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAS7E,MAAM,MAAM,iBAAiB,GACzB;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GACvB;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE,GAC/D;IAAE,MAAM,EAAE,kBAAkB,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAChD;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAA;CAAE;AAClE;;;;GAIG;GACD;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,cAAc,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,yBAAyB,CAAC;IAAC,UAAU,EAAE,uBAAuB,CAAA;CAAE,CAAC;AAE7I;;;;;;;;;;;;;GAaG;AACH,wBAAsB,8BAA8B,CAClD,YAAY,EAAE,mBAAmB,EACjC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CA4D5B"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { hydratePITaskRecord, createPITaskDiagnosticJson, mergePITaskMetadata } from './pitask-metadata.js';
|
|
2
|
+
import { collectOwnerDecisionFacts, deriveOwnerDecisionCapability, findPendingOwnerResolutionForCurrentEpoch, } from './owner-review.js';
|
|
3
|
+
import { factStoreFromStateManager } from './owner-resolution-service.js';
|
|
2
4
|
/**
|
|
3
5
|
* 对单个 needs_human_review 任务执行 Owner authority reset(→ pending)。
|
|
4
6
|
*
|
|
@@ -33,6 +35,27 @@ export async function ownerRetryNeedsHumanReviewTask(stateManager, taskId) {
|
|
|
33
35
|
}
|
|
34
36
|
// 原子单写: 同一 patch 同时落 status=pending / attemptCount=0 / 清空后的
|
|
35
37
|
// diagnosticJson。updateTask 抛错时 DB 行保持原样(单条 UPDATE),无 partial reset。
|
|
38
|
+
// ── PRI-629 Recover guard (SPEC §17) ──
|
|
39
|
+
// decision-capable(capability eligible)或本 epoch 已有 resolution(含
|
|
40
|
+
// revise_once 进行中)→ 拒绝。模糊 legacy 事实 → 不阻断(capability 不
|
|
41
|
+
// eligible),保持既有 Recover 行为。core 层强制 — 不只是 UI 隐藏按钮。
|
|
42
|
+
const facts = await collectOwnerDecisionFacts(factStoreFromStateManager(stateManager), taskId);
|
|
43
|
+
if (facts) {
|
|
44
|
+
const capability = deriveOwnerDecisionCapability(facts);
|
|
45
|
+
// P0 评审修复: 只拒 pending resolution(等待 runner 应用,此时 Recover
|
|
46
|
+
// 会与之竞争)。applied resolution 的下游 recovery NHR 必须保持 Recover
|
|
47
|
+
// 出口——resume 门会基于 applied override 确定性重放,否则任务死胡同
|
|
48
|
+
// (Focus 不显示决策、Recover 又被拒)。
|
|
49
|
+
if (capability.eligible || findPendingOwnerResolutionForCurrentEpoch(facts.task)) {
|
|
50
|
+
return {
|
|
51
|
+
status: 'rejected',
|
|
52
|
+
taskKind: task.taskKind,
|
|
53
|
+
previousStatus: task.status,
|
|
54
|
+
reason: 'owner_decision_required',
|
|
55
|
+
nextAction: 'open_governance_focus',
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
}
|
|
36
59
|
const merged = mergePITaskMetadata(piTask, {
|
|
37
60
|
runnerDecision: undefined,
|
|
38
61
|
completionIntent: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"owner-retry.js","sourceRoot":"","sources":["../../../src/runtime-v2/internalization/owner-retry.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"owner-retry.js","sourceRoot":"","sources":["../../../src/runtime-v2/internalization/owner-retry.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC5G,OAAO,EACL,yBAAyB,EACzB,6BAA6B,EAC7B,yCAAyC,GAC1C,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAc1E;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,YAAiC,EACjC,MAAc;IAEd,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IACjC,CAAC;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,oBAAoB,EAAE,CAAC;QACzC,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,cAAc,EAAE,IAAI,CAAC,MAAM;SAC5B,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,qDAAqD;QACrD,+CAA+C;QAC/C,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;IACjE,CAAC;IAED,4DAA4D;IAC5D,qEAAqE;IACrE,yCAAyC;IACzC,gEAAgE;IAChE,uDAAuD;IACvD,oDAAoD;IACpD,MAAM,KAAK,GAAG,MAAM,yBAAyB,CAAC,yBAAyB,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,CAAC;IAC/F,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,UAAU,GAAG,6BAA6B,CAAC,KAAK,CAAC,CAAC;QACxD,yDAAyD;QACzD,0DAA0D;QAC1D,iDAAiD;QACjD,6BAA6B;QAC7B,IAAI,UAAU,CAAC,QAAQ,IAAI,yCAAyC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACjF,OAAO;gBACL,MAAM,EAAE,UAAU;gBAClB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,cAAc,EAAE,IAAI,CAAC,MAAM;gBAC3B,MAAM,EAAE,yBAAyB;gBACjC,UAAU,EAAE,uBAAuB;aACpC,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,EAAE;QACzC,cAAc,EAAE,SAAS;QACzB,gBAAgB,EAAE,SAAS;KAC5B,CAAC,CAAC;IACH,MAAM,YAAY,CAAC,UAAU,CAAC,MAAM,EAAE;QACpC,MAAM,EAAE,SAAS;QACjB,YAAY,EAAE,CAAC;QACf,cAAc,EAAE,0BAA0B,CAAC,MAAM,CAAC;KACnD,CAAC,CAAC;IAEH,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,cAAc,EAAE,IAAI,CAAC,MAAM;KAC5B,CAAC;AACJ,CAAC"}
|