@jinn-network/client 0.1.7 → 0.1.8
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/README.md +67 -1
- package/dist/adapters/mech/adapter.d.ts +19 -1
- package/dist/adapters/mech/adapter.js +130 -14
- package/dist/adapters/mech/adapter.js.map +1 -1
- package/dist/adapters/mech/contracts.d.ts +22 -1
- package/dist/adapters/mech/contracts.js +34 -24
- package/dist/adapters/mech/contracts.js.map +1 -1
- package/dist/adapters/mech/safe.d.ts +1 -1
- package/dist/adapters/mech/safe.js +5 -3
- package/dist/adapters/mech/safe.js.map +1 -1
- package/dist/adapters/mech/types.d.ts +6 -1
- package/dist/adapters/mech/types.js.map +1 -1
- package/dist/agent/operator-claude.js +8 -0
- package/dist/agent/operator-claude.js.map +1 -1
- package/dist/api/activity-events-endpoint.d.ts +14 -0
- package/dist/api/activity-events-endpoint.js +59 -0
- package/dist/api/activity-events-endpoint.js.map +1 -0
- package/dist/api/bootstrap-endpoint.d.ts +1 -2
- package/dist/api/bootstrap-endpoint.js +42 -24
- package/dist/api/bootstrap-endpoint.js.map +1 -1
- package/dist/api/codex-doctor-endpoint.d.ts +22 -5
- package/dist/api/codex-doctor-endpoint.js +136 -17
- package/dist/api/codex-doctor-endpoint.js.map +1 -1
- package/dist/api/debug-report-endpoint.d.ts +27 -0
- package/dist/api/debug-report-endpoint.js +157 -0
- package/dist/api/debug-report-endpoint.js.map +1 -0
- package/dist/api/gather-status.d.ts +33 -0
- package/dist/api/gather-status.js +211 -26
- package/dist/api/gather-status.js.map +1 -1
- package/dist/api/hermes-doctor-endpoint.d.ts +15 -7
- package/dist/api/hermes-doctor-endpoint.js +56 -19
- package/dist/api/hermes-doctor-endpoint.js.map +1 -1
- package/dist/api/launcher-status.d.ts +4 -2
- package/dist/api/launcher-status.js +11 -10
- package/dist/api/launcher-status.js.map +1 -1
- package/dist/api/launcher-tasks.d.ts +1 -1
- package/dist/api/launcher-tasks.js +12 -8
- package/dist/api/launcher-tasks.js.map +1 -1
- package/dist/api/operator-artifacts-endpoint.js +73 -6
- package/dist/api/operator-artifacts-endpoint.js.map +1 -1
- package/dist/api/portfolio-v0-build.d.ts +7 -1
- package/dist/api/portfolio-v0-build.js +6 -2
- package/dist/api/portfolio-v0-build.js.map +1 -1
- package/dist/api/prediction-v1-build.d.ts +6 -0
- package/dist/api/prediction-v1-build.js +3 -1
- package/dist/api/prediction-v1-build.js.map +1 -1
- package/dist/api/server.d.ts +17 -0
- package/dist/api/server.js +40 -1
- package/dist/api/server.js.map +1 -1
- package/dist/api/setup-endpoints.d.ts +0 -9
- package/dist/api/setup-endpoints.js +11 -153
- package/dist/api/setup-endpoints.js.map +1 -1
- package/dist/api/solvernets-endpoints.js +30 -63
- package/dist/api/solvernets-endpoints.js.map +1 -1
- package/dist/api/status-build.d.ts +115 -2
- package/dist/api/status-build.js +47 -11
- package/dist/api/status-build.js.map +1 -1
- package/dist/api/status-harness-rollup.d.ts +35 -0
- package/dist/api/status-harness-rollup.js +45 -0
- package/dist/api/status-harness-rollup.js.map +1 -0
- package/dist/api/task-runs-build.d.ts +8 -0
- package/dist/api/task-runs-build.js +5 -1
- package/dist/api/task-runs-build.js.map +1 -1
- package/dist/build-info.json +4 -4
- package/dist/build-meta.json +1 -1
- package/dist/captures/live-publisher.js +24 -4
- package/dist/captures/live-publisher.js.map +1 -1
- package/dist/captures/publish.d.ts +1 -1
- package/dist/chain-read-errors.d.ts +12 -0
- package/dist/chain-read-errors.js +26 -1
- package/dist/chain-read-errors.js.map +1 -1
- package/dist/cli/commands/codedigest-revert-check.d.ts +33 -0
- package/dist/cli/commands/codedigest-revert-check.js +249 -0
- package/dist/cli/commands/codedigest-revert-check.js.map +1 -0
- package/dist/cli/commands/solver-nets.d.ts +1 -0
- package/dist/cli/commands/solver-nets.js +177 -22
- package/dist/cli/commands/solver-nets.js.map +1 -1
- package/dist/cli/commands/solver-plugins-block.d.ts +33 -0
- package/dist/cli/commands/solver-plugins-block.js +118 -0
- package/dist/cli/commands/solver-plugins-block.js.map +1 -0
- package/dist/cli/commands/solver-plugins-feedback.d.ts +72 -0
- package/dist/cli/commands/solver-plugins-feedback.js +262 -0
- package/dist/cli/commands/solver-plugins-feedback.js.map +1 -0
- package/dist/cli/commands/solver-plugins-read.d.ts +54 -0
- package/dist/cli/commands/solver-plugins-read.js +259 -0
- package/dist/cli/commands/solver-plugins-read.js.map +1 -0
- package/dist/cli/commands/solver-plugins.d.ts +35 -0
- package/dist/cli/commands/solver-plugins.js +399 -2
- package/dist/cli/commands/solver-plugins.js.map +1 -1
- package/dist/cli/commands/tasks.js +15 -2
- package/dist/cli/commands/tasks.js.map +1 -1
- package/dist/cli/index.js +2 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/task-native-readiness.d.ts +7 -0
- package/dist/cli/task-native-readiness.js +7 -5
- package/dist/cli/task-native-readiness.js.map +1 -1
- package/dist/config.d.ts +183 -232
- package/dist/config.js +232 -107
- package/dist/config.js.map +1 -1
- package/dist/daemon/ai-units-gate.d.ts +54 -0
- package/dist/daemon/ai-units-gate.js +82 -0
- package/dist/daemon/ai-units-gate.js.map +1 -0
- package/dist/daemon/creator.js +13 -0
- package/dist/daemon/creator.js.map +1 -1
- package/dist/daemon/daemon.d.ts +10 -0
- package/dist/daemon/daemon.js +203 -30
- package/dist/daemon/daemon.js.map +1 -1
- package/dist/daemon/gate-logger.d.ts +9 -0
- package/dist/daemon/gate-logger.js +2 -0
- package/dist/daemon/gate-logger.js.map +1 -0
- package/dist/daemon/jinn-claim-loop.js +22 -4
- package/dist/daemon/jinn-claim-loop.js.map +1 -1
- package/dist/daemon/readiness-gate.d.ts +1 -4
- package/dist/daemon/readiness-gate.js.map +1 -1
- package/dist/daemon/spend-cap-gate.d.ts +40 -0
- package/dist/daemon/spend-cap-gate.js +46 -0
- package/dist/daemon/spend-cap-gate.js.map +1 -0
- package/dist/dashboard/assets/index-CzKxvMcU.css +32 -0
- package/dist/dashboard/assets/index-yVemxHot.js +351 -0
- package/dist/dashboard/index.html +2 -2
- package/dist/discovery/http.js +328 -1
- package/dist/discovery/http.js.map +1 -1
- package/dist/discovery/onchain.js +42 -4
- package/dist/discovery/onchain.js.map +1 -1
- package/dist/discovery/types.d.ts +129 -0
- package/dist/discovery/types.js.map +1 -1
- package/dist/discovery/with-fallback.js +27 -0
- package/dist/discovery/with-fallback.js.map +1 -1
- package/dist/earning/bootstrap.d.ts +8 -3
- package/dist/earning/bootstrap.js +36 -13
- package/dist/earning/bootstrap.js.map +1 -1
- package/dist/earning/safe-adapter.js +23 -11
- package/dist/earning/safe-adapter.js.map +1 -1
- package/dist/earning/types.d.ts +6 -6
- package/dist/earning/viem-clients.d.ts +11 -4
- package/dist/earning/viem-clients.js +14 -5
- package/dist/earning/viem-clients.js.map +1 -1
- package/dist/erc8004/identity.d.ts +19 -3
- package/dist/erc8004/identity.js +38 -11
- package/dist/erc8004/identity.js.map +1 -1
- package/dist/erc8004/index.d.ts +1 -1
- package/dist/erc8004/index.js.map +1 -1
- package/dist/events/types.d.ts +2 -2
- package/dist/harnesses/cost-estimates.d.ts +10 -31
- package/dist/harnesses/cost-estimates.js +11 -43
- package/dist/harnesses/cost-estimates.js.map +1 -1
- package/dist/harnesses/engine/engine.d.ts +28 -4
- package/dist/harnesses/engine/engine.js +103 -17
- package/dist/harnesses/engine/engine.js.map +1 -1
- package/dist/harnesses/engine/persistence.d.ts +21 -4
- package/dist/harnesses/engine/persistence.js +43 -6
- package/dist/harnesses/engine/persistence.js.map +1 -1
- package/dist/harnesses/engine/state.d.ts +9 -0
- package/dist/harnesses/engine/state.js +23 -10
- package/dist/harnesses/engine/state.js.map +1 -1
- package/dist/harnesses/impls/hermes-agent/bootstrap.js +4 -2
- package/dist/harnesses/impls/hermes-agent/bootstrap.js.map +1 -1
- package/dist/harnesses/impls/hermes-agent/config-builder.d.ts +1 -1
- package/dist/harnesses/impls/hermes-agent/config-builder.js +4 -2
- package/dist/harnesses/impls/hermes-agent/config-builder.js.map +1 -1
- package/dist/harnesses/impls/hermes-agent/harness.d.ts +14 -0
- package/dist/harnesses/impls/hermes-agent/harness.js +16 -2
- package/dist/harnesses/impls/hermes-agent/harness.js.map +1 -1
- package/dist/harnesses/impls/hermes-agent/prompt.d.ts +6 -6
- package/dist/harnesses/impls/hermes-agent/prompt.js +6 -6
- package/dist/harnesses/impls/learner/adapters/claude-code.d.ts +17 -0
- package/dist/harnesses/impls/learner/adapters/claude-code.js +113 -14
- package/dist/harnesses/impls/learner/adapters/claude-code.js.map +1 -1
- package/dist/harnesses/impls/learner/adapters/codex-code.d.ts +9 -0
- package/dist/harnesses/impls/learner/adapters/codex-code.js +30 -8
- package/dist/harnesses/impls/learner/adapters/codex-code.js.map +1 -1
- package/dist/harnesses/impls/learner/harness.d.ts +24 -0
- package/dist/harnesses/impls/learner/harness.js +27 -3
- package/dist/harnesses/impls/learner/harness.js.map +1 -1
- package/dist/harnesses/impls/learner/harvest.d.ts +1 -1
- package/dist/harnesses/impls/learner/harvest.js +23 -5
- package/dist/harnesses/impls/learner/harvest.js.map +1 -1
- package/dist/harnesses/impls/learner/restoration-patch.d.ts +2 -2
- package/dist/harnesses/impls/learner/restoration-patch.js +25 -6
- package/dist/harnesses/impls/learner/restoration-patch.js.map +1 -1
- package/dist/harnesses/impls/swe-rebench-v2-evaluator/eval-runner.js +21 -1
- package/dist/harnesses/impls/swe-rebench-v2-evaluator/eval-runner.js.map +1 -1
- package/dist/harnesses/impls/swe-rebench-v2-evaluator/hf-fetcher.d.ts +74 -5
- package/dist/harnesses/impls/swe-rebench-v2-evaluator/hf-fetcher.js +103 -32
- package/dist/harnesses/impls/swe-rebench-v2-evaluator/hf-fetcher.js.map +1 -1
- package/dist/harnesses/readiness-registry.d.ts +7 -0
- package/dist/harnesses/readiness-registry.js +9 -0
- package/dist/harnesses/readiness-registry.js.map +1 -1
- package/dist/learner/revert-decision.d.ts +59 -0
- package/dist/learner/revert-decision.js +53 -0
- package/dist/learner/revert-decision.js.map +1 -0
- package/dist/learner/revert-stats.d.ts +24 -0
- package/dist/learner/revert-stats.js +44 -0
- package/dist/learner/revert-stats.js.map +1 -0
- package/dist/main.js +177 -104
- package/dist/main.js.map +1 -1
- package/dist/mcp/get-codedigest-reward.d.ts +13 -0
- package/dist/mcp/get-codedigest-reward.js +23 -0
- package/dist/mcp/get-codedigest-reward.js.map +1 -0
- package/dist/mcp/server.js +23 -0
- package/dist/mcp/server.js.map +1 -1
- package/dist/observability/debug-report-assemble.d.ts +43 -0
- package/dist/observability/debug-report-assemble.js +80 -0
- package/dist/observability/debug-report-assemble.js.map +1 -0
- package/dist/observability/emit-event.d.ts +9 -2
- package/dist/observability/emit-event.js +36 -2
- package/dist/observability/emit-event.js.map +1 -1
- package/dist/observability/file-logger.d.ts +69 -0
- package/dist/observability/file-logger.js +177 -0
- package/dist/observability/file-logger.js.map +1 -0
- package/dist/observability/redact-secrets.d.ts +65 -0
- package/dist/observability/redact-secrets.js +300 -0
- package/dist/observability/redact-secrets.js.map +1 -0
- package/dist/observability/tar.d.ts +30 -0
- package/dist/observability/tar.js +102 -0
- package/dist/observability/tar.js.map +1 -0
- package/dist/plugins/learner/skills/learn/consolidator-prompt.md +18 -1
- package/dist/plugins/learner/skills/learn/promoter-prompt.md +72 -1
- package/dist/preflight/pidfile-liveness.d.ts +44 -0
- package/dist/preflight/pidfile-liveness.js +103 -0
- package/dist/preflight/pidfile-liveness.js.map +1 -0
- package/dist/preflight/rpc-network.d.ts +40 -0
- package/dist/preflight/rpc-network.js +67 -1
- package/dist/preflight/rpc-network.js.map +1 -1
- package/dist/rpc/transport.d.ts +109 -0
- package/dist/rpc/transport.js +220 -0
- package/dist/rpc/transport.js.map +1 -0
- package/dist/scripts/donation-consumption-acceptance.js +7 -28
- package/dist/scripts/donation-consumption-acceptance.js.map +1 -1
- package/dist/scripts/swe-rebench-v2-pytest-missing.json +16 -0
- package/dist/solver-nets/prediction-operator-ux.d.ts +1 -2
- package/dist/solver-nets/prediction-operator-ux.js +56 -53
- package/dist/solver-nets/prediction-operator-ux.js.map +1 -1
- package/dist/solver-nets/registry.d.ts +19 -1
- package/dist/solver-nets/registry.js +37 -24
- package/dist/solver-nets/registry.js.map +1 -1
- package/dist/solver-types/_swe-rebench-v2-pool.d.ts +9 -2
- package/dist/solver-types/_swe-rebench-v2-pool.js +15 -20
- package/dist/solver-types/_swe-rebench-v2-pool.js.map +1 -1
- package/dist/solver-types/_swe-rebench-v2-state.d.ts +15 -0
- package/dist/solver-types/_swe-rebench-v2-state.js +19 -0
- package/dist/solver-types/_swe-rebench-v2-state.js.map +1 -1
- package/dist/solver-types/_swe-rebench-v2-validated-pool.d.ts +116 -2
- package/dist/solver-types/_swe-rebench-v2-validated-pool.js +296 -21
- package/dist/solver-types/_swe-rebench-v2-validated-pool.js.map +1 -1
- package/dist/solver-types/swe-rebench-v2-auto.d.ts +20 -11
- package/dist/solver-types/swe-rebench-v2-auto.js +64 -19
- package/dist/solver-types/swe-rebench-v2-auto.js.map +1 -1
- package/dist/solver-types/swe-rebench-v2.d.ts +8 -2
- package/dist/solver-types/swe-rebench-v2.js +127 -11
- package/dist/solver-types/swe-rebench-v2.js.map +1 -1
- package/dist/solvernets/daemon-init.d.ts +1 -1
- package/dist/solvernets/daemon-init.js +19 -4
- package/dist/solvernets/daemon-init.js.map +1 -1
- package/dist/solvernets/launched-record-dispatcher.d.ts +4 -0
- package/dist/solvernets/launched-record-dispatcher.js +10 -4
- package/dist/solvernets/launched-record-dispatcher.js.map +1 -1
- package/dist/solvernets/registry-client-erc8004.js +11 -0
- package/dist/solvernets/registry-client-erc8004.js.map +1 -1
- package/dist/solvernets/store.d.ts +2 -2
- package/dist/spend/ai-units-config.d.ts +39 -0
- package/dist/spend/ai-units-config.js +28 -0
- package/dist/spend/ai-units-config.js.map +1 -0
- package/dist/spend/ai-units.d.ts +89 -0
- package/dist/spend/ai-units.js +156 -0
- package/dist/spend/ai-units.js.map +1 -0
- package/dist/spend/cost-surface-status.d.ts +12 -0
- package/dist/spend/cost-surface-status.js +24 -0
- package/dist/spend/cost-surface-status.js.map +1 -0
- package/dist/spend/credential.d.ts +39 -0
- package/dist/spend/credential.js +71 -0
- package/dist/spend/credential.js.map +1 -0
- package/dist/spend/daemon-config.d.ts +13 -0
- package/dist/spend/daemon-config.js +24 -0
- package/dist/spend/daemon-config.js.map +1 -0
- package/dist/spend/pricing.d.ts +16 -0
- package/dist/spend/pricing.js +26 -0
- package/dist/spend/pricing.js.map +1 -0
- package/dist/spend/record.d.ts +13 -0
- package/dist/spend/record.js +36 -0
- package/dist/spend/record.js.map +1 -0
- package/dist/spend/usage.d.ts +27 -0
- package/dist/spend/usage.js +113 -0
- package/dist/spend/usage.js.map +1 -0
- package/dist/store/store.d.ts +101 -0
- package/dist/store/store.js +304 -4
- package/dist/store/store.js.map +1 -1
- package/dist/trajectory/transcript-parsers/codex-session.d.ts +12 -6
- package/dist/trajectory/transcript-parsers/codex-session.js +114 -13
- package/dist/trajectory/transcript-parsers/codex-session.js.map +1 -1
- package/dist/trajectory/transcript-parsers/types.d.ts +8 -8
- package/dist/trajectory/transcript-session-dirs.d.ts +18 -0
- package/dist/trajectory/transcript-session-dirs.js +85 -0
- package/dist/trajectory/transcript-session-dirs.js.map +1 -0
- package/dist/trajectory/transcript-watcher.d.ts +20 -1
- package/dist/trajectory/transcript-watcher.js +108 -32
- package/dist/trajectory/transcript-watcher.js.map +1 -1
- package/dist/tx-retry.d.ts +25 -0
- package/dist/tx-retry.js +95 -7
- package/dist/tx-retry.js.map +1 -1
- package/dist/types/payloads/portfolio-v0.d.ts +3 -3
- package/dist/types/payloads/prediction-apy-v0.d.ts +3 -3
- package/dist/types/payloads/prediction-v0.d.ts +12 -12
- package/package.json +11 -3
- package/plugins/learner/skills/learn/consolidator-prompt.md +18 -1
- package/plugins/learner/skills/learn/promoter-prompt.md +72 -1
- package/plugins/swe-rebench-v2-diffmin/README.md +10 -9
- package/plugins/swe-rebench-v2-diffmin/jinn.plugin.json +1 -1
- package/plugins/swe-rebench-v2-diffmin/skills/diffmin/SKILL.md +15 -10
- package/plugins/swe-rebench-v2-diffmin/skills/test-map/SKILL.md +10 -12
- package/plugins/swe-rebench-v2-runtime/.claude-plugin/plugin.json +1 -1
- package/plugins/swe-rebench-v2-runtime/.codex-plugin/plugin.json +3 -3
- package/plugins/swe-rebench-v2-runtime/README.md +6 -6
- package/plugins/swe-rebench-v2-runtime/jinn.plugin.json +2 -3
- package/plugins/swe-rebench-v2-runtime/skills/task/SKILL.md +81 -0
- package/dist/dashboard/assets/index-BUlE8F3Y.js +0 -330
- package/dist/dashboard/assets/index-blqc7eqq.css +0 -32
- package/plugins/swe-rebench-v2-runtime/skills/orient/SKILL.md +0 -29
- package/plugins/swe-rebench-v2-runtime/skills/plan/SKILL.md +0 -53
|
@@ -7,19 +7,46 @@
|
|
|
7
7
|
*/
|
|
8
8
|
export const DEFAULT_GENERATOR_CONFIG = {
|
|
9
9
|
N_target_successes: 5,
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
// #802: the repost trigger is claim-budget exhaustion (indexer-observed), not
|
|
11
|
+
// a posting count. The former N_max_postings_per_task abandon cap is removed —
|
|
12
|
+
// hard instances retry indefinitely until they reach N successes.
|
|
13
|
+
posting_window_ms: 24 * 60 * 60 * 1000, // on-chain claim-window deadline only (AC#5)
|
|
12
14
|
post_batch_size: 25,
|
|
13
15
|
claimLeaseTtlSeconds: 60 * 60,
|
|
14
16
|
};
|
|
15
|
-
export function classifyPoolTask(counters, config, now) {
|
|
17
|
+
export function classifyPoolTask(counters, config, claim, now) {
|
|
18
|
+
// saturated is the first branch and is unchanged (AC#2).
|
|
16
19
|
if (counters.successful >= config.N_target_successes)
|
|
17
20
|
return 'saturated';
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
if (counters.posted === 0 || counters.last_posted_at === 0)
|
|
21
|
+
// Never posted ⇒ unposted.
|
|
22
|
+
if (counters.posted === 0 || !counters.last_task_id)
|
|
21
23
|
return 'unposted';
|
|
22
|
-
|
|
24
|
+
// #826/#850 deadlock fix: the on-chain claim window (last_posted_at +
|
|
25
|
+
// posting_window_ms) closes independently of budget consumption. Once it
|
|
26
|
+
// passes, TaskCoordinator.claimTask reverts TCClaimWindowClosed
|
|
27
|
+
// (contracts/src/tasks/TaskCoordinator.sol:328) — the remaining slots are
|
|
28
|
+
// permanently unclaimable, so the exhaustion trigger below can never fire and
|
|
29
|
+
// the posting would strand `live` forever. Window expiry is NOT an on-chain
|
|
30
|
+
// event or state change (no event, no flag), so it must be computed locally.
|
|
31
|
+
// Repost on EITHER exhaustion OR expiry.
|
|
32
|
+
const windowExpired = now - counters.last_posted_at >= config.posting_window_ms;
|
|
33
|
+
// Posted, but the claim snapshot has no entry for this last_task_id. The
|
|
34
|
+
// indexer never deletes task rows (finalized/refunded are flags, and the
|
|
35
|
+
// leg-1 query carries no lifecycle filter, so a finalized/refunded task is
|
|
36
|
+
// still present with consumed >= maxClaims ⇒ classified repostable below).
|
|
37
|
+
// The usual cause of a missing entry for a known last_task_id is indexing lag
|
|
38
|
+
// (or a reorg): the task was posted on-chain but the indexer has not reflected
|
|
39
|
+
// it yet. Treat it as `live` (assume not-yet-indexed) — returning `repostable`
|
|
40
|
+
// here would re-post a just-posted task before the indexer sees it
|
|
41
|
+
// (double-post, #802 #3), and in onchain mode — where getInstanceClaimCounts
|
|
42
|
+
// is an empty-success floor — would storm every posting every tick (#802 #2).
|
|
43
|
+
// BUT if the posting window has already elapsed, the post is definitively dead
|
|
44
|
+
// (claims can no longer land) and must be reposted regardless of the snapshot.
|
|
45
|
+
if (!claim)
|
|
46
|
+
return windowExpired ? 'repostable' : 'live';
|
|
47
|
+
// Live while the on-chain claim budget has slots left AND the window is open;
|
|
48
|
+
// exhausted OR window-expired ⇒ repostable.
|
|
49
|
+
return claim.consumed >= claim.maxClaims || windowExpired ? 'repostable' : 'live';
|
|
23
50
|
}
|
|
24
51
|
export function summarizePoolState(args) {
|
|
25
52
|
const counts = {
|
|
@@ -29,37 +56,43 @@ export function summarizePoolState(args) {
|
|
|
29
56
|
live: 0,
|
|
30
57
|
repostable: 0,
|
|
31
58
|
saturated: 0,
|
|
32
|
-
abandoned: 0,
|
|
33
59
|
};
|
|
34
60
|
for (const task of args.pool) {
|
|
35
61
|
const counters = args.counters.get(task.instance_id) ??
|
|
36
62
|
{ posted: 0, successful: 0, last_posted_at: 0 };
|
|
37
|
-
|
|
63
|
+
const claim = counters.last_task_id
|
|
64
|
+
? args.claimCounts?.get(counters.last_task_id)
|
|
65
|
+
: undefined;
|
|
66
|
+
counts[classifyPoolTask(counters, args.config, claim, args.now)] += 1;
|
|
38
67
|
}
|
|
39
68
|
return counts;
|
|
40
69
|
}
|
|
41
70
|
/**
|
|
42
71
|
* Choose up to post_batch_size eligible tasks to post on JinnRouter.
|
|
43
72
|
*
|
|
44
|
-
* Eligibility
|
|
45
|
-
* - successful_count[task] < N_target_successes
|
|
46
|
-
* -
|
|
47
|
-
*
|
|
73
|
+
* Eligibility (#802):
|
|
74
|
+
* - successful_count[task] < N_target_successes (else saturated)
|
|
75
|
+
* - the instance has no live on-chain posting: either unposted, or its
|
|
76
|
+
* last posting's claim budget is exhausted (consumed >= maxClaims) or has
|
|
77
|
+
* left the claimable set.
|
|
48
78
|
*
|
|
49
|
-
* Among eligible tasks, prefer a different language than the last-posted one
|
|
50
|
-
*
|
|
51
|
-
*
|
|
79
|
+
* Among eligible tasks, prefer a different language than the last-posted one.
|
|
80
|
+
* Tie-break by lower posted_count, then earliest last_posted_at, then
|
|
81
|
+
* instance_id (deterministic).
|
|
52
82
|
*/
|
|
53
83
|
export function selectNextPostingCandidates(args) {
|
|
84
|
+
const claimFor = (instanceId) => {
|
|
85
|
+
const tid = args.counters.get(instanceId)?.last_task_id;
|
|
86
|
+
return tid ? args.claimCounts?.get(tid) : undefined;
|
|
87
|
+
};
|
|
54
88
|
const eligible = args.pool.filter((task) => {
|
|
55
89
|
const c = args.counters.get(task.instance_id) ??
|
|
56
90
|
{ posted: 0, successful: 0, last_posted_at: 0 };
|
|
57
|
-
const kind = classifyPoolTask(c, args.config, args.now);
|
|
91
|
+
const kind = classifyPoolTask(c, args.config, claimFor(task.instance_id), args.now);
|
|
58
92
|
return kind === 'unposted' || kind === 'repostable';
|
|
59
93
|
});
|
|
60
94
|
if (eligible.length === 0)
|
|
61
95
|
return [];
|
|
62
|
-
// Round-robin language preference
|
|
63
96
|
const differentLanguage = args.lastPostedLanguage
|
|
64
97
|
? eligible.filter((t) => t.language !== args.lastPostedLanguage)
|
|
65
98
|
: eligible;
|
|
@@ -73,7 +106,19 @@ export function selectNextPostingCandidates(args) {
|
|
|
73
106
|
return cA.last_posted_at - cB.last_posted_at;
|
|
74
107
|
return a.instance_id.localeCompare(b.instance_id);
|
|
75
108
|
});
|
|
76
|
-
|
|
109
|
+
// De-dupe instance_ids within the batch (a pool may list an instance twice);
|
|
110
|
+
// each instance gets at most one posting per tick. No abandon cap (#802).
|
|
111
|
+
const seenInstance = new Set();
|
|
112
|
+
const selected = [];
|
|
113
|
+
for (const candidate of candidates) {
|
|
114
|
+
if (selected.length >= args.config.post_batch_size)
|
|
115
|
+
break;
|
|
116
|
+
if (seenInstance.has(candidate.instance_id))
|
|
117
|
+
continue;
|
|
118
|
+
seenInstance.add(candidate.instance_id);
|
|
119
|
+
selected.push(candidate);
|
|
120
|
+
}
|
|
121
|
+
return selected;
|
|
77
122
|
}
|
|
78
123
|
export function selectNextPostingCandidate(args) {
|
|
79
124
|
return selectNextPostingCandidates({ ...args, config: { ...args.config, post_batch_size: 1 } })[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swe-rebench-v2-auto.js","sourceRoot":"","sources":["../../src/solver-types/swe-rebench-v2-auto.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"swe-rebench-v2-auto.js","sourceRoot":"","sources":["../../src/solver-types/swe-rebench-v2-auto.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,9 @@ export interface SweRebenchV2ClaimPolicyRuntimeConfig {
|
|
|
25
25
|
claimLeaseTtlSeconds?: number;
|
|
26
26
|
}
|
|
27
27
|
export type SweRebenchV2GeneratorRuntimeConfig = Partial<GeneratorConfig> & {
|
|
28
|
-
/** @deprecated ignored
|
|
28
|
+
/** @deprecated ignored. Reposts now trigger on claim-budget exhaustion
|
|
29
|
+
* observed via the indexer (#802); posting_window_ms is only the on-chain
|
|
30
|
+
* claim-window deadline, not a repost timer. */
|
|
29
31
|
cooldown_ms?: number;
|
|
30
32
|
/** @deprecated legacy nested shape tolerated on read and flattened on write. */
|
|
31
33
|
claimPolicy?: SweRebenchV2ClaimPolicyRuntimeConfig;
|
|
@@ -41,6 +43,8 @@ export interface SweRebenchV2GeneratorStaticConfig {
|
|
|
41
43
|
agentEoa?: `0x${string}`;
|
|
42
44
|
safeAddress?: `0x${string}`;
|
|
43
45
|
agentPrivateKey?: `0x${string}`;
|
|
46
|
+
/** Optional DiscoveryAPI for network-truth success reconciliation (#669). */
|
|
47
|
+
discoveryApi?: import('../discovery/types.js').DiscoveryAPI;
|
|
44
48
|
}
|
|
45
49
|
export interface MakeSweRebenchV2GeneratorForLaunchedRecordOpts {
|
|
46
50
|
recordRef: {
|
|
@@ -61,7 +65,6 @@ export interface SweRebenchV2GeneratorStateSnapshot {
|
|
|
61
65
|
live: number;
|
|
62
66
|
repostable: number;
|
|
63
67
|
saturated: number;
|
|
64
|
-
abandoned: number;
|
|
65
68
|
};
|
|
66
69
|
lastError?: {
|
|
67
70
|
message: string;
|
|
@@ -70,6 +73,9 @@ export interface SweRebenchV2GeneratorStateSnapshot {
|
|
|
70
73
|
totalPosted: number;
|
|
71
74
|
lastPostedInstanceId?: string;
|
|
72
75
|
config: GeneratorConfig;
|
|
76
|
+
poolPublicationUpdatedAt?: string;
|
|
77
|
+
poolPublicationPriorSize?: number;
|
|
78
|
+
poolPublicationCurrentSize?: number;
|
|
73
79
|
}
|
|
74
80
|
export type SweRebenchV2GeneratorTick = TaskGenerator & {
|
|
75
81
|
getState: () => SweRebenchV2GeneratorStateSnapshot;
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
*
|
|
9
9
|
* Spec: docs/superpowers/specs/2026-05-06-agent-harness-solvernet-design.md §3.6
|
|
10
10
|
*/
|
|
11
|
+
import { stat } from 'node:fs/promises';
|
|
11
12
|
import { homedir } from 'node:os';
|
|
12
13
|
import { join } from 'node:path';
|
|
13
14
|
import { randomUUID } from 'node:crypto';
|
|
@@ -19,6 +20,7 @@ import { selectNextPostingCandidates, summarizePoolState, DEFAULT_GENERATOR_CONF
|
|
|
19
20
|
import { GeneratorStateStore } from './_swe-rebench-v2-state.js';
|
|
20
21
|
import { ValidatedPoolStore, filterToScorablePool, EVAL_SEMANTICS_VERSION, VETTED_POOL_REF_ELIGIBILITY_KEY, createVettedPoolArtifactRef, exportScorableVettedPoolArtifact, hashVettedPoolArtifact, loadVettedPoolArtifactScorableEntries, readVettedPoolArtifactPublication, writeVettedPoolArtifactPublication, } from './_swe-rebench-v2-validated-pool.js';
|
|
21
22
|
import { buildHistoricalPool, fetchHfSplit, listMonthlyPartitions, } from './_swe-rebench-v2-pool.js';
|
|
23
|
+
import { fetchHfWithRetry } from '../harnesses/impls/swe-rebench-v2-evaluator/hf-fetcher.js';
|
|
22
24
|
import { PoolCacheStore, loadPoolWithCacheFallback } from './_swe-rebench-v2-pool-cache.js';
|
|
23
25
|
export const HF_DATASET = 'nebius/SWE-rebench-leaderboard';
|
|
24
26
|
const SOLVER_TYPE = 'swe-rebench-v2.v1';
|
|
@@ -37,7 +39,9 @@ export function defaultStateDir() {
|
|
|
37
39
|
*/
|
|
38
40
|
export async function loadSweRebenchV2Pool() {
|
|
39
41
|
const splitsUrl = `https://datasets-server.huggingface.co/splits?dataset=${encodeURIComponent(HF_DATASET)}`;
|
|
40
|
-
|
|
42
|
+
// Route through the shared HF retry helper so the /splits endpoint gets the
|
|
43
|
+
// same jittered 429-backoff treatment as /rows (issue #578).
|
|
44
|
+
const response = await fetchHfWithRetry(splitsUrl, {});
|
|
41
45
|
if (!response.ok)
|
|
42
46
|
throw new Error(`HF splits fetch failed: ${response.status}`);
|
|
43
47
|
const json = (await response.json());
|
|
@@ -66,13 +70,11 @@ function normalizeGeneratorConfig(raw) {
|
|
|
66
70
|
? cfg['claimPolicy']
|
|
67
71
|
: {};
|
|
68
72
|
const N_target_successes = positiveInt(cfg['N_target_successes'], DEFAULT_GENERATOR_CONFIG.N_target_successes);
|
|
69
|
-
const N_max_postings_per_task = Math.max(N_target_successes, positiveInt(cfg['N_max_postings_per_task'], DEFAULT_GENERATOR_CONFIG.N_max_postings_per_task));
|
|
70
73
|
const rawMode = cfg['admissionMode'];
|
|
71
74
|
const admissionMode = rawMode === 'python-floor' ? 'python-floor' : DEFAULT_ADMISSION_MODE;
|
|
72
75
|
const maxClaimsPerOperator = positiveInt(cfg['maxClaimsPerOperator'] ?? legacyPolicy['maxClaimsPerOperator'], 0);
|
|
73
76
|
return {
|
|
74
77
|
N_target_successes,
|
|
75
|
-
N_max_postings_per_task,
|
|
76
78
|
posting_window_ms: positiveInt(cfg['posting_window_ms'], DEFAULT_GENERATOR_CONFIG.posting_window_ms),
|
|
77
79
|
post_batch_size: positiveInt(cfg['post_batch_size'], DEFAULT_GENERATOR_CONFIG.post_batch_size),
|
|
78
80
|
...(maxClaimsPerOperator > 0 ? { maxClaimsPerOperator } : {}),
|
|
@@ -151,12 +153,18 @@ async function resolvePublishedVettedPool(args) {
|
|
|
151
153
|
manifestCid: args.manifestCid,
|
|
152
154
|
evalSemanticsVersion: EVAL_SEMANTICS_VERSION,
|
|
153
155
|
});
|
|
156
|
+
let priorSize;
|
|
154
157
|
if (existing) {
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
158
|
+
const scorable = await args.store.getScorableEntries(EVAL_SEMANTICS_VERSION);
|
|
159
|
+
const validatedNewer = scorable !== null && scorable.updatedAt > existing.updatedAt;
|
|
160
|
+
if (!validatedNewer) {
|
|
161
|
+
return {
|
|
162
|
+
scorableIds: loadVettedPoolArtifactScorableEntries(existing.artifact).ids,
|
|
163
|
+
artifactRef: existing.ref,
|
|
164
|
+
mode: 'published',
|
|
165
|
+
};
|
|
166
|
+
}
|
|
167
|
+
priorSize = existing.artifact.entries.length;
|
|
160
168
|
}
|
|
161
169
|
const artifact = await exportScorableVettedPoolArtifact(args.store, EVAL_SEMANTICS_VERSION, {
|
|
162
170
|
generatedAt: args.nowIso,
|
|
@@ -182,6 +190,15 @@ async function resolvePublishedVettedPool(args) {
|
|
|
182
190
|
scorableIds: loadVettedPoolArtifactScorableEntries(artifact).ids,
|
|
183
191
|
artifactRef,
|
|
184
192
|
mode: 'published-from-local',
|
|
193
|
+
...(priorSize !== undefined
|
|
194
|
+
? {
|
|
195
|
+
republication: {
|
|
196
|
+
priorSize,
|
|
197
|
+
currentSize: artifact.entries.length,
|
|
198
|
+
publishedAt: args.nowIso,
|
|
199
|
+
},
|
|
200
|
+
}
|
|
201
|
+
: {}),
|
|
185
202
|
};
|
|
186
203
|
}
|
|
187
204
|
async function maybeSignTask(task, opts) {
|
|
@@ -235,6 +252,8 @@ function makeSweRebenchV2Generator(config) {
|
|
|
235
252
|
let totalPosted = 0;
|
|
236
253
|
let lastPostedInstanceId;
|
|
237
254
|
let publishedPoolCache = null;
|
|
255
|
+
let lastValidatedPoolMtimeMs = -1;
|
|
256
|
+
let lastRepublication;
|
|
238
257
|
async function refreshPool() {
|
|
239
258
|
const result = await loadPoolWithCacheFallback({
|
|
240
259
|
loadPool: loadSweRebenchV2Pool,
|
|
@@ -258,6 +277,12 @@ function makeSweRebenchV2Generator(config) {
|
|
|
258
277
|
}
|
|
259
278
|
const tick = async () => {
|
|
260
279
|
const now = Date.now();
|
|
280
|
+
// #802: re-read counters from disk at the start of every tick. last_task_id
|
|
281
|
+
// (and successful) are written by other loops (CreatorLoop.recordLastTaskId,
|
|
282
|
+
// delivery-watcher.recordSuccess) through separate store instances against
|
|
283
|
+
// the same file; without invalidating the long-lived cache here the
|
|
284
|
+
// generator never observes those writes and reposts every tick.
|
|
285
|
+
stateStore.invalidate();
|
|
261
286
|
const runtimeConfig = config.getGeneratorConfig
|
|
262
287
|
? config.getGeneratorConfig()
|
|
263
288
|
: config.generatorConfig;
|
|
@@ -276,11 +301,17 @@ function makeSweRebenchV2Generator(config) {
|
|
|
276
301
|
live: 0,
|
|
277
302
|
repostable: 0,
|
|
278
303
|
saturated: 0,
|
|
279
|
-
abandoned: 0,
|
|
280
304
|
};
|
|
281
305
|
return null;
|
|
282
306
|
}
|
|
283
307
|
lastPollAt = new Date(now).toISOString();
|
|
308
|
+
const validatedPoolMtimeMs = await stat(join(config.stateDir, 'validated-pool.json'))
|
|
309
|
+
.then((s) => s.mtimeMs)
|
|
310
|
+
.catch(() => -1);
|
|
311
|
+
if (validatedPoolMtimeMs > lastValidatedPoolMtimeMs) {
|
|
312
|
+
publishedPoolCache = null;
|
|
313
|
+
lastValidatedPoolMtimeMs = validatedPoolMtimeMs;
|
|
314
|
+
}
|
|
284
315
|
let publishedPool = publishedPoolCache;
|
|
285
316
|
if (!publishedPool) {
|
|
286
317
|
publishedPool = await resolvePublishedVettedPool({
|
|
@@ -303,6 +334,9 @@ function makeSweRebenchV2Generator(config) {
|
|
|
303
334
|
});
|
|
304
335
|
if (publishedPool?.artifactRef) {
|
|
305
336
|
publishedPoolCache = publishedPool;
|
|
337
|
+
if (publishedPool.republication) {
|
|
338
|
+
lastRepublication = publishedPool.republication;
|
|
339
|
+
}
|
|
306
340
|
}
|
|
307
341
|
}
|
|
308
342
|
if (publishedPool === null) {
|
|
@@ -313,7 +347,6 @@ function makeSweRebenchV2Generator(config) {
|
|
|
313
347
|
live: 0,
|
|
314
348
|
repostable: 0,
|
|
315
349
|
saturated: 0,
|
|
316
|
-
abandoned: 0,
|
|
317
350
|
};
|
|
318
351
|
return null;
|
|
319
352
|
}
|
|
@@ -352,7 +385,6 @@ function makeSweRebenchV2Generator(config) {
|
|
|
352
385
|
live: 0,
|
|
353
386
|
repostable: 0,
|
|
354
387
|
saturated: 0,
|
|
355
|
-
abandoned: 0,
|
|
356
388
|
};
|
|
357
389
|
lastError = undefined;
|
|
358
390
|
return null;
|
|
@@ -362,11 +394,85 @@ function makeSweRebenchV2Generator(config) {
|
|
|
362
394
|
for (const task of eligiblePool) {
|
|
363
395
|
counters.set(task.instance_id, await stateStore.getCounters(task.instance_id));
|
|
364
396
|
}
|
|
397
|
+
// Reconcile each instance's `successful` against network truth (#669):
|
|
398
|
+
// take max(local, network). On indexer outage the tick aborts — silently
|
|
399
|
+
// falling through to local-only counters is exactly the bug being fixed.
|
|
400
|
+
// The discoveryApi/manifestCid pair is optional so test paths can skip.
|
|
401
|
+
if (config.discoveryApi && config.solverNetManifestCid) {
|
|
402
|
+
try {
|
|
403
|
+
const networkSuccesses = await config.discoveryApi.getInstanceSuccessCounts({
|
|
404
|
+
manifestCid: config.solverNetManifestCid,
|
|
405
|
+
});
|
|
406
|
+
for (const task of eligiblePool) {
|
|
407
|
+
const local = counters.get(task.instance_id);
|
|
408
|
+
if (!local)
|
|
409
|
+
continue;
|
|
410
|
+
const networkSuccess = networkSuccesses.get(task.instance_id) ?? 0;
|
|
411
|
+
if (networkSuccess > local.successful) {
|
|
412
|
+
counters.set(task.instance_id, { ...local, successful: networkSuccess });
|
|
413
|
+
}
|
|
414
|
+
}
|
|
415
|
+
}
|
|
416
|
+
catch (err) {
|
|
417
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
418
|
+
lastError = {
|
|
419
|
+
message: `network-truth reconciliation failed: ${message}`,
|
|
420
|
+
at: new Date().toISOString(),
|
|
421
|
+
};
|
|
422
|
+
console.warn(`[swe-rebench-v2-gen] ${lastError.message} — skipping this tick`);
|
|
423
|
+
lastPollSummary = {
|
|
424
|
+
poolSize: eligiblePool.length,
|
|
425
|
+
posted: 0,
|
|
426
|
+
unposted: 0,
|
|
427
|
+
live: 0,
|
|
428
|
+
repostable: 0,
|
|
429
|
+
saturated: 0,
|
|
430
|
+
};
|
|
431
|
+
return null;
|
|
432
|
+
}
|
|
433
|
+
}
|
|
434
|
+
// Reconcile claim-budget exhaustion against network truth (#802): a posting
|
|
435
|
+
// is exhausted when its on-chain consumed slots reach maxClaims. Keyed by
|
|
436
|
+
// taskId; the classifier joins via each instance's last_task_id. On a
|
|
437
|
+
// genuine indexer outage (throw) the tick aborts — silently continuing with
|
|
438
|
+
// no claim snapshot would mask real exhaustion (exhausted postings classify
|
|
439
|
+
// `live`), suppress legitimate reposts, and under-serve N. A *successful*
|
|
440
|
+
// empty map (e.g. onchain-floor mode) is NOT an outage and is allowed
|
|
441
|
+
// through: it makes every posting inert (post-once), which is the safe
|
|
442
|
+
// degradation, not a storm.
|
|
443
|
+
let claimCounts;
|
|
444
|
+
if (config.discoveryApi && config.solverNetManifestCid) {
|
|
445
|
+
try {
|
|
446
|
+
// getInstanceClaimCounts is keyed by taskId; its values are a structural
|
|
447
|
+
// superset of InstanceClaimSnapshot, so the map is used directly.
|
|
448
|
+
claimCounts = await config.discoveryApi.getInstanceClaimCounts({
|
|
449
|
+
manifestCid: config.solverNetManifestCid,
|
|
450
|
+
});
|
|
451
|
+
}
|
|
452
|
+
catch (err) {
|
|
453
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
454
|
+
lastError = {
|
|
455
|
+
message: `claim-budget reconciliation failed: ${message}`,
|
|
456
|
+
at: new Date().toISOString(),
|
|
457
|
+
};
|
|
458
|
+
console.warn(`[swe-rebench-v2-gen] ${lastError.message} — skipping this tick`);
|
|
459
|
+
lastPollSummary = {
|
|
460
|
+
poolSize: eligiblePool.length,
|
|
461
|
+
posted: 0,
|
|
462
|
+
unposted: 0,
|
|
463
|
+
live: 0,
|
|
464
|
+
repostable: 0,
|
|
465
|
+
saturated: 0,
|
|
466
|
+
};
|
|
467
|
+
return null;
|
|
468
|
+
}
|
|
469
|
+
}
|
|
365
470
|
const candidates = selectNextPostingCandidates({
|
|
366
471
|
pool: eligiblePool,
|
|
367
472
|
counters,
|
|
368
473
|
config: genConfig,
|
|
369
474
|
now,
|
|
475
|
+
claimCounts,
|
|
370
476
|
lastPostedLanguage,
|
|
371
477
|
});
|
|
372
478
|
if (candidates.length === 0) {
|
|
@@ -375,6 +481,7 @@ function makeSweRebenchV2Generator(config) {
|
|
|
375
481
|
counters,
|
|
376
482
|
config: genConfig,
|
|
377
483
|
now,
|
|
484
|
+
claimCounts,
|
|
378
485
|
lastPostedLanguage,
|
|
379
486
|
});
|
|
380
487
|
lastError = undefined;
|
|
@@ -441,6 +548,7 @@ function makeSweRebenchV2Generator(config) {
|
|
|
441
548
|
counters,
|
|
442
549
|
config: genConfig,
|
|
443
550
|
now,
|
|
551
|
+
claimCounts,
|
|
444
552
|
lastPostedLanguage,
|
|
445
553
|
}),
|
|
446
554
|
posted: tasks.length,
|
|
@@ -463,6 +571,13 @@ function makeSweRebenchV2Generator(config) {
|
|
|
463
571
|
totalPosted,
|
|
464
572
|
lastPostedInstanceId,
|
|
465
573
|
config: liveConfig,
|
|
574
|
+
...(lastRepublication
|
|
575
|
+
? {
|
|
576
|
+
poolPublicationUpdatedAt: lastRepublication.publishedAt,
|
|
577
|
+
poolPublicationPriorSize: lastRepublication.priorSize,
|
|
578
|
+
poolPublicationCurrentSize: lastRepublication.currentSize,
|
|
579
|
+
}
|
|
580
|
+
: {}),
|
|
466
581
|
};
|
|
467
582
|
},
|
|
468
583
|
});
|
|
@@ -503,6 +618,7 @@ export function makeSweRebenchV2GeneratorForLaunchedRecord(opts) {
|
|
|
503
618
|
getGeneratorConfig: () => configRef.current,
|
|
504
619
|
solverNetManifestCid: recordRef.current.manifestCid,
|
|
505
620
|
ipfsRegistryUrl: staticConfig.ipfsRegistryUrl,
|
|
621
|
+
discoveryApi: staticConfig.discoveryApi,
|
|
506
622
|
creator: {
|
|
507
623
|
agentEoa: staticConfig.agentEoa,
|
|
508
624
|
safeAddress: staticConfig.safeAddress,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swe-rebench-v2.js","sourceRoot":"","sources":["../../src/solver-types/swe-rebench-v2.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAIrF,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EACL,2BAA2B,EAC3B,kBAAkB,EAClB,wBAAwB,GAEzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,sBAAsB,EACtB,+BAA+B,EAC/B,2BAA2B,EAC3B,gCAAgC,EAChC,sBAAsB,EACtB,qCAAqC,EACrC,iCAAiC,EACjC,kCAAkC,GAGnC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,mBAAmB,EACnB,YAAY,EACZ,qBAAqB,GAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAE5F,MAAM,CAAC,MAAM,UAAU,GAAG,gCAAgC,CAAC;AAC3D,MAAM,WAAW,GAAG,mBAAmB,CAAC;AACxC,MAAM,WAAW,GAAG,gBAAgB,CAAC;AACrC,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAC9B,MAAM,yBAAyB,GAAG,iCAAiC,CAAC;AAEpE,gEAAgE;AAChE,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAuE5C,MAAM,UAAU,eAAe;IAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,OAAO,EAAE,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;AAClF,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,MAAM,SAAS,GAAG,yDAAyD,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;IAC5G,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,CAAC;IACxC,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAChF,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA0C,CAAC;IAC9E,MAAM,MAAM,GAAG,qBAAqB,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9E,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,+EAA+E,CAAC,CAAC;IACnG,CAAC;IACD,OAAO,mBAAmB,CAAC;QACzB,MAAM;QACN,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;KAChF,CAAC,CAAC;AACL,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,iCAAiC,CAAC,QAAiB;IACjE,OAAO,IAAI,kBAAkB,CAAC,EAAE,QAAQ,EAAE,QAAQ,IAAI,eAAe,EAAE,EAAE,CAAC,CAAC;AAC7E,CAAC;AAED,SAAS,WAAW,CAAC,KAAc,EAAE,QAAgB;IACnD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC9F,CAAC;AAED,MAAM,sBAAsB,GAAkB,UAAU,CAAC;AAEzD,SAAS,wBAAwB,CAAC,GAAY;IAC5C,MAAM,GAAG,GAAG,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI;QACjD,CAAC,CAAC,GAA8B;QAChC,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,YAAY,GAAG,OAAO,GAAG,CAAC,aAAa,CAAC,KAAK,QAAQ,IAAI,GAAG,CAAC,aAAa,CAAC,KAAK,IAAI;QACxF,CAAC,CAAC,GAAG,CAAC,aAAa,CAA4B;QAC/C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,kBAAkB,GAAG,WAAW,CACpC,GAAG,CAAC,oBAAoB,CAAC,EACzB,wBAAwB,CAAC,kBAAkB,CAC5C,CAAC;IACF,MAAM,uBAAuB,GAAG,IAAI,CAAC,GAAG,CACtC,kBAAkB,EAClB,WAAW,CACT,GAAG,CAAC,yBAAyB,CAAC,EAC9B,wBAAwB,CAAC,uBAAuB,CACjD,CACF,CAAC;IACF,MAAM,OAAO,GAAG,GAAG,CAAC,eAAe,CAAC,CAAC;IACrC,MAAM,aAAa,GACjB,OAAO,KAAK,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,sBAAsB,CAAC;IACvE,MAAM,oBAAoB,GAAG,WAAW,CACtC,GAAG,CAAC,sBAAsB,CAAC,IAAI,YAAY,CAAC,sBAAsB,CAAC,EACnE,CAAC,CACF,CAAC;IACF,OAAO;QACL,kBAAkB;QAClB,uBAAuB;QACvB,iBAAiB,EAAE,WAAW,CAC5B,GAAG,CAAC,mBAAmB,CAAC,EACxB,wBAAwB,CAAC,iBAAiB,CAC3C;QACD,eAAe,EAAE,WAAW,CAC1B,GAAG,CAAC,iBAAiB,CAAC,EACtB,wBAAwB,CAAC,eAAe,CACzC;QACD,GAAG,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,oBAAoB,EAAE,WAAW,CAC/B,GAAG,CAAC,sBAAsB,CAAC,IAAI,YAAY,CAAC,sBAAsB,CAAC,EACnE,wBAAwB,CAAC,oBAAoB,CAC9C;QACD,aAAa;KACd,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAyB;IACvD,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,wCAAwC,CAAC,CAAC;IAC7E,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACzD,MAAM,GAAG,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAChE,IAAI,GAAG,CAAC,cAAc,CAAC;QAAE,OAAO,YAAY,CAAC;IAC7C,IAAI,GAAG,CAAC,sBAAsB,CAAC;QAAE,OAAO,YAAY,CAAC;IACrD,IAAI,GAAG,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAC/B,IAAI,GAAG,CAAC,6BAA6B,CAAC;QAAE,OAAO,KAAK,CAAC;IACrD,IAAI,GAAG,CAAC,WAAW,CAAC;QAAE,OAAO,GAAG,CAAC;IACjC,IAAI,GAAG,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAC/B,IAAI,GAAG,CAAC,UAAU,CAAC;QAAE,OAAO,MAAM,CAAC;IACnC,IAAI,GAAG,CAAC,QAAQ,CAAC;QAAE,OAAO,MAAM,CAAC;IACjC,IAAI,GAAG,CAAC,UAAU,CAAC;QAAE,OAAO,MAAM,CAAC;IACnC,IAAI,GAAG,CAAC,QAAQ,CAAC;QAAE,OAAO,QAAQ,CAAC;IACnC,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,iBAAiB,CACxB,IAAc;IAEd,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,IAAI,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3G,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACpE,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC;AACjD,CAAC;AAED,SAAS,kBAAkB,CAAC,UAAkB;IAC5C,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnD,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY;QAAE,OAAO,iBAAiB,CAAC;IACpD,MAAM,OAAO,GAAG,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;IACzE,OAAO,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;AAC1B,CAAC;AAED,SAAS,4BAA4B;IACnC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;IACtF,MAAM,QAAQ,GAAG,QAAQ,EAAE,mBAAmB,CAAC;IAC/C,OAAO;QACL,IAAI,EAAE,QAAQ,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU;QAC5D,SAAS,EAAE,QAAQ,EAAE,SAAS,IAAI,wBAAwB,CAAC,kBAAkB;QAC7E,oBAAoB,EAAE,QAAQ,EAAE,oBAAoB,IAAI,wBAAwB,CAAC,kBAAkB;QACnG,oBAAoB,EAAE,QAAQ,EAAE,oBAAoB,IAAI,EAAE,GAAG,EAAE;KAChE,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAC5B,SAA0B,EAC1B,wBAAgC;IAEhC,MAAM,QAAQ,GAAG,4BAA4B,EAAE,CAAC;IAChD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,wBAAwB,CAAC,CAAC;IACxD,MAAM,oBAAoB,GAAG,IAAI,CAAC,GAAG,CACnC,SAAS,EACT,SAAS,CAAC,oBAAoB,IAAI,SAAS,CAC5C,CAAC;IACF,OAAO;QACL,GAAG,QAAQ;QACX,SAAS;QACT,oBAAoB;QACpB,oBAAoB,EAAE,SAAS,CAAC,oBAAoB;KACrD,CAAC;AACJ,CAAC;AAQD,KAAK,UAAU,0BAA0B,CAAC,IAOzC;IACC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QACtB,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;IACvE,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,iCAAiC,CAAC;QACvD,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,oBAAoB,EAAE,sBAAsB;KAC7C,CAAC,CAAC;IACH,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO;YACL,WAAW,EAAE,qCAAqC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,GAAG;YACzE,WAAW,EAAE,QAAQ,CAAC,GAAG;YACzB,IAAI,EAAE,WAAW;SAClB,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,gCAAgC,CAAC,IAAI,CAAC,KAAK,EAAE,sBAAsB,EAAE;QAC1F,WAAW,EAAE,IAAI,CAAC,MAAM;KACzB,CAAC,CAAC;IACH,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/C,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;IAC1E,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IACtE,MAAM,WAAW,GAAG,2BAA2B,CAAC;QAC9C,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,WAAW;QACX,YAAY,EAAE,sBAAsB,CAAC,QAAQ,CAAC;QAC9C,oBAAoB,EAAE,sBAAsB;QAC5C,WAAW,EAAE,IAAI,CAAC,MAAM;KACzB,CAAC,CAAC;IACH,MAAM,kCAAkC,CAAC;QACvC,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,GAAG,EAAE,WAAW;QAChB,QAAQ;QACR,SAAS,EAAE,IAAI,CAAC,MAAM;KACvB,CAAC,CAAC;IACH,OAAO;QACL,WAAW,EAAE,qCAAqC,CAAC,QAAQ,CAAC,CAAC,GAAG;QAChE,WAAW;QACX,IAAI,EAAE,sBAAsB;KAC7B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,IAAU,EACV,IAGC;IAED,IACE,CAAC,IAAI,CAAC,oBAAoB;QAC1B,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ;QACvB,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW;QACzB,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAC7B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,OAAO,GAAW;QACtB,aAAa,EAAE,SAAS;QACxB,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,WAAW;QAC1C,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,WAAW;QAC1C,eAAe,EAAE,IAAI,CAAC,eAAe,IAAI,gBAAgB;QACzD,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;QAC/C,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,aAAa;QAChC,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,MAAM,EAAE,IAAI,CAAC,MAAO;QACpB,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE;QACrB,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE;QACnC,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,4BAA4B,EAAE;QAC/D,OAAO,EAAE;YACP,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;YACrC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;SAChC;QACD,SAAS,EAAE,IAAI,CAAC,SAAS;KAC1B,CAAC;IACF,OAAO;QACL,GAAG,IAAI;QACP,UAAU,EAAE,MAAM,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;KACpE,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,yBAAyB,CAAC,MAA2C;IAC5E,MAAM,UAAU,GAAG,IAAI,mBAAmB,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1E,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEjF,MAAM,SAAS,GAAG,IAAI,cAAc,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpE,IAAI,IAAI,GAAe,EAAE,CAAC;IAC1B,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAC9B,IAAI,kBAAsC,CAAC;IAC3C,IAAI,UAA8B,CAAC;IACnC,IAAI,eAAsE,CAAC;IAC3E,IAAI,SAA0D,CAAC;IAC/D,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,oBAAwC,CAAC;IAC7C,IAAI,kBAAkB,GAA+B,IAAI,CAAC;IAE1D,KAAK,UAAU,WAAW;QACxB,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC;YAC7C,QAAQ,EAAE,oBAAoB;YAC9B,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACnB,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC;QACjC,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAClB,+DAA+D;YAC/D,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC5B,CAAC;QACD,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CACV,wDAAwD,IAAI,CAAC,MAAM,2BAA2B;gBAC9F,kDAAkD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,CAC1E,CAAC;QACJ,CAAC;aAAM,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACxB,OAAO,CAAC,IAAI,CACV,uDAAuD,IAAI,CAAC,MAAM,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAC/F,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,IAA4B,EAAE;QAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,aAAa,GAAG,MAAM,CAAC,kBAAkB;YAC7C,CAAC,CAAC,MAAM,CAAC,kBAAkB,EAAE;YAC7B,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC;QAC3B,MAAM,SAAS,GAAG,wBAAwB,CAAC,aAAa,CAAC,CAAC;QAE1D,wEAAwE;QACxE,yEAAyE;QACzE,kCAAkC;QAClC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,IAAI,GAAG,GAAG,YAAY,GAAG,eAAe,EAAE,CAAC;YAC/E,MAAM,WAAW,EAAE,CAAC;QACtB,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,eAAe,GAAG;gBAChB,QAAQ,EAAE,CAAC;gBACX,MAAM,EAAE,CAAC;gBACT,QAAQ,EAAE,CAAC;gBACX,IAAI,EAAE,CAAC;gBACP,UAAU,EAAE,CAAC;gBACb,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,CAAC;aACb,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,UAAU,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAEzC,IAAI,aAAa,GAA+B,kBAAkB,CAAC;QACnE,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,aAAa,GAAG,MAAM,0BAA0B,CAAC;gBAC/C,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,WAAW,EAAE,MAAM,CAAC,oBAAoB;gBACxC,KAAK,EAAE,kBAAkB;gBACzB,MAAM,EAAE,UAAU;gBAClB,eAAe,EACb,MAAM,CAAC,eAAe;oBACtB,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;oBACrC,yBAAyB;gBAC3B,MAAM,EAAE,YAAY;aACrB,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACf,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACjE,SAAS,GAAG;oBACV,OAAO,EAAE,mCAAmC,OAAO,EAAE;oBACrD,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBAC7B,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,wBAAwB,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC1D,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;YACH,IAAI,aAAa,EAAE,WAAW,EAAE,CAAC;gBAC/B,kBAAkB,GAAG,aAAa,CAAC;YACrC,CAAC;QACH,CAAC;QACD,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YAC3B,eAAe,GAAG;gBAChB,QAAQ,EAAE,CAAC;gBACX,MAAM,EAAE,CAAC;gBACT,QAAQ,EAAE,CAAC;gBACX,IAAI,EAAE,CAAC;gBACP,UAAU,EAAE,CAAC;gBACb,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,CAAC;aACb,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IACE,SAAS,CAAC,aAAa,KAAK,UAAU;YACtC,aAAa,CAAC,IAAI,KAAK,aAAa;YACpC,CAAC,iBAAiB,EAClB,CAAC;YACD,iBAAiB,GAAG,IAAI,CAAC;YACzB,OAAO,CAAC,IAAI,CACV,8JAA8J,CAC/J,CAAC;QACJ,CAAC;QAED,0EAA0E;QAC1E,sEAAsE;QACtE,0EAA0E;QAC1E,2CAA2C;QAC3C,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW;YAC3C,CAAC,CAAC,aAAa,CAAC,WAAW;YAC3B,CAAC,CAAC,SAAS,CAAC,aAAa,KAAK,cAAc;gBAC1C,CAAC,CAAC,MAAM,kBAAkB,CAAC,cAAc,CAAC,sBAAsB,CAAC;gBACjE,CAAC,CAAC,IAAI,CAAC;QACX,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,oBAAoB,CACjE,IAAI,EACJ,WAAW,EACX,SAAS,CAAC,aAAa,CACxB,CAAC;QACF,IAAI,QAAQ,KAAK,4BAA4B,IAAI,CAAC,WAAW,EAAE,CAAC;YAC9D,WAAW,GAAG,IAAI,CAAC;YACnB,OAAO,CAAC,IAAI,CACV,2FAA2F;gBAC3F,qFAAqF;gBACrF,uEAAuE;gBACvE,8FAA8F,CAC/F,CAAC;QACJ,CAAC;QACD,IAAI,QAAQ,KAAK,cAAc,IAAI,CAAC,WAAW,EAAE,CAAC;YAChD,WAAW,GAAG,IAAI,CAAC;YACnB,OAAO,CAAC,IAAI,CACV,iFAAiF,YAAY,CAAC,MAAM,0BAA0B,IAAI,CAAC,MAAM,sGAAsG,CAChP,CAAC;QACJ,CAAC;QACD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,eAAe,GAAG;gBAChB,QAAQ,EAAE,CAAC;gBACX,MAAM,EAAE,CAAC;gBACT,QAAQ,EAAE,CAAC;gBACX,IAAI,EAAE,CAAC;gBACP,UAAU,EAAE,CAAC;gBACb,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,CAAC;aACb,CAAC;YACF,SAAS,GAAG,SAAS,CAAC;YACtB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,uCAAuC;QACvC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA0E,CAAC;QACnG,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YAChC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;QACjF,CAAC;QAED,MAAM,UAAU,GAAG,2BAA2B,CAAC;YAC7C,IAAI,EAAE,YAAY;YAClB,QAAQ;YACR,MAAM,EAAE,SAAS;YACjB,GAAG;YACH,kBAAkB;SACnB,CAAC,CAAC;QACH,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,eAAe,GAAG,kBAAkB,CAAC;gBACnC,IAAI,EAAE,YAAY;gBAClB,QAAQ;gBACR,MAAM,EAAE,SAAS;gBACjB,GAAG;gBACH,kBAAkB;aACnB,CAAC,CAAC;YACH,SAAS,GAAG,SAAS,CAAC;YACtB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,KAAK,GAAW,EAAE,CAAC;QACzB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,MAAM,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YAC1D,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YACxE,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YACjD,kBAAkB,GAAG,SAAS,CAAC,QAAQ,CAAC;YACxC,WAAW,IAAI,CAAC,CAAC;YACjB,oBAAoB,GAAG,SAAS,CAAC,WAAW,CAAC;YAE7C,MAAM,wBAAwB,GAAG,SAAS,CAAC,kBAAkB,GAAG,WAAW,CAAC,UAAU,CAAC;YACvF,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,CAAC;YAC5E,MAAM,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACxD,MAAM,WAAW,GAAG,YAAY,GAAG,IAAI,CAAC;YAExC,MAAM,IAAI,GAAG,sBAAsB,CAAC,KAAK,CAAC;gBACxC,aAAa,EAAE,mBAAmB;gBAClC,WAAW,EAAE,SAAS,CAAC,WAAW;gBAClC,IAAI,EAAE,SAAS,CAAC,IAAI,IAAI,kBAAkB,CAAC,SAAS,CAAC,WAAW,CAAC;gBACjE,WAAW,EAAE,SAAS,CAAC,WAAW,IAAI,0CAA0C;gBAChF,QAAQ,EAAE,iBAAiB,CAAC,SAAS,CAAC;gBACtC,iBAAiB,EACf,SAAS,CAAC,iBAAiB,IAAI,4BAA4B,SAAS,CAAC,WAAW,EAAE;gBACpF,SAAS,EAAE,SAAS,CAAC,SAAS,IAAI,EAAE;gBACpC,UAAU,EAAE,SAAS,CAAC,UAAU;gBAChC,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,aAAa,EAAE,YAAY;gBAC3B,WAAW,EAAE,UAAU;aACxB,CAAC,CAAC;YAEH,KAAK,CAAC,IAAI,CAAC;gBACT,EAAE,EAAE,UAAU,EAAE;gBAChB,WAAW,EAAE,mBAAmB,SAAS,CAAC,WAAW,EAAE;gBACvD,UAAU,EAAE,WAAW;gBACvB,UAAU,EAAE,WAAW;gBACvB,eAAe,EAAE,gBAAgB;gBACjC,GAAG,CAAC,MAAM,CAAC,oBAAoB;oBAC7B,CAAC,CAAC,EAAE,oBAAoB,EAAE,MAAM,CAAC,oBAAoB,EAAE;oBACvD,CAAC,CAAC,EAAE,CAAC;gBACP,IAAI,EAAE,aAAa;gBACnB,MAAM,EAAE;oBACN,OAAO,EAAE,GAAG;oBACZ,KAAK,EAAE,WAAW;iBACnB;gBACD,WAAW,EAAE,qBAAqB,CAAC,SAAS,EAAE,wBAAwB,CAAC;gBACvE,IAAI;gBACJ,WAAW,EAAE;oBACX,UAAU,EAAE,SAAS,CAAC,UAAU;oBAChC,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,yBAAyB,EAAE,WAAW,CAAC,MAAM;oBAC7C,eAAe,EAAE,SAAS;oBAC1B,GAAG,CAAC,aAAa,CAAC,WAAW;wBAC3B,CAAC,CAAC,EAAE,CAAC,+BAA+B,CAAC,EAAE,aAAa,CAAC,WAAW,EAAE;wBAClE,CAAC,CAAC,EAAE,CAAC;iBACR;aACF,CAAC,CAAC;QACL,CAAC;QAED,OAAO,CAAC,GAAG,CACT,gCAAgC,UAAU,CAAC,MAAM,gBAAgB;YACjE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAChE,CAAC;QACF,eAAe,GAAG;YAChB,GAAG,kBAAkB,CAAC;gBACpB,IAAI,EAAE,YAAY;gBAClB,QAAQ;gBACR,MAAM,EAAE,SAAS;gBACjB,GAAG;gBACH,kBAAkB;aACnB,CAAC;YACF,MAAM,EAAE,KAAK,CAAC,MAAM;SACrB,CAAC;QACF,SAAS,GAAG,SAAS,CAAC;QACtB,MAAM,MAAM,GAAW,EAAE,CAAC;QAC1B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,CAAC,IAAI,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QACtF,CAAC;QACD,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3C,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;QACzB,QAAQ;YACN,MAAM,UAAU,GAAG,wBAAwB,CACzC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CACjF,CAAC;YACF,OAAO;gBACL,IAAI,EAAE,gBAAgB;gBACtB,UAAU;gBACV,eAAe;gBACf,SAAS;gBACT,WAAW;gBACX,oBAAoB;gBACpB,MAAM,EAAE,UAAU;aACnB,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAiD;IACxE,UAAU,EAAE,mBAAmB;IAC/B,KAAK,CAAC,SAAS,CAAC,GAAG;QACjB,MAAM,IAAI,GAAG,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/C,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE,IAAI;YACV,WAAW,EAAE,EAAE;SAChB,CAAC;IACJ,CAAC;IACD,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,yBAAyB,CAAC,MAAM,CAAC;IAC7D,oBAAoB,EAAE,CAAC,GAAG,EAAE,EAAE;QAC5B,IAAI,GAAG,CAAC,OAAO,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAChD,sDAAsD;QACtD,IAAI,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,KAAK,GAAG;YAAE,OAAO,SAAS,CAAC;QAClF,MAAM,QAAQ,GACZ,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;YAC5C,eAAe,EAAE,CAAC;QACpB,OAAO,EAAE,QAAQ,EAAE,CAAC;IACtB,CAAC;IACD,EAAE,EAAE;QACF,WAAW,EAAE,uDAAuD;QACpE,QAAQ,EAAE,MAAM;KACjB;CACF,CAAC;AAEF,MAAM,UAAU,0CAA0C,CACxD,IAAoD;IAEpD,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC;IACzD,MAAM,QAAQ,GACZ,YAAY,CAAC,QAAQ;QACrB,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;QAC5C,eAAe,EAAE,CAAC;IAEpB,MAAM,SAAS,GAAG,yBAAyB,CAAC;QAC1C,QAAQ;QACR,kBAAkB,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO;QAC3C,oBAAoB,EAAE,SAAS,CAAC,OAAO,CAAC,WAAW;QACnD,eAAe,EAAE,YAAY,CAAC,eAAe;QAC7C,OAAO,EAAE;YACP,QAAQ,EAAE,YAAY,CAAC,QAAQ;YAC/B,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,eAAe,EAAE,YAAY,CAAC,eAAe;SAC9C;KACF,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,KAAK,IAAmC,EAAE;QAC1D,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC;QACjC,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU;YAAE,OAAO,IAAI,CAAC;QAC9C,IAAI,CAAC,MAAM,CAAC,gBAAgB;YAAE,OAAO,IAAI,CAAC;QAC1C,OAAO,SAAS,EAAE,CAAC;IACrB,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE;QAC9B,QAAQ;YACN,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC9B,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CAAC,QAAiB;IACzD,MAAM,GAAG,GACP,QAAQ;QACR,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;QAC5C,eAAe,EAAE,CAAC;IACpB,OAAO,IAAI,mBAAmB,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;AACpD,CAAC"}
|
|
1
|
+
{"version":3,"file":"swe-rebench-v2.js","sourceRoot":"","sources":["../../src/solver-types/swe-rebench-v2.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAIrF,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EACL,2BAA2B,EAC3B,kBAAkB,EAClB,wBAAwB,GAGzB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,sBAAsB,EACtB,+BAA+B,EAC/B,2BAA2B,EAC3B,gCAAgC,EAChC,sBAAsB,EACtB,qCAAqC,EACrC,iCAAiC,EACjC,kCAAkC,GAGnC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,mBAAmB,EACnB,YAAY,EACZ,qBAAqB,GAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAC7F,OAAO,EAAE,cAAc,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAE5F,MAAM,CAAC,MAAM,UAAU,GAAG,gCAAgC,CAAC;AAC3D,MAAM,WAAW,GAAG,mBAAmB,CAAC;AACxC,MAAM,WAAW,GAAG,gBAAgB,CAAC;AACrC,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAC9B,MAAM,yBAAyB,GAAG,iCAAiC,CAAC;AAEpE,gEAAgE;AAChE,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AA8E5C,MAAM,UAAU,eAAe;IAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,OAAO,EAAE,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;AAClF,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB;IACxC,MAAM,SAAS,GAAG,yDAAyD,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;IAC5G,4EAA4E;IAC5E,6DAA6D;IAC7D,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACvD,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAChF,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA0C,CAAC;IAC9E,MAAM,MAAM,GAAG,qBAAqB,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9E,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,+EAA+E,CAAC,CAAC;IACnG,CAAC;IACD,OAAO,mBAAmB,CAAC;QACzB,MAAM;QACN,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;KAChF,CAAC,CAAC;AACL,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,iCAAiC,CAAC,QAAiB;IACjE,OAAO,IAAI,kBAAkB,CAAC,EAAE,QAAQ,EAAE,QAAQ,IAAI,eAAe,EAAE,EAAE,CAAC,CAAC;AAC7E,CAAC;AAED,SAAS,WAAW,CAAC,KAAc,EAAE,QAAgB;IACnD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC9F,CAAC;AAED,MAAM,sBAAsB,GAAkB,UAAU,CAAC;AAEzD,SAAS,wBAAwB,CAAC,GAAY;IAC5C,MAAM,GAAG,GAAG,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI;QACjD,CAAC,CAAC,GAA8B;QAChC,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,YAAY,GAAG,OAAO,GAAG,CAAC,aAAa,CAAC,KAAK,QAAQ,IAAI,GAAG,CAAC,aAAa,CAAC,KAAK,IAAI;QACxF,CAAC,CAAC,GAAG,CAAC,aAAa,CAA4B;QAC/C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,kBAAkB,GAAG,WAAW,CACpC,GAAG,CAAC,oBAAoB,CAAC,EACzB,wBAAwB,CAAC,kBAAkB,CAC5C,CAAC;IACF,MAAM,OAAO,GAAG,GAAG,CAAC,eAAe,CAAC,CAAC;IACrC,MAAM,aAAa,GACjB,OAAO,KAAK,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,sBAAsB,CAAC;IACvE,MAAM,oBAAoB,GAAG,WAAW,CACtC,GAAG,CAAC,sBAAsB,CAAC,IAAI,YAAY,CAAC,sBAAsB,CAAC,EACnE,CAAC,CACF,CAAC;IACF,OAAO;QACL,kBAAkB;QAClB,iBAAiB,EAAE,WAAW,CAC5B,GAAG,CAAC,mBAAmB,CAAC,EACxB,wBAAwB,CAAC,iBAAiB,CAC3C;QACD,eAAe,EAAE,WAAW,CAC1B,GAAG,CAAC,iBAAiB,CAAC,EACtB,wBAAwB,CAAC,eAAe,CACzC;QACD,GAAG,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,oBAAoB,EAAE,WAAW,CAC/B,GAAG,CAAC,sBAAsB,CAAC,IAAI,YAAY,CAAC,sBAAsB,CAAC,EACnE,wBAAwB,CAAC,oBAAoB,CAC9C;QACD,aAAa;KACd,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAyB;IACvD,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,wCAAwC,CAAC,CAAC;IAC7E,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACzD,MAAM,GAAG,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAChE,IAAI,GAAG,CAAC,cAAc,CAAC;QAAE,OAAO,YAAY,CAAC;IAC7C,IAAI,GAAG,CAAC,sBAAsB,CAAC;QAAE,OAAO,YAAY,CAAC;IACrD,IAAI,GAAG,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAC/B,IAAI,GAAG,CAAC,6BAA6B,CAAC;QAAE,OAAO,KAAK,CAAC;IACrD,IAAI,GAAG,CAAC,WAAW,CAAC;QAAE,OAAO,GAAG,CAAC;IACjC,IAAI,GAAG,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAC/B,IAAI,GAAG,CAAC,UAAU,CAAC;QAAE,OAAO,MAAM,CAAC;IACnC,IAAI,GAAG,CAAC,QAAQ,CAAC;QAAE,OAAO,MAAM,CAAC;IACjC,IAAI,GAAG,CAAC,UAAU,CAAC;QAAE,OAAO,MAAM,CAAC;IACnC,IAAI,GAAG,CAAC,QAAQ,CAAC;QAAE,OAAO,QAAQ,CAAC;IACnC,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,iBAAiB,CACxB,IAAc;IAEd,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,IAAI,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC3G,MAAM,MAAM,GAAG,sBAAsB,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACpE,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC;AACjD,CAAC;AAED,SAAS,kBAAkB,CAAC,UAAkB;IAC5C,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnD,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY;QAAE,OAAO,iBAAiB,CAAC;IACpD,MAAM,OAAO,GAAG,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;IACzE,OAAO,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;AAC1B,CAAC;AAED,SAAS,4BAA4B;IACnC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;IACtF,MAAM,QAAQ,GAAG,QAAQ,EAAE,mBAAmB,CAAC;IAC/C,OAAO;QACL,IAAI,EAAE,QAAQ,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU;QAC5D,SAAS,EAAE,QAAQ,EAAE,SAAS,IAAI,wBAAwB,CAAC,kBAAkB;QAC7E,oBAAoB,EAAE,QAAQ,EAAE,oBAAoB,IAAI,wBAAwB,CAAC,kBAAkB;QACnG,oBAAoB,EAAE,QAAQ,EAAE,oBAAoB,IAAI,EAAE,GAAG,EAAE;KAChE,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAC5B,SAA0B,EAC1B,wBAAgC;IAEhC,MAAM,QAAQ,GAAG,4BAA4B,EAAE,CAAC;IAChD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,wBAAwB,CAAC,CAAC;IACxD,MAAM,oBAAoB,GAAG,IAAI,CAAC,GAAG,CACnC,SAAS,EACT,SAAS,CAAC,oBAAoB,IAAI,SAAS,CAC5C,CAAC;IACF,OAAO;QACL,GAAG,QAAQ;QACX,SAAS;QACT,oBAAoB;QACpB,oBAAoB,EAAE,SAAS,CAAC,oBAAoB;KACrD,CAAC;AACJ,CAAC;AAWD,KAAK,UAAU,0BAA0B,CAAC,IAOzC;IACC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QACtB,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;IACvE,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,iCAAiC,CAAC;QACvD,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,oBAAoB,EAAE,sBAAsB;KAC7C,CAAC,CAAC;IAEH,IAAI,SAA6B,CAAC;IAClC,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,sBAAsB,CAAC,CAAC;QAC7E,MAAM,cAAc,GAAG,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;QACpF,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO;gBACL,WAAW,EAAE,qCAAqC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,GAAG;gBACzE,WAAW,EAAE,QAAQ,CAAC,GAAG;gBACzB,IAAI,EAAE,WAAW;aAClB,CAAC;QACJ,CAAC;QACD,SAAS,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;IAC/C,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,gCAAgC,CAAC,IAAI,CAAC,KAAK,EAAE,sBAAsB,EAAE;QAC1F,WAAW,EAAE,IAAI,CAAC,MAAM;KACzB,CAAC,CAAC;IACH,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/C,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;IAC1E,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IACtE,MAAM,WAAW,GAAG,2BAA2B,CAAC;QAC9C,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,WAAW;QACX,YAAY,EAAE,sBAAsB,CAAC,QAAQ,CAAC;QAC9C,oBAAoB,EAAE,sBAAsB;QAC5C,WAAW,EAAE,IAAI,CAAC,MAAM;KACzB,CAAC,CAAC;IACH,MAAM,kCAAkC,CAAC;QACvC,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,GAAG,EAAE,WAAW;QAChB,QAAQ;QACR,SAAS,EAAE,IAAI,CAAC,MAAM;KACvB,CAAC,CAAC;IACH,OAAO;QACL,WAAW,EAAE,qCAAqC,CAAC,QAAQ,CAAC,CAAC,GAAG;QAChE,WAAW;QACX,IAAI,EAAE,sBAAsB;QAC5B,GAAG,CAAC,SAAS,KAAK,SAAS;YACzB,CAAC,CAAC;gBACE,aAAa,EAAE;oBACb,SAAS;oBACT,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM;oBACpC,WAAW,EAAE,IAAI,CAAC,MAAM;iBACzB;aACF;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,IAAU,EACV,IAGC;IAED,IACE,CAAC,IAAI,CAAC,oBAAoB;QAC1B,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ;QACvB,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW;QACzB,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,EAC7B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,OAAO,GAAW;QACtB,aAAa,EAAE,SAAS;QACxB,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,WAAW;QAC1C,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,WAAW;QAC1C,eAAe,EAAE,IAAI,CAAC,eAAe,IAAI,gBAAgB;QACzD,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;QAC/C,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,aAAa;QAChC,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,MAAM,EAAE,IAAI,CAAC,MAAO;QACpB,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE;QACrB,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE;QACnC,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,4BAA4B,EAAE;QAC/D,OAAO,EAAE;YACP,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;YACrC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;SAChC;QACD,SAAS,EAAE,IAAI,CAAC,SAAS;KAC1B,CAAC;IACF,OAAO;QACL,GAAG,IAAI;QACP,UAAU,EAAE,MAAM,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;KACpE,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,yBAAyB,CAAC,MAA2C;IAC5E,MAAM,UAAU,GAAG,IAAI,mBAAmB,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1E,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEjF,MAAM,SAAS,GAAG,IAAI,cAAc,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpE,IAAI,IAAI,GAAe,EAAE,CAAC;IAC1B,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAC9B,IAAI,kBAAsC,CAAC;IAC3C,IAAI,UAA8B,CAAC;IACnC,IAAI,eAAsE,CAAC;IAC3E,IAAI,SAA0D,CAAC;IAC/D,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,oBAAwC,CAAC;IAC7C,IAAI,kBAAkB,GAA+B,IAAI,CAAC;IAC1D,IAAI,wBAAwB,GAAG,CAAC,CAAC,CAAC;IAClC,IAAI,iBAAmE,CAAC;IAExE,KAAK,UAAU,WAAW;QACxB,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC;YAC7C,QAAQ,EAAE,oBAAoB;YAC9B,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACnB,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC;QACjC,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAClB,+DAA+D;YAC/D,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC5B,CAAC;QACD,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CACV,wDAAwD,IAAI,CAAC,MAAM,2BAA2B;gBAC9F,kDAAkD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,CAC1E,CAAC;QACJ,CAAC;aAAM,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACxB,OAAO,CAAC,IAAI,CACV,uDAAuD,IAAI,CAAC,MAAM,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAC/F,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,IAA4B,EAAE;QAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,4EAA4E;QAC5E,6EAA6E;QAC7E,2EAA2E;QAC3E,oEAAoE;QACpE,gEAAgE;QAChE,UAAU,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,aAAa,GAAG,MAAM,CAAC,kBAAkB;YAC7C,CAAC,CAAC,MAAM,CAAC,kBAAkB,EAAE;YAC7B,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC;QAC3B,MAAM,SAAS,GAAG,wBAAwB,CAAC,aAAa,CAAC,CAAC;QAE1D,wEAAwE;QACxE,yEAAyE;QACzE,kCAAkC;QAClC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,IAAI,GAAG,GAAG,YAAY,GAAG,eAAe,EAAE,CAAC;YAC/E,MAAM,WAAW,EAAE,CAAC;QACtB,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,eAAe,GAAG;gBAChB,QAAQ,EAAE,CAAC;gBACX,MAAM,EAAE,CAAC;gBACT,QAAQ,EAAE,CAAC;gBACX,IAAI,EAAE,CAAC;gBACP,UAAU,EAAE,CAAC;gBACb,SAAS,EAAE,CAAC;aACb,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,UAAU,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAEzC,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;aAClF,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;aACtB,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACnB,IAAI,oBAAoB,GAAG,wBAAwB,EAAE,CAAC;YACpD,kBAAkB,GAAG,IAAI,CAAC;YAC1B,wBAAwB,GAAG,oBAAoB,CAAC;QAClD,CAAC;QAED,IAAI,aAAa,GAA+B,kBAAkB,CAAC;QACnE,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,aAAa,GAAG,MAAM,0BAA0B,CAAC;gBAC/C,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,WAAW,EAAE,MAAM,CAAC,oBAAoB;gBACxC,KAAK,EAAE,kBAAkB;gBACzB,MAAM,EAAE,UAAU;gBAClB,eAAe,EACb,MAAM,CAAC,eAAe;oBACtB,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;oBACrC,yBAAyB;gBAC3B,MAAM,EAAE,YAAY;aACrB,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACf,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACjE,SAAS,GAAG;oBACV,OAAO,EAAE,mCAAmC,OAAO,EAAE;oBACrD,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBAC7B,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,wBAAwB,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC1D,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;YACH,IAAI,aAAa,EAAE,WAAW,EAAE,CAAC;gBAC/B,kBAAkB,GAAG,aAAa,CAAC;gBACnC,IAAI,aAAa,CAAC,aAAa,EAAE,CAAC;oBAChC,iBAAiB,GAAG,aAAa,CAAC,aAAa,CAAC;gBAClD,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YAC3B,eAAe,GAAG;gBAChB,QAAQ,EAAE,CAAC;gBACX,MAAM,EAAE,CAAC;gBACT,QAAQ,EAAE,CAAC;gBACX,IAAI,EAAE,CAAC;gBACP,UAAU,EAAE,CAAC;gBACb,SAAS,EAAE,CAAC;aACb,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IACE,SAAS,CAAC,aAAa,KAAK,UAAU;YACtC,aAAa,CAAC,IAAI,KAAK,aAAa;YACpC,CAAC,iBAAiB,EAClB,CAAC;YACD,iBAAiB,GAAG,IAAI,CAAC;YACzB,OAAO,CAAC,IAAI,CACV,8JAA8J,CAC/J,CAAC;QACJ,CAAC;QAED,0EAA0E;QAC1E,sEAAsE;QACtE,0EAA0E;QAC1E,2CAA2C;QAC3C,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW;YAC3C,CAAC,CAAC,aAAa,CAAC,WAAW;YAC3B,CAAC,CAAC,SAAS,CAAC,aAAa,KAAK,cAAc;gBAC1C,CAAC,CAAC,MAAM,kBAAkB,CAAC,cAAc,CAAC,sBAAsB,CAAC;gBACjE,CAAC,CAAC,IAAI,CAAC;QACX,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,oBAAoB,CACjE,IAAI,EACJ,WAAW,EACX,SAAS,CAAC,aAAa,CACxB,CAAC;QACF,IAAI,QAAQ,KAAK,4BAA4B,IAAI,CAAC,WAAW,EAAE,CAAC;YAC9D,WAAW,GAAG,IAAI,CAAC;YACnB,OAAO,CAAC,IAAI,CACV,2FAA2F;gBAC3F,qFAAqF;gBACrF,uEAAuE;gBACvE,8FAA8F,CAC/F,CAAC;QACJ,CAAC;QACD,IAAI,QAAQ,KAAK,cAAc,IAAI,CAAC,WAAW,EAAE,CAAC;YAChD,WAAW,GAAG,IAAI,CAAC;YACnB,OAAO,CAAC,IAAI,CACV,iFAAiF,YAAY,CAAC,MAAM,0BAA0B,IAAI,CAAC,MAAM,sGAAsG,CAChP,CAAC;QACJ,CAAC;QACD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,eAAe,GAAG;gBAChB,QAAQ,EAAE,CAAC;gBACX,MAAM,EAAE,CAAC;gBACT,QAAQ,EAAE,CAAC;gBACX,IAAI,EAAE,CAAC;gBACP,UAAU,EAAE,CAAC;gBACb,SAAS,EAAE,CAAC;aACb,CAAC;YACF,SAAS,GAAG,SAAS,CAAC;YACtB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,uCAAuC;QACvC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAwB,CAAC;QACjD,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YAChC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;QACjF,CAAC;QAED,uEAAuE;QACvE,yEAAyE;QACzE,yEAAyE;QACzE,wEAAwE;QACxE,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,oBAAoB,EAAE,CAAC;YACvD,IAAI,CAAC;gBACH,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,wBAAwB,CAAC;oBAC1E,WAAW,EAAE,MAAM,CAAC,oBAAoB;iBACzC,CAAC,CAAC;gBACH,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;oBAChC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBAC7C,IAAI,CAAC,KAAK;wBAAE,SAAS;oBACrB,MAAM,cAAc,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;oBACnE,IAAI,cAAc,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;wBACtC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,CAAC;oBAC3E,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACjE,SAAS,GAAG;oBACV,OAAO,EAAE,wCAAwC,OAAO,EAAE;oBAC1D,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBAC7B,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,wBAAwB,SAAS,CAAC,OAAO,uBAAuB,CAAC,CAAC;gBAC/E,eAAe,GAAG;oBAChB,QAAQ,EAAE,YAAY,CAAC,MAAM;oBAC7B,MAAM,EAAE,CAAC;oBACT,QAAQ,EAAE,CAAC;oBACX,IAAI,EAAE,CAAC;oBACP,UAAU,EAAE,CAAC;oBACb,SAAS,EAAE,CAAC;iBACb,CAAC;gBACF,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,4EAA4E;QAC5E,0EAA0E;QAC1E,sEAAsE;QACtE,4EAA4E;QAC5E,4EAA4E;QAC5E,0EAA0E;QAC1E,sEAAsE;QACtE,uEAAuE;QACvE,4BAA4B;QAC5B,IAAI,WAA2D,CAAC;QAChE,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,oBAAoB,EAAE,CAAC;YACvD,IAAI,CAAC;gBACH,yEAAyE;gBACzE,kEAAkE;gBAClE,WAAW,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,sBAAsB,CAAC;oBAC7D,WAAW,EAAE,MAAM,CAAC,oBAAoB;iBACzC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACjE,SAAS,GAAG;oBACV,OAAO,EAAE,uCAAuC,OAAO,EAAE;oBACzD,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBAC7B,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,wBAAwB,SAAS,CAAC,OAAO,uBAAuB,CAAC,CAAC;gBAC/E,eAAe,GAAG;oBAChB,QAAQ,EAAE,YAAY,CAAC,MAAM;oBAC7B,MAAM,EAAE,CAAC;oBACT,QAAQ,EAAE,CAAC;oBACX,IAAI,EAAE,CAAC;oBACP,UAAU,EAAE,CAAC;oBACb,SAAS,EAAE,CAAC;iBACb,CAAC;gBACF,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAG,2BAA2B,CAAC;YAC7C,IAAI,EAAE,YAAY;YAClB,QAAQ;YACR,MAAM,EAAE,SAAS;YACjB,GAAG;YACH,WAAW;YACX,kBAAkB;SACnB,CAAC,CAAC;QACH,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,eAAe,GAAG,kBAAkB,CAAC;gBACnC,IAAI,EAAE,YAAY;gBAClB,QAAQ;gBACR,MAAM,EAAE,SAAS;gBACjB,GAAG;gBACH,WAAW;gBACX,kBAAkB;aACnB,CAAC,CAAC;YACH,SAAS,GAAG,SAAS,CAAC;YACtB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,KAAK,GAAW,EAAE,CAAC;QACzB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,MAAM,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YAC1D,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YACxE,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YACjD,kBAAkB,GAAG,SAAS,CAAC,QAAQ,CAAC;YACxC,WAAW,IAAI,CAAC,CAAC;YACjB,oBAAoB,GAAG,SAAS,CAAC,WAAW,CAAC;YAE7C,MAAM,wBAAwB,GAAG,SAAS,CAAC,kBAAkB,GAAG,WAAW,CAAC,UAAU,CAAC;YACvF,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,CAAC;YAC5E,MAAM,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACxD,MAAM,WAAW,GAAG,YAAY,GAAG,IAAI,CAAC;YAExC,MAAM,IAAI,GAAG,sBAAsB,CAAC,KAAK,CAAC;gBACxC,aAAa,EAAE,mBAAmB;gBAClC,WAAW,EAAE,SAAS,CAAC,WAAW;gBAClC,IAAI,EAAE,SAAS,CAAC,IAAI,IAAI,kBAAkB,CAAC,SAAS,CAAC,WAAW,CAAC;gBACjE,WAAW,EAAE,SAAS,CAAC,WAAW,IAAI,0CAA0C;gBAChF,QAAQ,EAAE,iBAAiB,CAAC,SAAS,CAAC;gBACtC,iBAAiB,EACf,SAAS,CAAC,iBAAiB,IAAI,4BAA4B,SAAS,CAAC,WAAW,EAAE;gBACpF,SAAS,EAAE,SAAS,CAAC,SAAS,IAAI,EAAE;gBACpC,UAAU,EAAE,SAAS,CAAC,UAAU;gBAChC,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,aAAa,EAAE,YAAY;gBAC3B,WAAW,EAAE,UAAU;aACxB,CAAC,CAAC;YAEH,KAAK,CAAC,IAAI,CAAC;gBACT,EAAE,EAAE,UAAU,EAAE;gBAChB,WAAW,EAAE,mBAAmB,SAAS,CAAC,WAAW,EAAE;gBACvD,UAAU,EAAE,WAAW;gBACvB,UAAU,EAAE,WAAW;gBACvB,eAAe,EAAE,gBAAgB;gBACjC,GAAG,CAAC,MAAM,CAAC,oBAAoB;oBAC7B,CAAC,CAAC,EAAE,oBAAoB,EAAE,MAAM,CAAC,oBAAoB,EAAE;oBACvD,CAAC,CAAC,EAAE,CAAC;gBACP,IAAI,EAAE,aAAa;gBACnB,MAAM,EAAE;oBACN,OAAO,EAAE,GAAG;oBACZ,KAAK,EAAE,WAAW;iBACnB;gBACD,WAAW,EAAE,qBAAqB,CAAC,SAAS,EAAE,wBAAwB,CAAC;gBACvE,IAAI;gBACJ,WAAW,EAAE;oBACX,UAAU,EAAE,SAAS,CAAC,UAAU;oBAChC,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,yBAAyB,EAAE,WAAW,CAAC,MAAM;oBAC7C,eAAe,EAAE,SAAS;oBAC1B,GAAG,CAAC,aAAa,CAAC,WAAW;wBAC3B,CAAC,CAAC,EAAE,CAAC,+BAA+B,CAAC,EAAE,aAAa,CAAC,WAAW,EAAE;wBAClE,CAAC,CAAC,EAAE,CAAC;iBACR;aACF,CAAC,CAAC;QACL,CAAC;QAED,OAAO,CAAC,GAAG,CACT,gCAAgC,UAAU,CAAC,MAAM,gBAAgB;YACjE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAChE,CAAC;QACF,eAAe,GAAG;YAChB,GAAG,kBAAkB,CAAC;gBACpB,IAAI,EAAE,YAAY;gBAClB,QAAQ;gBACR,MAAM,EAAE,SAAS;gBACjB,GAAG;gBACH,WAAW;gBACX,kBAAkB;aACnB,CAAC;YACF,MAAM,EAAE,KAAK,CAAC,MAAM;SACrB,CAAC;QACF,SAAS,GAAG,SAAS,CAAC;QACtB,MAAM,MAAM,GAAW,EAAE,CAAC;QAC1B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,CAAC,IAAI,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;QACtF,CAAC;QACD,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3C,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;QACzB,QAAQ;YACN,MAAM,UAAU,GAAG,wBAAwB,CACzC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CACjF,CAAC;YACF,OAAO;gBACL,IAAI,EAAE,gBAAgB;gBACtB,UAAU;gBACV,eAAe;gBACf,SAAS;gBACT,WAAW;gBACX,oBAAoB;gBACpB,MAAM,EAAE,UAAU;gBAClB,GAAG,CAAC,iBAAiB;oBACnB,CAAC,CAAC;wBACE,wBAAwB,EAAE,iBAAiB,CAAC,WAAW;wBACvD,wBAAwB,EAAE,iBAAiB,CAAC,SAAS;wBACrD,0BAA0B,EAAE,iBAAiB,CAAC,WAAW;qBAC1D;oBACH,CAAC,CAAC,EAAE,CAAC;aACR,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAiD;IACxE,UAAU,EAAE,mBAAmB;IAC/B,KAAK,CAAC,SAAS,CAAC,GAAG;QACjB,MAAM,IAAI,GAAG,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/C,OAAO;YACL,MAAM,EAAE,SAAS;YACjB,IAAI,EAAE,IAAI;YACV,WAAW,EAAE,EAAE;SAChB,CAAC;IACJ,CAAC;IACD,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,yBAAyB,CAAC,MAAM,CAAC;IAC7D,oBAAoB,EAAE,CAAC,GAAG,EAAE,EAAE;QAC5B,IAAI,GAAG,CAAC,OAAO,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAChD,sDAAsD;QACtD,IAAI,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,KAAK,GAAG;YAAE,OAAO,SAAS,CAAC;QAClF,MAAM,QAAQ,GACZ,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;YAC5C,eAAe,EAAE,CAAC;QACpB,OAAO,EAAE,QAAQ,EAAE,CAAC;IACtB,CAAC;IACD,EAAE,EAAE;QACF,WAAW,EAAE,uDAAuD;QACpE,QAAQ,EAAE,MAAM;KACjB;CACF,CAAC;AAEF,MAAM,UAAU,0CAA0C,CACxD,IAAoD;IAEpD,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC;IACzD,MAAM,QAAQ,GACZ,YAAY,CAAC,QAAQ;QACrB,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;QAC5C,eAAe,EAAE,CAAC;IAEpB,MAAM,SAAS,GAAG,yBAAyB,CAAC;QAC1C,QAAQ;QACR,kBAAkB,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO;QAC3C,oBAAoB,EAAE,SAAS,CAAC,OAAO,CAAC,WAAW;QACnD,eAAe,EAAE,YAAY,CAAC,eAAe;QAC7C,YAAY,EAAE,YAAY,CAAC,YAAY;QACvC,OAAO,EAAE;YACP,QAAQ,EAAE,YAAY,CAAC,QAAQ;YAC/B,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,eAAe,EAAE,YAAY,CAAC,eAAe;SAC9C;KACF,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,KAAK,IAAmC,EAAE;QAC1D,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC;QACjC,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU;YAAE,OAAO,IAAI,CAAC;QAC9C,IAAI,CAAC,MAAM,CAAC,gBAAgB;YAAE,OAAO,IAAI,CAAC;QAC1C,OAAO,SAAS,EAAE,CAAC;IACrB,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE;QAC9B,QAAQ;YACN,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC9B,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CAAC,QAAiB;IACzD,MAAM,GAAG,GACP,QAAQ;QACR,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;QAC5C,eAAe,EAAE,CAAC;IACpB,OAAO,IAAI,mBAAmB,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;AACpD,CAAC"}
|
|
@@ -49,7 +49,7 @@ import { type LifecycleTransitionDeps } from './lifecycle-transitions.js';
|
|
|
49
49
|
import type { SolverNetRegistryClient, SolverNetManifestSummary } from './registry-client.js';
|
|
50
50
|
import type { DiscoveryAPI, DiscoveryUnavailableCode } from '../discovery/types.js';
|
|
51
51
|
import type { LaunchedSolverNetRecord, SolverNetStore } from './store.js';
|
|
52
|
-
import type
|
|
52
|
+
import { type PublicClient, type WalletClient } from 'viem';
|
|
53
53
|
/**
|
|
54
54
|
* How often the operator catalog cache is refreshed against the registry
|
|
55
55
|
* client. 30 seconds is conservative — operators rarely launch multiple
|
|
@@ -49,6 +49,10 @@ import { IdentityRegistryBackedSolverNetRegistryClient, } from './registry-clien
|
|
|
49
49
|
import { recoverInFlightLaunches, } from './launch-state-machine.js';
|
|
50
50
|
import { recoverInFlightLifecycleTransitions, } from './lifecycle-transitions.js';
|
|
51
51
|
import { DiscoveryUnavailableError } from '../discovery/types.js';
|
|
52
|
+
// Import viem types lazily-named — keep the runtime import scoped so unit
|
|
53
|
+
// tests don't pay viem startup cost when they pass mocked publishers.
|
|
54
|
+
import { encodeFunctionData } from 'viem';
|
|
55
|
+
import { viemSendTransactionWithRetry, } from '../tx-retry.js';
|
|
52
56
|
// Noop SubgraphClient used by launch/lifecycle state-machine recovery paths
|
|
53
57
|
// (mempool-drop detection) until a real subgraph extension is wired (Task 25).
|
|
54
58
|
// Not exported — callers should not depend on this implementation.
|
|
@@ -283,15 +287,26 @@ export function createMetadataPublisherFromViem(args) {
|
|
|
283
287
|
if (!chain) {
|
|
284
288
|
throw new Error('createMetadataPublisherFromViem: walletClient has no chain configured');
|
|
285
289
|
}
|
|
286
|
-
|
|
287
|
-
|
|
290
|
+
// Route through viemSendTransactionWithRetry so this launch/lifecycle
|
|
291
|
+
// setMetadata shares the per-EOA broadcast lock + nonce ledger + retry
|
|
292
|
+
// with the Safe-mediated loops (creator / claim / deliver) and
|
|
293
|
+
// eviction-recovery that broadcast from the SAME agent EOA. A raw
|
|
294
|
+
// writeContract here let viem auto-fill the nonce from the pending count,
|
|
295
|
+
// which raced those loops and reverted "nonce too low" — the #525 launch
|
|
296
|
+
// stall. (Sibling to the IdentityPublisher fix in a4a52ca2;
|
|
297
|
+
// encodeFunctionData reproduces the exact calldata writeContract built.)
|
|
298
|
+
const data = encodeFunctionData({
|
|
288
299
|
abi: IDENTITY_REGISTRY_SET_METADATA_ABI,
|
|
289
300
|
functionName: 'setMetadata',
|
|
290
301
|
// viem's bytes input accepts `0x`-prefixed hex; convert from Uint8Array.
|
|
291
302
|
args: [BigInt(agentId), key, uint8ArrayToHex(value)],
|
|
292
|
-
account,
|
|
293
|
-
chain,
|
|
294
303
|
});
|
|
304
|
+
const txHash = await viemSendTransactionWithRetry(args.walletClient, args.publicClient, {
|
|
305
|
+
account,
|
|
306
|
+
to: args.identityRegistryAddress,
|
|
307
|
+
data,
|
|
308
|
+
value: 0n,
|
|
309
|
+
}, { logicalTx: 'solvernet.setMetadata' });
|
|
295
310
|
const receipt = await args.publicClient.waitForTransactionReceipt({ hash: txHash });
|
|
296
311
|
return {
|
|
297
312
|
txHash,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-init.js","sourceRoot":"","sources":["../../src/solvernets/daemon-init.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AAEH,OAAO,EACL,YAAY,EACZ,aAAa,GACd,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,kCAAkC,GACnC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,6CAA6C,GAK9C,MAAM,8BAA8B,CAAC;AAKtC,OAAO,EACL,uBAAuB,GAGxB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,mCAAmC,GAEpC,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"daemon-init.js","sourceRoot":"","sources":["../../src/solvernets/daemon-init.ts"],"names":[],"mappings":"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"}
|