@jinn-network/client 0.1.8 → 0.1.9-canary.159b38f5
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/adapters/mech/adapter.d.ts +21 -1
- package/dist/adapters/mech/adapter.js +67 -10
- package/dist/adapters/mech/adapter.js.map +1 -1
- package/dist/adapters/mech/contracts.js +62 -28
- package/dist/adapters/mech/contracts.js.map +1 -1
- package/dist/adapters/mech/safe-revert.d.ts +4 -0
- package/dist/adapters/mech/safe-revert.js +5 -1
- package/dist/adapters/mech/safe-revert.js.map +1 -1
- package/dist/adapters/mech/safe.js +5 -1
- package/dist/adapters/mech/safe.js.map +1 -1
- package/dist/api/discovery-endpoint.d.ts +1 -0
- package/dist/api/discovery-endpoint.js +24 -0
- package/dist/api/discovery-endpoint.js.map +1 -1
- package/dist/api/fleet-build.d.ts +1 -7
- package/dist/api/fleet-build.js +0 -7
- package/dist/api/fleet-build.js.map +1 -1
- package/dist/api/gather-status.d.ts +8 -2
- package/dist/api/gather-status.js +29 -117
- package/dist/api/gather-status.js.map +1 -1
- package/dist/api/loop-completion-build.d.ts +79 -0
- package/dist/api/loop-completion-build.js +155 -0
- package/dist/api/loop-completion-build.js.map +1 -0
- package/dist/api/setup-endpoints.d.ts +13 -0
- package/dist/api/setup-endpoints.js +39 -20
- package/dist/api/setup-endpoints.js.map +1 -1
- package/dist/api/solvernets-endpoints.js +3 -0
- package/dist/api/solvernets-endpoints.js.map +1 -1
- package/dist/api/status-build.d.ts +43 -33
- package/dist/api/status-build.js +3 -26
- package/dist/api/status-build.js.map +1 -1
- package/dist/api/status-rollup-build.d.ts +0 -4
- package/dist/api/status-rollup-build.js +0 -4
- package/dist/api/status-rollup-build.js.map +1 -1
- package/dist/build-info.json +4 -4
- package/dist/build-meta.json +1 -1
- package/dist/cli/commands/codedigest-revert-check.js +6 -2
- package/dist/cli/commands/codedigest-revert-check.js.map +1 -1
- package/dist/cli/commands/doctor.d.ts +3 -0
- package/dist/cli/commands/doctor.js +35 -0
- package/dist/cli/commands/doctor.js.map +1 -1
- package/dist/cli/commands/eval.d.ts +76 -0
- package/dist/cli/commands/eval.js +401 -0
- package/dist/cli/commands/eval.js.map +1 -0
- package/dist/cli/commands/rewards.d.ts +2 -0
- package/dist/cli/commands/rewards.js +27 -0
- package/dist/cli/commands/rewards.js.map +1 -1
- package/dist/cli/commands/solver-nets.js +68 -0
- package/dist/cli/commands/solver-nets.js.map +1 -1
- package/dist/cli/commands/status.js +0 -1
- package/dist/cli/commands/status.js.map +1 -1
- package/dist/cli/index.js +2 -0
- package/dist/cli/index.js.map +1 -1
- package/dist/config.d.ts +31 -7
- package/dist/config.js +72 -7
- package/dist/config.js.map +1 -1
- package/dist/daemon/ai-units-gate.d.ts +6 -6
- package/dist/daemon/ai-units-gate.js +11 -10
- package/dist/daemon/ai-units-gate.js.map +1 -1
- package/dist/daemon/daemon.js +24 -22
- package/dist/daemon/daemon.js.map +1 -1
- package/dist/daemon/eviction-loop.d.ts +7 -0
- package/dist/daemon/eviction-loop.js +16 -0
- package/dist/daemon/eviction-loop.js.map +1 -1
- package/dist/dashboard/assets/index-BVAWkLwY.css +1 -0
- package/dist/dashboard/assets/index-DEPqtGOA.js +167 -0
- package/dist/dashboard/index.html +2 -2
- package/dist/discovery/http.d.ts +7 -0
- package/dist/discovery/http.js +241 -25
- package/dist/discovery/http.js.map +1 -1
- package/dist/discovery/onchain.js +155 -1
- package/dist/discovery/onchain.js.map +1 -1
- package/dist/discovery/types.d.ts +106 -0
- package/dist/discovery/types.js +40 -0
- package/dist/discovery/types.js.map +1 -1
- package/dist/discovery/with-fallback.js +14 -0
- package/dist/discovery/with-fallback.js.map +1 -1
- package/dist/earning/bootstrap.d.ts +23 -0
- package/dist/earning/bootstrap.js +76 -27
- package/dist/earning/bootstrap.js.map +1 -1
- package/dist/earning/faucet.d.ts +1 -1
- package/dist/earning/faucet.js +2 -2
- package/dist/earning/faucet.js.map +1 -1
- package/dist/earning/safe-adapter.js +11 -0
- package/dist/earning/safe-adapter.js.map +1 -1
- package/dist/eval/eval-harness-run.d.ts +63 -0
- package/dist/eval/eval-harness-run.js +123 -0
- package/dist/eval/eval-harness-run.js.map +1 -0
- package/dist/eval/orchestrator.d.ts +163 -0
- package/dist/eval/orchestrator.js +232 -0
- package/dist/eval/orchestrator.js.map +1 -0
- package/dist/eval/paired.d.ts +68 -0
- package/dist/eval/paired.js +93 -0
- package/dist/eval/paired.js.map +1 -0
- package/dist/eval/resolve-slate-tasks.d.ts +35 -0
- package/dist/eval/resolve-slate-tasks.js +56 -0
- package/dist/eval/resolve-slate-tasks.js.map +1 -0
- package/dist/eval/screen-discovery.d.ts +22 -0
- package/dist/eval/screen-discovery.js +71 -0
- package/dist/eval/screen-discovery.js.map +1 -0
- package/dist/eval/screen-progress.d.ts +41 -0
- package/dist/eval/screen-progress.js +60 -0
- package/dist/eval/screen-progress.js.map +1 -0
- package/dist/eval/screen-runner.d.ts +30 -0
- package/dist/eval/screen-runner.js +289 -0
- package/dist/eval/screen-runner.js.map +1 -0
- package/dist/eval/screen.d.ts +107 -0
- package/dist/eval/screen.js +159 -0
- package/dist/eval/screen.js.map +1 -0
- package/dist/eval/slope.d.ts +29 -0
- package/dist/eval/slope.js +46 -0
- package/dist/eval/slope.js.map +1 -0
- package/dist/eval/train-sequence.d.ts +35 -0
- package/dist/eval/train-sequence.js +59 -0
- package/dist/eval/train-sequence.js.map +1 -0
- package/dist/eval/wilson.d.ts +45 -0
- package/dist/eval/wilson.js +48 -0
- package/dist/eval/wilson.js.map +1 -0
- package/dist/harnesses/engine/canonical-json.js +5 -3
- package/dist/harnesses/engine/canonical-json.js.map +1 -1
- package/dist/harnesses/engine/engine.d.ts +9 -0
- package/dist/harnesses/engine/engine.js +50 -5
- package/dist/harnesses/engine/engine.js.map +1 -1
- package/dist/harnesses/engine/persistence.d.ts +17 -0
- package/dist/harnesses/engine/persistence.js +28 -0
- package/dist/harnesses/engine/persistence.js.map +1 -1
- package/dist/harnesses/impls/hermes-agent/adapter.d.ts +2 -0
- package/dist/harnesses/impls/hermes-agent/adapter.js +8 -5
- package/dist/harnesses/impls/hermes-agent/adapter.js.map +1 -1
- package/dist/harnesses/impls/hermes-agent/bootstrap.d.ts +1 -0
- package/dist/harnesses/impls/hermes-agent/bootstrap.js +6 -1
- package/dist/harnesses/impls/hermes-agent/bootstrap.js.map +1 -1
- package/dist/harnesses/impls/hermes-agent/harness.d.ts +17 -3
- package/dist/harnesses/impls/hermes-agent/harness.js +68 -5
- package/dist/harnesses/impls/hermes-agent/harness.js.map +1 -1
- package/dist/harnesses/impls/index.d.ts +2 -0
- package/dist/harnesses/impls/index.js +2 -0
- package/dist/harnesses/impls/index.js.map +1 -1
- package/dist/harnesses/impls/learner/adapters/claude-code.js +5 -0
- package/dist/harnesses/impls/learner/adapters/claude-code.js.map +1 -1
- package/dist/harnesses/impls/learner/harness.d.ts +17 -1
- package/dist/harnesses/impls/learner/harness.js +51 -1
- package/dist/harnesses/impls/learner/harness.js.map +1 -1
- package/dist/harnesses/impls/learner/harvest.d.ts +2 -0
- package/dist/harnesses/impls/learner/harvest.js +7 -1
- package/dist/harnesses/impls/learner/harvest.js.map +1 -1
- package/dist/harnesses/impls/learner/plugin-path.js +1 -0
- package/dist/harnesses/impls/learner/plugin-path.js.map +1 -1
- package/dist/harnesses/impls/swe-rebench-v2-evaluator/harness.js +3 -1
- package/dist/harnesses/impls/swe-rebench-v2-evaluator/harness.js.map +1 -1
- package/dist/harnesses/impls/swe-rebench-v2-evaluator/index.d.ts +2 -2
- package/dist/harnesses/impls/swe-rebench-v2-evaluator/index.js +3 -1
- package/dist/harnesses/impls/swe-rebench-v2-evaluator/index.js.map +1 -1
- package/dist/harnesses/types.d.ts +14 -0
- package/dist/learner/revert-decision.d.ts +16 -1
- package/dist/learner/revert-decision.js +38 -18
- package/dist/learner/revert-decision.js.map +1 -1
- package/dist/learner/revert-stats.d.ts +14 -0
- package/dist/learner/revert-stats.js +42 -0
- package/dist/learner/revert-stats.js.map +1 -1
- package/dist/local-provider-url.d.ts +3 -0
- package/dist/local-provider-url.js +28 -0
- package/dist/local-provider-url.js.map +1 -0
- package/dist/main.js +22 -0
- package/dist/main.js.map +1 -1
- package/dist/plugins/learner/.claude-plugin/plugin.json +1 -1
- package/dist/plugins/learner/.codex-plugin/plugin.json +1 -1
- package/dist/plugins/learner/hooks/session-start +30 -1
- package/dist/plugins/learner/skills/learn/consolidator-prompt.md +4 -0
- package/dist/preflight/deployment-readiness.d.ts +147 -0
- package/dist/preflight/deployment-readiness.js +366 -0
- package/dist/preflight/deployment-readiness.js.map +1 -0
- package/dist/preflight/pidfile-liveness.d.ts +7 -1
- package/dist/preflight/pidfile-liveness.js +14 -0
- package/dist/preflight/pidfile-liveness.js.map +1 -1
- package/dist/rpc/transport.d.ts +36 -0
- package/dist/rpc/transport.js +123 -24
- package/dist/rpc/transport.js.map +1 -1
- package/dist/scripts/swe-rebench-v2-seed-pool.json +2 -1
- package/dist/solver-types/_swe-rebench-v2-held-out-slate.d.ts +76 -0
- package/dist/solver-types/_swe-rebench-v2-held-out-slate.js +156 -0
- package/dist/solver-types/_swe-rebench-v2-held-out-slate.js.map +1 -0
- package/dist/solver-types/_swe-rebench-v2-pool-recovery.d.ts +81 -0
- package/dist/solver-types/_swe-rebench-v2-pool-recovery.js +116 -0
- package/dist/solver-types/_swe-rebench-v2-pool-recovery.js.map +1 -0
- package/dist/solver-types/_swe-rebench-v2-state.d.ts +9 -0
- package/dist/solver-types/_swe-rebench-v2-state.js +14 -0
- package/dist/solver-types/_swe-rebench-v2-state.js.map +1 -1
- package/dist/solver-types/slates/held-out-slate.swe-rebench-v2.v1.json +20 -0
- package/dist/solver-types/slates/held-out-slate.swe-rebench-v2.v2.json +19 -0
- package/dist/solver-types/slates/held-out-slate.swe-rebench-v2.v2.screening-report.json +628 -0
- package/dist/solver-types/solver-type.d.ts +8 -0
- package/dist/solver-types/swe-rebench-v2.d.ts +2 -0
- package/dist/solver-types/swe-rebench-v2.js +106 -2
- package/dist/solver-types/swe-rebench-v2.js.map +1 -1
- package/dist/solvernets/launched-record-dispatcher.d.ts +3 -0
- package/dist/solvernets/launched-record-dispatcher.js.map +1 -1
- package/dist/solvernets/registry-client-erc8004.js +29 -37
- package/dist/solvernets/registry-client-erc8004.js.map +1 -1
- package/dist/solvernets/registry-client.d.ts +6 -0
- package/dist/solvernets/store.js +7 -2
- package/dist/solvernets/store.js.map +1 -1
- package/dist/spend/ai-units-config.d.ts +10 -0
- package/dist/spend/ai-units-config.js +7 -1
- package/dist/spend/ai-units-config.js.map +1 -1
- package/dist/spend/ai-units.d.ts +51 -0
- package/dist/spend/ai-units.js +73 -0
- package/dist/spend/ai-units.js.map +1 -1
- package/dist/spend/record.js +12 -5
- package/dist/spend/record.js.map +1 -1
- package/dist/store/store.d.ts +91 -5
- package/dist/store/store.js +170 -7
- package/dist/store/store.js.map +1 -1
- package/dist/vendor/@jinn-network/sdk/dist/payloads/swe-rebench-v2.d.ts +108 -1
- package/dist/vendor/@jinn-network/sdk/dist/payloads/swe-rebench-v2.js +25 -1
- package/dist/vendor/@jinn-network/sdk/dist/solvernets/swe-rebench-v2-held-out-slate.d.ts +65 -0
- package/dist/vendor/@jinn-network/sdk/dist/solvernets/swe-rebench-v2-held-out-slate.js +123 -0
- package/dist/vendor/@jinn-network/sdk/dist/solvernets/swe-rebench-v2.d.ts +2 -2
- package/dist/vendor/@jinn-network/sdk/dist/solvernets/swe-rebench-v2.js +1 -1
- package/dist/vendor/@jinn-network/sdk/package.json +4 -0
- package/docker-compose.yml +3 -2
- package/package.json +22 -18
- package/plugins/learner/.claude-plugin/plugin.json +1 -1
- package/plugins/learner/.codex-plugin/plugin.json +1 -1
- package/plugins/learner/hooks/session-start +30 -1
- package/plugins/learner/skills/learn/consolidator-prompt.md +4 -0
- package/plugins/swe-rebench-v2-runtime/hooks/hooks.json +16 -0
- package/plugins/swe-rebench-v2-runtime/hooks/session-start +74 -0
- package/dist/dashboard/assets/index-CzKxvMcU.css +0 -32
- package/dist/dashboard/assets/index-yVemxHot.js +0 -351
|
@@ -4,9 +4,12 @@ import { emitEnvelope } from '../../errors/envelope.js';
|
|
|
4
4
|
import { emitResult } from '../output.js';
|
|
5
5
|
import { gatherIntrospectionRaw as defaultGatherIntrospectionRaw } from '../introspection-context.js';
|
|
6
6
|
import { assembleRewardsV1 as defaultAssembleRewardsV1 } from '../../api/rewards-build.js';
|
|
7
|
+
import { sumPendingStakingRewards as defaultSumPendingStakingRewards } from '../../api/gather-status.js';
|
|
8
|
+
import { loadConfig, getConfigPathFromArgs } from '../../config.js';
|
|
7
9
|
const PRODUCTION_DEPS = {
|
|
8
10
|
gatherIntrospectionRaw: defaultGatherIntrospectionRaw,
|
|
9
11
|
assembleRewardsV1: defaultAssembleRewardsV1,
|
|
12
|
+
sumPendingStakingRewards: defaultSumPendingStakingRewards,
|
|
10
13
|
};
|
|
11
14
|
function formatRewardAmount(wei) {
|
|
12
15
|
try {
|
|
@@ -74,6 +77,30 @@ Examples:
|
|
|
74
77
|
return;
|
|
75
78
|
}
|
|
76
79
|
const raw = await deps.gatherIntrospectionRaw({ argv: ctx.argv });
|
|
80
|
+
// On-demand staking reward read — kept off the /v1/status hot path (#992).
|
|
81
|
+
// jinn rewards is the sanctioned ops-only surface for the OLAS staking
|
|
82
|
+
// collector queue. Resolve rpcUrl/network from config and read against
|
|
83
|
+
// the fleet that gather-status already loaded into `raw`.
|
|
84
|
+
if (raw.fleet && raw.rpc.ok) {
|
|
85
|
+
const configPath = getConfigPathFromArgs(ctx.argv ?? []) ?? getConfigPathFromArgs(process.argv.slice(2));
|
|
86
|
+
try {
|
|
87
|
+
const config = loadConfig(configPath);
|
|
88
|
+
const rpcUrl = Array.isArray(config.rpcUrl) ? config.rpcUrl[0] : config.rpcUrl;
|
|
89
|
+
const pr = await deps.sumPendingStakingRewards(rpcUrl, config.network, raw.fleet);
|
|
90
|
+
if ('sum' in pr) {
|
|
91
|
+
raw.pendingStakingRewardsWei = pr.sum;
|
|
92
|
+
raw.pendingByService = pr.pendingByService;
|
|
93
|
+
if (pr.nextCheckpointAt)
|
|
94
|
+
raw.nextCheckpointAt = pr.nextCheckpointAt;
|
|
95
|
+
}
|
|
96
|
+
// pr.error path: leave the staking fields unset — assembleRewardsV1
|
|
97
|
+
// degrades to pending=0 / nextCheckpointAt=null (same as the catch).
|
|
98
|
+
}
|
|
99
|
+
catch {
|
|
100
|
+
// Config unreadable or RPC error — assembleRewardsV1 degrades to
|
|
101
|
+
// pending=0 / nextCheckpointAt=null, which the human renderer handles.
|
|
102
|
+
}
|
|
103
|
+
}
|
|
77
104
|
const payload = deps.assembleRewardsV1(raw);
|
|
78
105
|
emitResult(payload, (v) => humanRewards(v), {
|
|
79
106
|
json: Boolean(parsed.values.json),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewards.js","sourceRoot":"","sources":["../../../src/cli/commands/rewards.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,sBAAsB,IAAI,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AACtG,OAAO,EAAE,iBAAiB,IAAI,wBAAwB,EAA0B,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"rewards.js","sourceRoot":"","sources":["../../../src/cli/commands/rewards.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,sBAAsB,IAAI,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AACtG,OAAO,EAAE,iBAAiB,IAAI,wBAAwB,EAA0B,MAAM,4BAA4B,CAAC;AACnH,OAAO,EAAE,wBAAwB,IAAI,+BAA+B,EAAE,MAAM,4BAA4B,CAAC;AACzG,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAQpE,MAAM,eAAe,GAAgB;IACnC,sBAAsB,EAAE,6BAA6B;IACrD,iBAAiB,EAAE,wBAAwB;IAC3C,wBAAwB,EAAE,+BAA+B;CAC1D,CAAC;AAEF,SAAS,kBAAkB,CAAC,GAAW;IACrC,IAAI,CAAC;QACH,qEAAqE;QACrE,yDAAyD;QACzD,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC;IAC3D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,GAAG,GAAG,MAAM,CAAC;IACtB,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,OAA0B;IAC9C,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,KAAK,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;IAC3E,CAAC;SAAM,CAAC;QACN,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC;QACnE,KAAK,CAAC,IAAI,CACR,UAAU;YACR,CAAC,CAAC,mCAAmC;YACrC,CAAC,CAAC,6CAA6C,CAClD,CAAC;QACF,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACjC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,KAAK,KAAK,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC3H,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,0GAA0G,CAAC,CAAC;IACzH,CAAC;IACD,KAAK,CAAC,IAAI,CACR,oBAAoB,OAAO,CAAC,WAAW,IAAI,2CAA2C,EAAE,CACzF,CAAC;IACF,KAAK,CAAC,IAAI,CACR,oBAAoB,OAAO,CAAC,gBAAgB,IAAI,sCAAsC,EAAE,CACzF,CAAC;IACF,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAoB,eAAe;IACtE,OAAO;QACL,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,2DAA2D;QACpE,QAAQ,EAAE;;;;;;;;;CASb;QACG,KAAK,CAAC,GAAG,CAAC,GAAmB;YAC3B,IAAI,MAAM,CAAC;YACX,IAAI,CAAC;gBACH,MAAM,GAAG,SAAS,CAAC;oBACjB,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE;wBACP,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;wBACzC,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;wBAC1C,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;qBAC3B;oBACD,gBAAgB,EAAE,KAAK;iBACxB,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,YAAY,CACV;oBACE,IAAI,EAAE,oBAAoB;oBAC1B,OAAO,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;oBACzD,UAAU,EAAE,cAAc;oBAC1B,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE;iBAC5B,EACD,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CACvC,CAAC;gBACF,OAAO;YACT,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;YAClE,2EAA2E;YAC3E,uEAAuE;YACvE,uEAAuE;YACvE,0DAA0D;YAC1D,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBAC5B,MAAM,UAAU,GACd,qBAAqB,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,IAAI,qBAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxF,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;oBACtC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;oBAChF,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;oBAClF,IAAI,KAAK,IAAI,EAAE,EAAE,CAAC;wBAChB,GAAG,CAAC,wBAAwB,GAAG,EAAE,CAAC,GAAG,CAAC;wBACtC,GAAG,CAAC,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CAAC;wBAC3C,IAAI,EAAE,CAAC,gBAAgB;4BAAE,GAAG,CAAC,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CAAC;oBACtE,CAAC;oBACD,oEAAoE;oBACpE,qEAAqE;gBACvE,CAAC;gBAAC,MAAM,CAAC;oBACP,iEAAiE;oBACjE,uEAAuE;gBACzE,CAAC;YACH,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAC5C,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAsB,CAAC,EAAE;gBAC/D,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;gBACjC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;gBACnC,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,WAAW,EAAE,GAAG,CAAC,WAAW;gBAC5B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;aACtC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,GAAkB,oBAAoB,EAAE,CAAC;AACtD,eAAe,OAAO,CAAC"}
|
|
@@ -366,6 +366,9 @@ const command = {
|
|
|
366
366
|
Read-only report of the local validated-pool.json: total entries,
|
|
367
367
|
scorable/unscorable counts, histogram by normalised reason, and
|
|
368
368
|
the highest-yield unscorable blocker. Does not run any eval.
|
|
369
|
+
jinn solver-nets screen-held-out swe-rebench-v2 [--repo <org>] [--instance-id <id> ...]
|
|
370
|
+
[--runs 3] [--held-out-count 10] [--max-candidates 60] [--per-repo-cap 3]
|
|
371
|
+
[--prover-harness codex|claude-code] [--prover-model <m>]
|
|
369
372
|
|
|
370
373
|
Output flags:
|
|
371
374
|
--human Render readable terminal output instead of JSON (supported by
|
|
@@ -393,6 +396,14 @@ Output flags:
|
|
|
393
396
|
'seed-positive': { type: 'boolean' },
|
|
394
397
|
'known-bad': { type: 'boolean' },
|
|
395
398
|
'known-pytest-missing': { type: 'boolean' },
|
|
399
|
+
// screen-held-out (#986)
|
|
400
|
+
runs: { type: 'string' },
|
|
401
|
+
'held-out-count': { type: 'string' },
|
|
402
|
+
'max-candidates': { type: 'string' },
|
|
403
|
+
'per-repo-cap': { type: 'string' },
|
|
404
|
+
'prover-harness': { type: 'string' },
|
|
405
|
+
'prover-model': { type: 'string' },
|
|
406
|
+
repo: { type: 'string' },
|
|
396
407
|
},
|
|
397
408
|
});
|
|
398
409
|
const human = Boolean(parsed.values['human']);
|
|
@@ -557,6 +568,63 @@ Output flags:
|
|
|
557
568
|
});
|
|
558
569
|
return;
|
|
559
570
|
}
|
|
571
|
+
if (subverb === 'screen-held-out') {
|
|
572
|
+
if (name !== 'swe-rebench-v2') {
|
|
573
|
+
fail(ctx, 'solver-nets screen-held-out currently supports only `swe-rebench-v2`');
|
|
574
|
+
return;
|
|
575
|
+
}
|
|
576
|
+
// Docker must be reachable (spec §8 precondition) or every base/prover
|
|
577
|
+
// grade is unscorable and the screen yields nothing — fail loud instead.
|
|
578
|
+
if (spawnSync('docker', ['info'], { stdio: 'ignore' }).status !== 0) {
|
|
579
|
+
fail(ctx, 'Docker daemon not reachable — start Docker, then re-run `jinn solver-nets screen-held-out swe-rebench-v2`');
|
|
580
|
+
return;
|
|
581
|
+
}
|
|
582
|
+
const num = (key, dflt) => {
|
|
583
|
+
const raw = parsed.values[key];
|
|
584
|
+
const v = raw ? Number.parseInt(raw, 10) : NaN;
|
|
585
|
+
return Number.isFinite(v) && v > 0 ? v : dflt;
|
|
586
|
+
};
|
|
587
|
+
const { runScreenHeldOut } = await import('../../eval/screen-runner.js');
|
|
588
|
+
const instanceIds = resolveValidatePoolInstanceIds({
|
|
589
|
+
instanceId: parsed.values['instance-id'],
|
|
590
|
+
instancesFile: parsed.values['instances-file'],
|
|
591
|
+
seedPositive: Boolean(parsed.values['seed-positive']),
|
|
592
|
+
knownBad: Boolean(parsed.values['known-bad']),
|
|
593
|
+
knownPytestMissing: Boolean(parsed.values['known-pytest-missing']),
|
|
594
|
+
});
|
|
595
|
+
const proverHarnessRaw = parsed.values['prover-harness'];
|
|
596
|
+
if (proverHarnessRaw && proverHarnessRaw !== 'codex' && proverHarnessRaw !== 'claude-code') {
|
|
597
|
+
fail(ctx, `--prover-harness must be 'codex' or 'claude-code' (got ${JSON.stringify(proverHarnessRaw)})`);
|
|
598
|
+
return;
|
|
599
|
+
}
|
|
600
|
+
const summary = await runScreenHeldOut({
|
|
601
|
+
R: num('runs', 3),
|
|
602
|
+
heldOutCount: num('held-out-count', 10),
|
|
603
|
+
maxCandidates: num('max-candidates', 60),
|
|
604
|
+
perRepoCap: num('per-repo-cap', 3),
|
|
605
|
+
...(proverHarnessRaw ? { proverHarness: proverHarnessRaw } : {}),
|
|
606
|
+
...(parsed.values['prover-model'] ? { proverModel: parsed.values['prover-model'] } : {}),
|
|
607
|
+
...(instanceIds.length ? { instanceIds } : {}),
|
|
608
|
+
...(parsed.values['repo'] ? { repo: parsed.values['repo'] } : {}),
|
|
609
|
+
...(parsed.values['config'] ? { configPath: parsed.values['config'] } : {}),
|
|
610
|
+
log: (m) => process.stderr.write(`${m}\n`),
|
|
611
|
+
});
|
|
612
|
+
emit(ctx, {
|
|
613
|
+
verb: 'solver-nets screen-held-out', solverNet: 'swe-rebench-v2',
|
|
614
|
+
heldOut: summary.heldOutCount, baseCodeDigest: summary.baseCodeDigest,
|
|
615
|
+
slatePath: summary.slatePath, reportPath: summary.reportPath,
|
|
616
|
+
screened: summary.result.screened.length, proverUnscorable: summary.proverUnscorable,
|
|
617
|
+
}, human, json, (v) => {
|
|
618
|
+
const s = v;
|
|
619
|
+
const warn = s.proverUnscorable > 0
|
|
620
|
+
? `\n WARNING: prover returned no gradeable result on ${s.proverUnscorable} candidate(s) — ` +
|
|
621
|
+
`prover may be UNAVAILABLE (check codex >=0.133.0 + auth); re-run before trusting an empty slate`
|
|
622
|
+
: '';
|
|
623
|
+
return `held-out=${s.heldOut} base=${s.baseCodeDigest}\n slate: ${s.slatePath}\n` +
|
|
624
|
+
` next: jinn eval v2 --checkpoint <trained-cid> --parent ${s.baseCodeDigest}${warn}`;
|
|
625
|
+
});
|
|
626
|
+
return;
|
|
627
|
+
}
|
|
560
628
|
if (!name) {
|
|
561
629
|
fail(ctx, `solver-nets ${subverb} requires <name>`);
|
|
562
630
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solver-nets.js","sourceRoot":"","sources":["../../../src/cli/commands/solver-nets.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"solver-nets.js","sourceRoot":"","sources":["../../../src/cli/commands/solver-nets.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,6 @@ function humanStatus(v) {
|
|
|
44
44
|
`daemon=${v.daemon.state} network=${v.daemon.network} chain=${v.rpc.chainId} block=${v.rpc.blockNumber}`,
|
|
45
45
|
`health=${health}`,
|
|
46
46
|
`fleet: ${v.fleet.size} services, ${v.fleet.complete} complete, ${v.fleet.needsAttention} need attention`,
|
|
47
|
-
`staking-collector-pending: ${v.earnings.pendingTotal} reward-wei`,
|
|
48
47
|
v.taskNative
|
|
49
48
|
? `task-native: solver=${v.taskNative.solverReady ? 'ready' : 'not-ready'} evaluator=${v.taskNative.evaluatorReady ? 'ready' : 'not-ready'} (${v.taskNative.detail})`
|
|
50
49
|
: '',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/index.js
CHANGED
|
@@ -43,6 +43,7 @@ import integrationsCommand from './commands/integrations.js';
|
|
|
43
43
|
import predictionScoreboardCommand from './commands/prediction-scoreboard.js';
|
|
44
44
|
import captureCommand from './commands/capture.js';
|
|
45
45
|
import codedigestRevertCheckCommand from './commands/codedigest-revert-check.js';
|
|
46
|
+
import evalCommand from './commands/eval.js';
|
|
46
47
|
const COMMANDS = [
|
|
47
48
|
versionCommand,
|
|
48
49
|
doctorCommand,
|
|
@@ -77,6 +78,7 @@ const COMMANDS = [
|
|
|
77
78
|
solverPluginsCommand,
|
|
78
79
|
integrationsCommand,
|
|
79
80
|
codedigestRevertCheckCommand,
|
|
81
|
+
evalCommand,
|
|
80
82
|
];
|
|
81
83
|
/**
|
|
82
84
|
* All registered CLI commands. Used by skill generators and conformance checks to keep
|
package/dist/cli/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,cAAc,MAAM,uBAAuB,CAAC;AACnD,OAAO,aAAa,MAAM,sBAAsB,CAAC;AACjD,OAAO,WAAW,MAAM,oBAAoB,CAAC;AAC7C,OAAO,iBAAiB,MAAM,0BAA0B,CAAC;AACzD,OAAO,WAAW,MAAM,oBAAoB,CAAC;AAC7C,OAAO,gBAAgB,MAAM,yBAAyB,CAAC;AACvD,OAAO,uBAAuB,MAAM,iCAAiC,CAAC;AACtE,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,WAAW,MAAM,oBAAoB,CAAC;AAC7C,OAAO,aAAa,MAAM,sBAAsB,CAAC;AACjD,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAC/C,OAAO,cAAc,MAAM,uBAAuB,CAAC;AACnD,OAAO,cAAc,MAAM,uBAAuB,CAAC;AACnD,OAAO,cAAc,MAAM,uBAAuB,CAAC;AACnD,OAAO,WAAW,MAAM,oBAAoB,CAAC;AAC7C,OAAO,kBAAkB,MAAM,2BAA2B,CAAC;AAC3D,OAAO,mBAAmB,MAAM,6BAA6B,CAAC;AAC9D,OAAO,eAAe,MAAM,wBAAwB,CAAC;AACrD,OAAO,WAAW,MAAM,2BAA2B,CAAC;AACpD,OAAO,aAAa,MAAM,sBAAsB,CAAC;AACjD,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,qBAAqB,MAAM,gCAAgC,CAAC;AACnE,OAAO,kBAAkB,MAAM,2BAA2B,CAAC;AAC3D,OAAO,aAAa,MAAM,sBAAsB,CAAC;AACjD,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAC/C,OAAO,iBAAiB,MAAM,2BAA2B,CAAC;AAC1D,OAAO,gBAAgB,MAAM,yBAAyB,CAAC;AACvD,OAAO,oBAAoB,MAAM,8BAA8B,CAAC;AAChE,OAAO,mBAAmB,MAAM,4BAA4B,CAAC;AAC7D,OAAO,2BAA2B,MAAM,qCAAqC,CAAC;AAC9E,OAAO,cAAc,MAAM,uBAAuB,CAAC;AACnD,OAAO,4BAA4B,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
CHANGED
|
@@ -43,6 +43,18 @@ export declare const JinnConfigSchema: z.ZodEffects<z.ZodObject<{
|
|
|
43
43
|
* Accepts string or array form (see rpcUrl). Env: JINN_L2_PROOF_RPC_URL.
|
|
44
44
|
*/
|
|
45
45
|
l2ProofRpcUrl: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
|
|
46
|
+
/**
|
|
47
|
+
* Single volume-aware durable-state root. When set (env JINN_STATE_DIR or
|
|
48
|
+
* this file field), `earningDir`, `dbPath`, `engine.implStateDirRoot`, and
|
|
49
|
+
* the swe-rebench-v2 pool dir derive from it as `<stateDir>/<subdir>` —
|
|
50
|
+
* UNLESS each is individually overridden, in which case the per-key value
|
|
51
|
+
* wins (derive-don't-collapse). With `stateDir` unset, every default is
|
|
52
|
+
* byte-identical to the legacy `~/.jinn-client/<subdir>` paths. Hosted
|
|
53
|
+
* deploys collapse four ENV lines to one `JINN_STATE_DIR=/data`.
|
|
54
|
+
* `engine.workingDirRoot` is deliberately NOT derived — it stays ephemeral
|
|
55
|
+
* (reaped per-task).
|
|
56
|
+
*/
|
|
57
|
+
stateDir: z.ZodOptional<z.ZodString>;
|
|
46
58
|
/** Earning state directory */
|
|
47
59
|
earningDir: z.ZodDefault<z.ZodString>;
|
|
48
60
|
/** SQLite database path */
|
|
@@ -98,6 +110,8 @@ export declare const JinnConfigSchema: z.ZodEffects<z.ZodObject<{
|
|
|
98
110
|
hermesModel: z.ZodOptional<z.ZodString>;
|
|
99
111
|
/** Hermes provider (e.g. 'anthropic'). */
|
|
100
112
|
hermesProvider: z.ZodOptional<z.ZodString>;
|
|
113
|
+
/** Local OpenAI-compatible Hermes base URL, e.g. http://127.0.0.1:11434/v1 for Ollama. */
|
|
114
|
+
hermesBaseUrl: z.ZodOptional<z.ZodEffects<z.ZodString, string, string>>;
|
|
101
115
|
/**
|
|
102
116
|
* Timeout in ms for `hermes doctor` health-check runs.
|
|
103
117
|
* Default 30 000 ms. Env: JINN_HERMES_DOCTOR_TIMEOUT_MS.
|
|
@@ -157,16 +171,18 @@ export declare const JinnConfigSchema: z.ZodEffects<z.ZodObject<{
|
|
|
157
171
|
* Narrow task discovery to specific on-chain task ids. This is primarily
|
|
158
172
|
* for live acceptance gates that must avoid claiming unrelated public
|
|
159
173
|
* backlog while proving one fresh task path.
|
|
174
|
+
* Env: JINN_TASK_DISCOVERY_ALLOWED_TASK_IDS (comma-separated).
|
|
160
175
|
*/
|
|
161
176
|
taskDiscoveryAllowedTaskIds: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
162
177
|
/**
|
|
163
|
-
*
|
|
164
|
-
* on-chain TaskCreated backlog scan. Unset → the
|
|
165
|
-
*
|
|
166
|
-
* a
|
|
167
|
-
* (DiscoveryAPI.findClaimableTasks)
|
|
168
|
-
*
|
|
169
|
-
*
|
|
178
|
+
* Explicit absolute lower bound (L2 block number) for the mech adapter's
|
|
179
|
+
* on-chain TaskCreated backlog scan. Unset → the scan defaults to a bounded
|
|
180
|
+
* rolling window (`head − DEFAULT_ONCHAIN_SCAN_WINDOW_BLOCKS`, ~28h on Base),
|
|
181
|
+
* so a restart no longer replays full chain history every boot (#801); the
|
|
182
|
+
* indexer (DiscoveryAPI.findClaimableTasks) is the primary discovery path and
|
|
183
|
+
* the on-chain scan is a bounded backstop. Set this to widen the backstop to a
|
|
184
|
+
* specific block (the value pins both the scan start and the gh #300 admission
|
|
185
|
+
* floor). Env: JINN_TASK_DISCOVERY_FROM_BLOCK.
|
|
170
186
|
*/
|
|
171
187
|
taskDiscoveryOnchainFromBlock: z.ZodOptional<z.ZodNumber>;
|
|
172
188
|
/** This node's public HTTP endpoint (for 8004 registration) */
|
|
@@ -1466,10 +1482,12 @@ export declare const JinnConfigSchema: z.ZodEffects<z.ZodObject<{
|
|
|
1466
1482
|
rpcUrl?: string | string[] | undefined;
|
|
1467
1483
|
archiveRpcUrl?: string | string[] | undefined;
|
|
1468
1484
|
l2ProofRpcUrl?: string | string[] | undefined;
|
|
1485
|
+
stateDir?: string | undefined;
|
|
1469
1486
|
apiBindHost?: string | undefined;
|
|
1470
1487
|
hermesPath?: string | undefined;
|
|
1471
1488
|
hermesModel?: string | undefined;
|
|
1472
1489
|
hermesProvider?: string | undefined;
|
|
1490
|
+
hermesBaseUrl?: string | undefined;
|
|
1473
1491
|
codexPath?: string | undefined;
|
|
1474
1492
|
runtimeMode?: "bare" | "docker-compose" | "container" | undefined;
|
|
1475
1493
|
discovery?: {
|
|
@@ -1542,6 +1560,7 @@ export declare const JinnConfigSchema: z.ZodEffects<z.ZodObject<{
|
|
|
1542
1560
|
rpcUrl?: string | string[] | undefined;
|
|
1543
1561
|
archiveRpcUrl?: string | string[] | undefined;
|
|
1544
1562
|
l2ProofRpcUrl?: string | string[] | undefined;
|
|
1563
|
+
stateDir?: string | undefined;
|
|
1545
1564
|
earningDir?: string | undefined;
|
|
1546
1565
|
dbPath?: string | undefined;
|
|
1547
1566
|
pollIntervalMs?: number | undefined;
|
|
@@ -1556,6 +1575,7 @@ export declare const JinnConfigSchema: z.ZodEffects<z.ZodObject<{
|
|
|
1556
1575
|
hermesPath?: string | undefined;
|
|
1557
1576
|
hermesModel?: string | undefined;
|
|
1558
1577
|
hermesProvider?: string | undefined;
|
|
1578
|
+
hermesBaseUrl?: string | undefined;
|
|
1559
1579
|
hermesDoctorTimeoutMs?: number | undefined;
|
|
1560
1580
|
codexPath?: string | undefined;
|
|
1561
1581
|
codexDoctorTimeoutMs?: number | undefined;
|
|
@@ -1872,10 +1892,12 @@ export declare const JinnConfigSchema: z.ZodEffects<z.ZodObject<{
|
|
|
1872
1892
|
rpcUrl?: string | string[] | undefined;
|
|
1873
1893
|
archiveRpcUrl?: string | string[] | undefined;
|
|
1874
1894
|
l2ProofRpcUrl?: string | string[] | undefined;
|
|
1895
|
+
stateDir?: string | undefined;
|
|
1875
1896
|
apiBindHost?: string | undefined;
|
|
1876
1897
|
hermesPath?: string | undefined;
|
|
1877
1898
|
hermesModel?: string | undefined;
|
|
1878
1899
|
hermesProvider?: string | undefined;
|
|
1900
|
+
hermesBaseUrl?: string | undefined;
|
|
1879
1901
|
codexPath?: string | undefined;
|
|
1880
1902
|
runtimeMode?: "bare" | "docker-compose" | "container" | undefined;
|
|
1881
1903
|
discovery?: {
|
|
@@ -1948,6 +1970,7 @@ export declare const JinnConfigSchema: z.ZodEffects<z.ZodObject<{
|
|
|
1948
1970
|
rpcUrl?: string | string[] | undefined;
|
|
1949
1971
|
archiveRpcUrl?: string | string[] | undefined;
|
|
1950
1972
|
l2ProofRpcUrl?: string | string[] | undefined;
|
|
1973
|
+
stateDir?: string | undefined;
|
|
1951
1974
|
earningDir?: string | undefined;
|
|
1952
1975
|
dbPath?: string | undefined;
|
|
1953
1976
|
pollIntervalMs?: number | undefined;
|
|
@@ -1962,6 +1985,7 @@ export declare const JinnConfigSchema: z.ZodEffects<z.ZodObject<{
|
|
|
1962
1985
|
hermesPath?: string | undefined;
|
|
1963
1986
|
hermesModel?: string | undefined;
|
|
1964
1987
|
hermesProvider?: string | undefined;
|
|
1988
|
+
hermesBaseUrl?: string | undefined;
|
|
1965
1989
|
hermesDoctorTimeoutMs?: number | undefined;
|
|
1966
1990
|
codexPath?: string | undefined;
|
|
1967
1991
|
codexDoctorTimeoutMs?: number | undefined;
|
package/dist/config.js
CHANGED
|
@@ -20,6 +20,7 @@ import { z } from 'zod';
|
|
|
20
20
|
import { TaskSchema, parseTask } from './types/task.js';
|
|
21
21
|
import { canonicalHarnessName } from './harnesses/names.js';
|
|
22
22
|
import { parseRpcUrls } from './rpc/transport.js';
|
|
23
|
+
import { canonicalLocalHttpBaseUrl } from './local-provider-url.js';
|
|
23
24
|
// ── Schema ──────────────────────────────────────────────────────────────────
|
|
24
25
|
const HarnessNameSchema = z.string().transform((name) => canonicalHarnessName(name));
|
|
25
26
|
export const JinnConfigSchema = z.object({
|
|
@@ -50,6 +51,18 @@ export const JinnConfigSchema = z.object({
|
|
|
50
51
|
* Accepts string or array form (see rpcUrl). Env: JINN_L2_PROOF_RPC_URL.
|
|
51
52
|
*/
|
|
52
53
|
l2ProofRpcUrl: z.union([z.string(), z.array(z.string()).min(1)]).optional(),
|
|
54
|
+
/**
|
|
55
|
+
* Single volume-aware durable-state root. When set (env JINN_STATE_DIR or
|
|
56
|
+
* this file field), `earningDir`, `dbPath`, `engine.implStateDirRoot`, and
|
|
57
|
+
* the swe-rebench-v2 pool dir derive from it as `<stateDir>/<subdir>` —
|
|
58
|
+
* UNLESS each is individually overridden, in which case the per-key value
|
|
59
|
+
* wins (derive-don't-collapse). With `stateDir` unset, every default is
|
|
60
|
+
* byte-identical to the legacy `~/.jinn-client/<subdir>` paths. Hosted
|
|
61
|
+
* deploys collapse four ENV lines to one `JINN_STATE_DIR=/data`.
|
|
62
|
+
* `engine.workingDirRoot` is deliberately NOT derived — it stays ephemeral
|
|
63
|
+
* (reaped per-task).
|
|
64
|
+
*/
|
|
65
|
+
stateDir: z.string().optional(),
|
|
53
66
|
/** Earning state directory */
|
|
54
67
|
earningDir: z.string().default(join(homedir(), '.jinn-client', 'earning')),
|
|
55
68
|
/** SQLite database path */
|
|
@@ -105,6 +118,22 @@ export const JinnConfigSchema = z.object({
|
|
|
105
118
|
hermesModel: z.string().optional(),
|
|
106
119
|
/** Hermes provider (e.g. 'anthropic'). */
|
|
107
120
|
hermesProvider: z.string().optional(),
|
|
121
|
+
/** Local OpenAI-compatible Hermes base URL, e.g. http://127.0.0.1:11434/v1 for Ollama. */
|
|
122
|
+
hermesBaseUrl: z
|
|
123
|
+
.string()
|
|
124
|
+
.url()
|
|
125
|
+
.transform((value, ctx) => {
|
|
126
|
+
const canonical = canonicalLocalHttpBaseUrl(value);
|
|
127
|
+
if (!canonical) {
|
|
128
|
+
ctx.addIssue({
|
|
129
|
+
code: z.ZodIssueCode.custom,
|
|
130
|
+
message: 'hermesBaseUrl must be a local HTTP(S) URL',
|
|
131
|
+
});
|
|
132
|
+
return z.NEVER;
|
|
133
|
+
}
|
|
134
|
+
return canonical;
|
|
135
|
+
})
|
|
136
|
+
.optional(),
|
|
108
137
|
/**
|
|
109
138
|
* Timeout in ms for `hermes doctor` health-check runs.
|
|
110
139
|
* Default 30 000 ms. Env: JINN_HERMES_DOCTOR_TIMEOUT_MS.
|
|
@@ -161,16 +190,18 @@ export const JinnConfigSchema = z.object({
|
|
|
161
190
|
* Narrow task discovery to specific on-chain task ids. This is primarily
|
|
162
191
|
* for live acceptance gates that must avoid claiming unrelated public
|
|
163
192
|
* backlog while proving one fresh task path.
|
|
193
|
+
* Env: JINN_TASK_DISCOVERY_ALLOWED_TASK_IDS (comma-separated).
|
|
164
194
|
*/
|
|
165
195
|
taskDiscoveryAllowedTaskIds: z.array(z.string()).optional(),
|
|
166
196
|
/**
|
|
167
|
-
*
|
|
168
|
-
* on-chain TaskCreated backlog scan. Unset → the
|
|
169
|
-
*
|
|
170
|
-
* a
|
|
171
|
-
* (DiscoveryAPI.findClaimableTasks)
|
|
172
|
-
*
|
|
173
|
-
*
|
|
197
|
+
* Explicit absolute lower bound (L2 block number) for the mech adapter's
|
|
198
|
+
* on-chain TaskCreated backlog scan. Unset → the scan defaults to a bounded
|
|
199
|
+
* rolling window (`head − DEFAULT_ONCHAIN_SCAN_WINDOW_BLOCKS`, ~28h on Base),
|
|
200
|
+
* so a restart no longer replays full chain history every boot (#801); the
|
|
201
|
+
* indexer (DiscoveryAPI.findClaimableTasks) is the primary discovery path and
|
|
202
|
+
* the on-chain scan is a bounded backstop. Set this to widen the backstop to a
|
|
203
|
+
* specific block (the value pins both the scan start and the gh #300 admission
|
|
204
|
+
* floor). Env: JINN_TASK_DISCOVERY_FROM_BLOCK.
|
|
174
205
|
*/
|
|
175
206
|
taskDiscoveryOnchainFromBlock: z.number().int().min(0).optional(),
|
|
176
207
|
/** This node's public HTTP endpoint (for 8004 registration) */
|
|
@@ -736,6 +767,12 @@ export function loadConfig(configPath) {
|
|
|
736
767
|
if (env['JINN_TASK_DISCOVERY_FROM_BLOCK'] !== undefined) {
|
|
737
768
|
merged.taskDiscoveryOnchainFromBlock = Number.parseInt(env['JINN_TASK_DISCOVERY_FROM_BLOCK'], 10);
|
|
738
769
|
}
|
|
770
|
+
if (env['JINN_TASK_DISCOVERY_ALLOWED_TASK_IDS'] !== undefined) {
|
|
771
|
+
merged.taskDiscoveryAllowedTaskIds = env['JINN_TASK_DISCOVERY_ALLOWED_TASK_IDS']
|
|
772
|
+
.split(',')
|
|
773
|
+
.map((id) => id.trim())
|
|
774
|
+
.filter(Boolean);
|
|
775
|
+
}
|
|
739
776
|
if (env['JINN_API_PORT'])
|
|
740
777
|
merged.apiPort = parseInt(env['JINN_API_PORT'], 10);
|
|
741
778
|
if (env['JINN_API_BIND_HOST'])
|
|
@@ -750,6 +787,8 @@ export function loadConfig(configPath) {
|
|
|
750
787
|
merged.hermesModel = env['JINN_HERMES_MODEL'];
|
|
751
788
|
if (env['JINN_HERMES_PROVIDER'])
|
|
752
789
|
merged.hermesProvider = env['JINN_HERMES_PROVIDER'];
|
|
790
|
+
if (env['JINN_HERMES_BASE_URL'])
|
|
791
|
+
merged.hermesBaseUrl = env['JINN_HERMES_BASE_URL'];
|
|
753
792
|
if (env['JINN_HERMES_DOCTOR_TIMEOUT_MS']) {
|
|
754
793
|
merged.hermesDoctorTimeoutMs = parseInt(env['JINN_HERMES_DOCTOR_TIMEOUT_MS'], 10);
|
|
755
794
|
}
|
|
@@ -920,6 +959,28 @@ export function loadConfig(configPath) {
|
|
|
920
959
|
...(env['JINN_ENGINE_IMPL_STATE_DIR_ROOT'] ? { implStateDirRoot: env['JINN_ENGINE_IMPL_STATE_DIR_ROOT'] } : {}),
|
|
921
960
|
};
|
|
922
961
|
}
|
|
962
|
+
// JINN_STATE_DIR: single volume-aware root. Runs AFTER all per-key env
|
|
963
|
+
// overrides above are applied into `merged` and BEFORE safeParse — so a
|
|
964
|
+
// still-`undefined` per-key value means neither file nor env set it. Per-key
|
|
965
|
+
// precedence: explicit (file or env, already in `merged`) > <stateDir>/<subdir>
|
|
966
|
+
// > legacy default (filled by the schema / engine assembly when still absent).
|
|
967
|
+
// workingDirRoot is deliberately NOT derived — it stays ephemeral.
|
|
968
|
+
const stateDir = env['JINN_STATE_DIR']
|
|
969
|
+
?? (typeof merged['stateDir'] === 'string' ? merged['stateDir'] : undefined);
|
|
970
|
+
if (stateDir) {
|
|
971
|
+
merged['stateDir'] = stateDir;
|
|
972
|
+
if (merged['earningDir'] === undefined)
|
|
973
|
+
merged['earningDir'] = join(stateDir, 'earning');
|
|
974
|
+
if (merged['dbPath'] === undefined)
|
|
975
|
+
merged['dbPath'] = join(stateDir, 'jinn.db');
|
|
976
|
+
const engineObj = (typeof merged['engine'] === 'object' && merged['engine'] !== null)
|
|
977
|
+
? merged['engine']
|
|
978
|
+
: {};
|
|
979
|
+
if (engineObj['implStateDirRoot'] === undefined) {
|
|
980
|
+
engineObj['implStateDirRoot'] = join(stateDir, 'engine', 'impl-state');
|
|
981
|
+
merged['engine'] = engineObj;
|
|
982
|
+
}
|
|
983
|
+
}
|
|
923
984
|
const resolvedNetwork = merged.network === 'testnet' ? 'testnet' : 'mainnet';
|
|
924
985
|
// Testnet default: point discovery at the privately-operated Ponder indexer
|
|
925
986
|
// (jinn-mono-280n.4), unless the operator has set their own `discovery` block.
|
|
@@ -1103,6 +1164,7 @@ export function persistTopLevelConfigValue(key, value, configPath) {
|
|
|
1103
1164
|
*/
|
|
1104
1165
|
const TRACKED_ENV_VARS = [
|
|
1105
1166
|
'JINN_NETWORK',
|
|
1167
|
+
'JINN_STATE_DIR',
|
|
1106
1168
|
'JINN_EARNING_DIR',
|
|
1107
1169
|
'JINN_DB_PATH',
|
|
1108
1170
|
'JINN_POLL_INTERVAL_MS',
|
|
@@ -1116,12 +1178,14 @@ const TRACKED_ENV_VARS = [
|
|
|
1116
1178
|
'JINN_HERMES_PATH',
|
|
1117
1179
|
'JINN_HERMES_MODEL',
|
|
1118
1180
|
'JINN_HERMES_PROVIDER',
|
|
1181
|
+
'JINN_HERMES_BASE_URL',
|
|
1119
1182
|
'JINN_HERMES_DOCTOR_TIMEOUT_MS',
|
|
1120
1183
|
'JINN_RUNTIME_MODE',
|
|
1121
1184
|
'JINN_PEERS',
|
|
1122
1185
|
'JINN_DISCOVERY_MODE',
|
|
1123
1186
|
'JINN_DISCOVERY_URL',
|
|
1124
1187
|
'JINN_DISCOVERY_FALLBACK',
|
|
1188
|
+
'JINN_TASK_DISCOVERY_ALLOWED_TASK_IDS',
|
|
1125
1189
|
'JINN_NODE_ENDPOINT',
|
|
1126
1190
|
'JINN_IPFS_REGISTRY_URL',
|
|
1127
1191
|
'JINN_IPFS_GATEWAY_URL',
|
|
@@ -1158,6 +1222,7 @@ const TRACKED_ENV_VARS = [
|
|
|
1158
1222
|
'JINN_TASKS',
|
|
1159
1223
|
'JINN_ENGINE_WORKING_DIR_ROOT',
|
|
1160
1224
|
'JINN_ENGINE_IMPL_STATE_DIR_ROOT',
|
|
1225
|
+
'JINN_SWE_REBENCH_V2_STATE_DIR',
|
|
1161
1226
|
'JINN_OPERATOR_PUBLIC_ENDPOINT',
|
|
1162
1227
|
'JINN_OPERATOR_DEFAULT_PRICE_USDC',
|
|
1163
1228
|
'JINN_OPERATOR_DONATION_ENABLED',
|