@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.
Files changed (319) hide show
  1. package/README.md +67 -1
  2. package/dist/adapters/mech/adapter.d.ts +19 -1
  3. package/dist/adapters/mech/adapter.js +130 -14
  4. package/dist/adapters/mech/adapter.js.map +1 -1
  5. package/dist/adapters/mech/contracts.d.ts +22 -1
  6. package/dist/adapters/mech/contracts.js +34 -24
  7. package/dist/adapters/mech/contracts.js.map +1 -1
  8. package/dist/adapters/mech/safe.d.ts +1 -1
  9. package/dist/adapters/mech/safe.js +5 -3
  10. package/dist/adapters/mech/safe.js.map +1 -1
  11. package/dist/adapters/mech/types.d.ts +6 -1
  12. package/dist/adapters/mech/types.js.map +1 -1
  13. package/dist/agent/operator-claude.js +8 -0
  14. package/dist/agent/operator-claude.js.map +1 -1
  15. package/dist/api/activity-events-endpoint.d.ts +14 -0
  16. package/dist/api/activity-events-endpoint.js +59 -0
  17. package/dist/api/activity-events-endpoint.js.map +1 -0
  18. package/dist/api/bootstrap-endpoint.d.ts +1 -2
  19. package/dist/api/bootstrap-endpoint.js +42 -24
  20. package/dist/api/bootstrap-endpoint.js.map +1 -1
  21. package/dist/api/codex-doctor-endpoint.d.ts +22 -5
  22. package/dist/api/codex-doctor-endpoint.js +136 -17
  23. package/dist/api/codex-doctor-endpoint.js.map +1 -1
  24. package/dist/api/debug-report-endpoint.d.ts +27 -0
  25. package/dist/api/debug-report-endpoint.js +157 -0
  26. package/dist/api/debug-report-endpoint.js.map +1 -0
  27. package/dist/api/gather-status.d.ts +33 -0
  28. package/dist/api/gather-status.js +211 -26
  29. package/dist/api/gather-status.js.map +1 -1
  30. package/dist/api/hermes-doctor-endpoint.d.ts +15 -7
  31. package/dist/api/hermes-doctor-endpoint.js +56 -19
  32. package/dist/api/hermes-doctor-endpoint.js.map +1 -1
  33. package/dist/api/launcher-status.d.ts +4 -2
  34. package/dist/api/launcher-status.js +11 -10
  35. package/dist/api/launcher-status.js.map +1 -1
  36. package/dist/api/launcher-tasks.d.ts +1 -1
  37. package/dist/api/launcher-tasks.js +12 -8
  38. package/dist/api/launcher-tasks.js.map +1 -1
  39. package/dist/api/operator-artifacts-endpoint.js +73 -6
  40. package/dist/api/operator-artifacts-endpoint.js.map +1 -1
  41. package/dist/api/portfolio-v0-build.d.ts +7 -1
  42. package/dist/api/portfolio-v0-build.js +6 -2
  43. package/dist/api/portfolio-v0-build.js.map +1 -1
  44. package/dist/api/prediction-v1-build.d.ts +6 -0
  45. package/dist/api/prediction-v1-build.js +3 -1
  46. package/dist/api/prediction-v1-build.js.map +1 -1
  47. package/dist/api/server.d.ts +17 -0
  48. package/dist/api/server.js +40 -1
  49. package/dist/api/server.js.map +1 -1
  50. package/dist/api/setup-endpoints.d.ts +0 -9
  51. package/dist/api/setup-endpoints.js +11 -153
  52. package/dist/api/setup-endpoints.js.map +1 -1
  53. package/dist/api/solvernets-endpoints.js +30 -63
  54. package/dist/api/solvernets-endpoints.js.map +1 -1
  55. package/dist/api/status-build.d.ts +115 -2
  56. package/dist/api/status-build.js +47 -11
  57. package/dist/api/status-build.js.map +1 -1
  58. package/dist/api/status-harness-rollup.d.ts +35 -0
  59. package/dist/api/status-harness-rollup.js +45 -0
  60. package/dist/api/status-harness-rollup.js.map +1 -0
  61. package/dist/api/task-runs-build.d.ts +8 -0
  62. package/dist/api/task-runs-build.js +5 -1
  63. package/dist/api/task-runs-build.js.map +1 -1
  64. package/dist/build-info.json +4 -4
  65. package/dist/build-meta.json +1 -1
  66. package/dist/captures/live-publisher.js +24 -4
  67. package/dist/captures/live-publisher.js.map +1 -1
  68. package/dist/captures/publish.d.ts +1 -1
  69. package/dist/chain-read-errors.d.ts +12 -0
  70. package/dist/chain-read-errors.js +26 -1
  71. package/dist/chain-read-errors.js.map +1 -1
  72. package/dist/cli/commands/codedigest-revert-check.d.ts +33 -0
  73. package/dist/cli/commands/codedigest-revert-check.js +249 -0
  74. package/dist/cli/commands/codedigest-revert-check.js.map +1 -0
  75. package/dist/cli/commands/solver-nets.d.ts +1 -0
  76. package/dist/cli/commands/solver-nets.js +177 -22
  77. package/dist/cli/commands/solver-nets.js.map +1 -1
  78. package/dist/cli/commands/solver-plugins-block.d.ts +33 -0
  79. package/dist/cli/commands/solver-plugins-block.js +118 -0
  80. package/dist/cli/commands/solver-plugins-block.js.map +1 -0
  81. package/dist/cli/commands/solver-plugins-feedback.d.ts +72 -0
  82. package/dist/cli/commands/solver-plugins-feedback.js +262 -0
  83. package/dist/cli/commands/solver-plugins-feedback.js.map +1 -0
  84. package/dist/cli/commands/solver-plugins-read.d.ts +54 -0
  85. package/dist/cli/commands/solver-plugins-read.js +259 -0
  86. package/dist/cli/commands/solver-plugins-read.js.map +1 -0
  87. package/dist/cli/commands/solver-plugins.d.ts +35 -0
  88. package/dist/cli/commands/solver-plugins.js +399 -2
  89. package/dist/cli/commands/solver-plugins.js.map +1 -1
  90. package/dist/cli/commands/tasks.js +15 -2
  91. package/dist/cli/commands/tasks.js.map +1 -1
  92. package/dist/cli/index.js +2 -0
  93. package/dist/cli/index.js.map +1 -1
  94. package/dist/cli/task-native-readiness.d.ts +7 -0
  95. package/dist/cli/task-native-readiness.js +7 -5
  96. package/dist/cli/task-native-readiness.js.map +1 -1
  97. package/dist/config.d.ts +183 -232
  98. package/dist/config.js +232 -107
  99. package/dist/config.js.map +1 -1
  100. package/dist/daemon/ai-units-gate.d.ts +54 -0
  101. package/dist/daemon/ai-units-gate.js +82 -0
  102. package/dist/daemon/ai-units-gate.js.map +1 -0
  103. package/dist/daemon/creator.js +13 -0
  104. package/dist/daemon/creator.js.map +1 -1
  105. package/dist/daemon/daemon.d.ts +10 -0
  106. package/dist/daemon/daemon.js +203 -30
  107. package/dist/daemon/daemon.js.map +1 -1
  108. package/dist/daemon/gate-logger.d.ts +9 -0
  109. package/dist/daemon/gate-logger.js +2 -0
  110. package/dist/daemon/gate-logger.js.map +1 -0
  111. package/dist/daemon/jinn-claim-loop.js +22 -4
  112. package/dist/daemon/jinn-claim-loop.js.map +1 -1
  113. package/dist/daemon/readiness-gate.d.ts +1 -4
  114. package/dist/daemon/readiness-gate.js.map +1 -1
  115. package/dist/daemon/spend-cap-gate.d.ts +40 -0
  116. package/dist/daemon/spend-cap-gate.js +46 -0
  117. package/dist/daemon/spend-cap-gate.js.map +1 -0
  118. package/dist/dashboard/assets/index-CzKxvMcU.css +32 -0
  119. package/dist/dashboard/assets/index-yVemxHot.js +351 -0
  120. package/dist/dashboard/index.html +2 -2
  121. package/dist/discovery/http.js +328 -1
  122. package/dist/discovery/http.js.map +1 -1
  123. package/dist/discovery/onchain.js +42 -4
  124. package/dist/discovery/onchain.js.map +1 -1
  125. package/dist/discovery/types.d.ts +129 -0
  126. package/dist/discovery/types.js.map +1 -1
  127. package/dist/discovery/with-fallback.js +27 -0
  128. package/dist/discovery/with-fallback.js.map +1 -1
  129. package/dist/earning/bootstrap.d.ts +8 -3
  130. package/dist/earning/bootstrap.js +36 -13
  131. package/dist/earning/bootstrap.js.map +1 -1
  132. package/dist/earning/safe-adapter.js +23 -11
  133. package/dist/earning/safe-adapter.js.map +1 -1
  134. package/dist/earning/types.d.ts +6 -6
  135. package/dist/earning/viem-clients.d.ts +11 -4
  136. package/dist/earning/viem-clients.js +14 -5
  137. package/dist/earning/viem-clients.js.map +1 -1
  138. package/dist/erc8004/identity.d.ts +19 -3
  139. package/dist/erc8004/identity.js +38 -11
  140. package/dist/erc8004/identity.js.map +1 -1
  141. package/dist/erc8004/index.d.ts +1 -1
  142. package/dist/erc8004/index.js.map +1 -1
  143. package/dist/events/types.d.ts +2 -2
  144. package/dist/harnesses/cost-estimates.d.ts +10 -31
  145. package/dist/harnesses/cost-estimates.js +11 -43
  146. package/dist/harnesses/cost-estimates.js.map +1 -1
  147. package/dist/harnesses/engine/engine.d.ts +28 -4
  148. package/dist/harnesses/engine/engine.js +103 -17
  149. package/dist/harnesses/engine/engine.js.map +1 -1
  150. package/dist/harnesses/engine/persistence.d.ts +21 -4
  151. package/dist/harnesses/engine/persistence.js +43 -6
  152. package/dist/harnesses/engine/persistence.js.map +1 -1
  153. package/dist/harnesses/engine/state.d.ts +9 -0
  154. package/dist/harnesses/engine/state.js +23 -10
  155. package/dist/harnesses/engine/state.js.map +1 -1
  156. package/dist/harnesses/impls/hermes-agent/bootstrap.js +4 -2
  157. package/dist/harnesses/impls/hermes-agent/bootstrap.js.map +1 -1
  158. package/dist/harnesses/impls/hermes-agent/config-builder.d.ts +1 -1
  159. package/dist/harnesses/impls/hermes-agent/config-builder.js +4 -2
  160. package/dist/harnesses/impls/hermes-agent/config-builder.js.map +1 -1
  161. package/dist/harnesses/impls/hermes-agent/harness.d.ts +14 -0
  162. package/dist/harnesses/impls/hermes-agent/harness.js +16 -2
  163. package/dist/harnesses/impls/hermes-agent/harness.js.map +1 -1
  164. package/dist/harnesses/impls/hermes-agent/prompt.d.ts +6 -6
  165. package/dist/harnesses/impls/hermes-agent/prompt.js +6 -6
  166. package/dist/harnesses/impls/learner/adapters/claude-code.d.ts +17 -0
  167. package/dist/harnesses/impls/learner/adapters/claude-code.js +113 -14
  168. package/dist/harnesses/impls/learner/adapters/claude-code.js.map +1 -1
  169. package/dist/harnesses/impls/learner/adapters/codex-code.d.ts +9 -0
  170. package/dist/harnesses/impls/learner/adapters/codex-code.js +30 -8
  171. package/dist/harnesses/impls/learner/adapters/codex-code.js.map +1 -1
  172. package/dist/harnesses/impls/learner/harness.d.ts +24 -0
  173. package/dist/harnesses/impls/learner/harness.js +27 -3
  174. package/dist/harnesses/impls/learner/harness.js.map +1 -1
  175. package/dist/harnesses/impls/learner/harvest.d.ts +1 -1
  176. package/dist/harnesses/impls/learner/harvest.js +23 -5
  177. package/dist/harnesses/impls/learner/harvest.js.map +1 -1
  178. package/dist/harnesses/impls/learner/restoration-patch.d.ts +2 -2
  179. package/dist/harnesses/impls/learner/restoration-patch.js +25 -6
  180. package/dist/harnesses/impls/learner/restoration-patch.js.map +1 -1
  181. package/dist/harnesses/impls/swe-rebench-v2-evaluator/eval-runner.js +21 -1
  182. package/dist/harnesses/impls/swe-rebench-v2-evaluator/eval-runner.js.map +1 -1
  183. package/dist/harnesses/impls/swe-rebench-v2-evaluator/hf-fetcher.d.ts +74 -5
  184. package/dist/harnesses/impls/swe-rebench-v2-evaluator/hf-fetcher.js +103 -32
  185. package/dist/harnesses/impls/swe-rebench-v2-evaluator/hf-fetcher.js.map +1 -1
  186. package/dist/harnesses/readiness-registry.d.ts +7 -0
  187. package/dist/harnesses/readiness-registry.js +9 -0
  188. package/dist/harnesses/readiness-registry.js.map +1 -1
  189. package/dist/learner/revert-decision.d.ts +59 -0
  190. package/dist/learner/revert-decision.js +53 -0
  191. package/dist/learner/revert-decision.js.map +1 -0
  192. package/dist/learner/revert-stats.d.ts +24 -0
  193. package/dist/learner/revert-stats.js +44 -0
  194. package/dist/learner/revert-stats.js.map +1 -0
  195. package/dist/main.js +177 -104
  196. package/dist/main.js.map +1 -1
  197. package/dist/mcp/get-codedigest-reward.d.ts +13 -0
  198. package/dist/mcp/get-codedigest-reward.js +23 -0
  199. package/dist/mcp/get-codedigest-reward.js.map +1 -0
  200. package/dist/mcp/server.js +23 -0
  201. package/dist/mcp/server.js.map +1 -1
  202. package/dist/observability/debug-report-assemble.d.ts +43 -0
  203. package/dist/observability/debug-report-assemble.js +80 -0
  204. package/dist/observability/debug-report-assemble.js.map +1 -0
  205. package/dist/observability/emit-event.d.ts +9 -2
  206. package/dist/observability/emit-event.js +36 -2
  207. package/dist/observability/emit-event.js.map +1 -1
  208. package/dist/observability/file-logger.d.ts +69 -0
  209. package/dist/observability/file-logger.js +177 -0
  210. package/dist/observability/file-logger.js.map +1 -0
  211. package/dist/observability/redact-secrets.d.ts +65 -0
  212. package/dist/observability/redact-secrets.js +300 -0
  213. package/dist/observability/redact-secrets.js.map +1 -0
  214. package/dist/observability/tar.d.ts +30 -0
  215. package/dist/observability/tar.js +102 -0
  216. package/dist/observability/tar.js.map +1 -0
  217. package/dist/plugins/learner/skills/learn/consolidator-prompt.md +18 -1
  218. package/dist/plugins/learner/skills/learn/promoter-prompt.md +72 -1
  219. package/dist/preflight/pidfile-liveness.d.ts +44 -0
  220. package/dist/preflight/pidfile-liveness.js +103 -0
  221. package/dist/preflight/pidfile-liveness.js.map +1 -0
  222. package/dist/preflight/rpc-network.d.ts +40 -0
  223. package/dist/preflight/rpc-network.js +67 -1
  224. package/dist/preflight/rpc-network.js.map +1 -1
  225. package/dist/rpc/transport.d.ts +109 -0
  226. package/dist/rpc/transport.js +220 -0
  227. package/dist/rpc/transport.js.map +1 -0
  228. package/dist/scripts/donation-consumption-acceptance.js +7 -28
  229. package/dist/scripts/donation-consumption-acceptance.js.map +1 -1
  230. package/dist/scripts/swe-rebench-v2-pytest-missing.json +16 -0
  231. package/dist/solver-nets/prediction-operator-ux.d.ts +1 -2
  232. package/dist/solver-nets/prediction-operator-ux.js +56 -53
  233. package/dist/solver-nets/prediction-operator-ux.js.map +1 -1
  234. package/dist/solver-nets/registry.d.ts +19 -1
  235. package/dist/solver-nets/registry.js +37 -24
  236. package/dist/solver-nets/registry.js.map +1 -1
  237. package/dist/solver-types/_swe-rebench-v2-pool.d.ts +9 -2
  238. package/dist/solver-types/_swe-rebench-v2-pool.js +15 -20
  239. package/dist/solver-types/_swe-rebench-v2-pool.js.map +1 -1
  240. package/dist/solver-types/_swe-rebench-v2-state.d.ts +15 -0
  241. package/dist/solver-types/_swe-rebench-v2-state.js +19 -0
  242. package/dist/solver-types/_swe-rebench-v2-state.js.map +1 -1
  243. package/dist/solver-types/_swe-rebench-v2-validated-pool.d.ts +116 -2
  244. package/dist/solver-types/_swe-rebench-v2-validated-pool.js +296 -21
  245. package/dist/solver-types/_swe-rebench-v2-validated-pool.js.map +1 -1
  246. package/dist/solver-types/swe-rebench-v2-auto.d.ts +20 -11
  247. package/dist/solver-types/swe-rebench-v2-auto.js +64 -19
  248. package/dist/solver-types/swe-rebench-v2-auto.js.map +1 -1
  249. package/dist/solver-types/swe-rebench-v2.d.ts +8 -2
  250. package/dist/solver-types/swe-rebench-v2.js +127 -11
  251. package/dist/solver-types/swe-rebench-v2.js.map +1 -1
  252. package/dist/solvernets/daemon-init.d.ts +1 -1
  253. package/dist/solvernets/daemon-init.js +19 -4
  254. package/dist/solvernets/daemon-init.js.map +1 -1
  255. package/dist/solvernets/launched-record-dispatcher.d.ts +4 -0
  256. package/dist/solvernets/launched-record-dispatcher.js +10 -4
  257. package/dist/solvernets/launched-record-dispatcher.js.map +1 -1
  258. package/dist/solvernets/registry-client-erc8004.js +11 -0
  259. package/dist/solvernets/registry-client-erc8004.js.map +1 -1
  260. package/dist/solvernets/store.d.ts +2 -2
  261. package/dist/spend/ai-units-config.d.ts +39 -0
  262. package/dist/spend/ai-units-config.js +28 -0
  263. package/dist/spend/ai-units-config.js.map +1 -0
  264. package/dist/spend/ai-units.d.ts +89 -0
  265. package/dist/spend/ai-units.js +156 -0
  266. package/dist/spend/ai-units.js.map +1 -0
  267. package/dist/spend/cost-surface-status.d.ts +12 -0
  268. package/dist/spend/cost-surface-status.js +24 -0
  269. package/dist/spend/cost-surface-status.js.map +1 -0
  270. package/dist/spend/credential.d.ts +39 -0
  271. package/dist/spend/credential.js +71 -0
  272. package/dist/spend/credential.js.map +1 -0
  273. package/dist/spend/daemon-config.d.ts +13 -0
  274. package/dist/spend/daemon-config.js +24 -0
  275. package/dist/spend/daemon-config.js.map +1 -0
  276. package/dist/spend/pricing.d.ts +16 -0
  277. package/dist/spend/pricing.js +26 -0
  278. package/dist/spend/pricing.js.map +1 -0
  279. package/dist/spend/record.d.ts +13 -0
  280. package/dist/spend/record.js +36 -0
  281. package/dist/spend/record.js.map +1 -0
  282. package/dist/spend/usage.d.ts +27 -0
  283. package/dist/spend/usage.js +113 -0
  284. package/dist/spend/usage.js.map +1 -0
  285. package/dist/store/store.d.ts +101 -0
  286. package/dist/store/store.js +304 -4
  287. package/dist/store/store.js.map +1 -1
  288. package/dist/trajectory/transcript-parsers/codex-session.d.ts +12 -6
  289. package/dist/trajectory/transcript-parsers/codex-session.js +114 -13
  290. package/dist/trajectory/transcript-parsers/codex-session.js.map +1 -1
  291. package/dist/trajectory/transcript-parsers/types.d.ts +8 -8
  292. package/dist/trajectory/transcript-session-dirs.d.ts +18 -0
  293. package/dist/trajectory/transcript-session-dirs.js +85 -0
  294. package/dist/trajectory/transcript-session-dirs.js.map +1 -0
  295. package/dist/trajectory/transcript-watcher.d.ts +20 -1
  296. package/dist/trajectory/transcript-watcher.js +108 -32
  297. package/dist/trajectory/transcript-watcher.js.map +1 -1
  298. package/dist/tx-retry.d.ts +25 -0
  299. package/dist/tx-retry.js +95 -7
  300. package/dist/tx-retry.js.map +1 -1
  301. package/dist/types/payloads/portfolio-v0.d.ts +3 -3
  302. package/dist/types/payloads/prediction-apy-v0.d.ts +3 -3
  303. package/dist/types/payloads/prediction-v0.d.ts +12 -12
  304. package/package.json +11 -3
  305. package/plugins/learner/skills/learn/consolidator-prompt.md +18 -1
  306. package/plugins/learner/skills/learn/promoter-prompt.md +72 -1
  307. package/plugins/swe-rebench-v2-diffmin/README.md +10 -9
  308. package/plugins/swe-rebench-v2-diffmin/jinn.plugin.json +1 -1
  309. package/plugins/swe-rebench-v2-diffmin/skills/diffmin/SKILL.md +15 -10
  310. package/plugins/swe-rebench-v2-diffmin/skills/test-map/SKILL.md +10 -12
  311. package/plugins/swe-rebench-v2-runtime/.claude-plugin/plugin.json +1 -1
  312. package/plugins/swe-rebench-v2-runtime/.codex-plugin/plugin.json +3 -3
  313. package/plugins/swe-rebench-v2-runtime/README.md +6 -6
  314. package/plugins/swe-rebench-v2-runtime/jinn.plugin.json +2 -3
  315. package/plugins/swe-rebench-v2-runtime/skills/task/SKILL.md +81 -0
  316. package/dist/dashboard/assets/index-BUlE8F3Y.js +0 -330
  317. package/dist/dashboard/assets/index-blqc7eqq.css +0 -32
  318. package/plugins/swe-rebench-v2-runtime/skills/orient/SKILL.md +0 -29
  319. package/plugins/swe-rebench-v2-runtime/skills/plan/SKILL.md +0 -53
@@ -18,6 +18,15 @@ export declare function flattenErrorMessage(error: unknown): string;
18
18
  * Intentionally conservative: do not treat insufficient balance or user rejections as recoverable.
19
19
  */
20
20
  export declare function isRecoverableTransactionError(error: unknown): boolean;
21
+ /**
22
+ * True when the error message contains the RPC's "nonce too low" signal.
23
+ *
24
+ * Issue #562: a daemon respawn can leave the locally-pinned ledger nonce
25
+ * behind the RPC's pending nonce, and every retry that re-submits with the
26
+ * stale value triggers this error. Callers use this helper to decide whether
27
+ * to refresh the pinned nonce before the next retry attempt.
28
+ */
29
+ export declare function isNonceTooLowError(error: unknown): boolean;
21
30
  export declare function sleep(ms: number): Promise<void>;
22
31
  export declare function backoffDelay(attemptIndex: number, baseMs: number, maxMs: number): Promise<void>;
23
32
  export interface TxRetryOptions {
@@ -133,6 +142,12 @@ export interface NonceLedgerContext {
133
142
  }): Promise<TxFeeOverrideResult>;
134
143
  recordSubmitted(entry: NonceLedgerSubmission): Promise<void>;
135
144
  markResolved(resolvedAtMs?: number): Promise<void>;
145
+ /**
146
+ * Re-read the pending nonce from the RPC, update `nonce` in place, and
147
+ * return the new value. Callers use this after a `nonce too low` revert
148
+ * (issue #562) so the next retry attempt picks up the fresh value.
149
+ */
150
+ refreshNonce(): Promise<number>;
136
151
  }
137
152
  export interface WithNonceLedgerArgs {
138
153
  publicClient: PublicClient;
@@ -144,6 +159,16 @@ export interface WithNonceLedgerArgs {
144
159
  recoverStuckNonce?: boolean;
145
160
  staleAfterMs?: number;
146
161
  }
162
+ /**
163
+ * Run `fn` while holding an exclusive per-EOA broadcast lock. Concurrent calls
164
+ * for the same `from` address are serialized; calls for different addresses
165
+ * proceed in parallel. The returned promise resolves/rejects with `fn`'s
166
+ * result, and the lock is released whether `fn` succeeds or throws.
167
+ *
168
+ * Exported for tests and for non-ledger broadcast paths that still need to
169
+ * share the EOA serialization (e.g. a raw `writeContract` that opts in).
170
+ */
171
+ export declare function withEoaBroadcastLock<T>(from: Address, fn: () => Promise<T>): Promise<T>;
147
172
  export declare function createMemoryTxSubmissionLedger(): TxSubmissionLedger;
148
173
  export declare function setDefaultTxSubmissionLedger(ledger: TxSubmissionLedger): void;
149
174
  export declare function getDefaultTxSubmissionLedger(): TxSubmissionLedger;
package/dist/tx-retry.js CHANGED
@@ -159,7 +159,13 @@ export function isRecoverableTransactionError(error) {
159
159
  lower.includes('fetch failed') ||
160
160
  lower.includes('network error') ||
161
161
  lower.includes('connection refused') ||
162
- lower.includes('connect timeout')) {
162
+ lower.includes('connect timeout') ||
163
+ // viem fallback() throws this when EVERY provider in the chain failed the
164
+ // request at once (transient multi-provider blip). A decodable inner revert
165
+ // is caught earlier (SafeInnerRevertError / GS013 / GS026), so reaching here
166
+ // with this message means a transport-level failure — retry hits a healthy
167
+ // provider instead of failing the claim/deliver task outright.
168
+ lower.includes('all rpc providers in the fallback chain failed')) {
163
169
  return true;
164
170
  }
165
171
  // Multi-node RPC eventual-consistency: a contract just deployed in a
@@ -189,6 +195,17 @@ export function isRecoverableTransactionError(error) {
189
195
  }
190
196
  return false;
191
197
  }
198
+ /**
199
+ * True when the error message contains the RPC's "nonce too low" signal.
200
+ *
201
+ * Issue #562: a daemon respawn can leave the locally-pinned ledger nonce
202
+ * behind the RPC's pending nonce, and every retry that re-submits with the
203
+ * stale value triggers this error. Callers use this helper to decide whether
204
+ * to refresh the pinned nonce before the next retry attempt.
205
+ */
206
+ export function isNonceTooLowError(error) {
207
+ return flattenErrorMessage(error).toLowerCase().includes('nonce too low');
208
+ }
192
209
  export function sleep(ms) {
193
210
  return new Promise(r => setTimeout(r, ms));
194
211
  }
@@ -197,6 +214,58 @@ export async function backoffDelay(attemptIndex, baseMs, maxMs) {
197
214
  const jitter = Math.floor(Math.random() * Math.min(250, baseMs));
198
215
  await sleep(exp + jitter);
199
216
  }
217
+ // ── Per-EOA broadcast serialization (issue #525 nonce-collision) ─────────────
218
+ //
219
+ // Multiple daemon subsystems broadcast transactions from the SAME agent EOA:
220
+ // - executeSafeTransaction (creator / claim / deliver loops, Safe-mediated)
221
+ // - IdentityPublisher.setMetadata (launch + per-execution anchors)
222
+ // - eviction-recovery distributor.reStake
223
+ //
224
+ // Each independently reads the EOA's `pending` transaction count to choose a
225
+ // nonce. When two run concurrently they read the SAME pending nonce, assign it
226
+ // to two different transactions, and the second to land reverts "nonce too
227
+ // low". The per-Safe lock in adapters/mech/safe.ts only serializes Safe txs
228
+ // sharing one Safe — it does not cover the EOA shared across these distinct
229
+ // broadcast mechanisms.
230
+ //
231
+ // This per-EOA mutex serializes the nonce-read → broadcast → record critical
232
+ // section across ALL broadcasters that route through `withNonceLedger`
233
+ // (executeSafeTransaction and viemSendTransactionWithRetry). It is keyed by the
234
+ // lowercased `from` address so two different EOAs never block each other, and
235
+ // it tolerates the `fn` rejecting (the lock is always released in `finally`).
236
+ const eoaBroadcastLocks = new Map();
237
+ /**
238
+ * Run `fn` while holding an exclusive per-EOA broadcast lock. Concurrent calls
239
+ * for the same `from` address are serialized; calls for different addresses
240
+ * proceed in parallel. The returned promise resolves/rejects with `fn`'s
241
+ * result, and the lock is released whether `fn` succeeds or throws.
242
+ *
243
+ * Exported for tests and for non-ledger broadcast paths that still need to
244
+ * share the EOA serialization (e.g. a raw `writeContract` that opts in).
245
+ */
246
+ export async function withEoaBroadcastLock(from, fn) {
247
+ const key = from.toLowerCase();
248
+ // Chain onto any in-flight broadcast for this EOA. We await the prior
249
+ // promise's settlement (success OR failure) before proceeding, so a failed
250
+ // predecessor never deadlocks its successors.
251
+ const prior = eoaBroadcastLocks.get(key) ?? Promise.resolve();
252
+ let release;
253
+ const gate = new Promise((resolve) => { release = resolve; });
254
+ // The stored promise resolves when THIS holder releases — successors await it.
255
+ eoaBroadcastLocks.set(key, gate);
256
+ await prior.catch(() => { });
257
+ try {
258
+ return await fn();
259
+ }
260
+ finally {
261
+ release();
262
+ // Clean up the map entry if we are the tail of the queue, so the Map does
263
+ // not grow unbounded across many EOAs over a long-lived daemon.
264
+ if (eoaBroadcastLocks.get(key) === gate) {
265
+ eoaBroadcastLocks.delete(key);
266
+ }
267
+ }
268
+ }
200
269
  export function createMemoryTxSubmissionLedger() {
201
270
  const entries = new Map();
202
271
  const keyFor = (key) => `${key.chainId}:${key.from.toLowerCase()}:${key.nonce}`;
@@ -412,6 +481,12 @@ function withoutFeeOverrides(tx) {
412
481
  return baseRequest;
413
482
  }
414
483
  export async function withNonceLedger(args, fn) {
484
+ // Serialize the whole nonce-read → send → record section per EOA so two
485
+ // concurrent broadcasters from the same `from` address cannot read the same
486
+ // `pending` nonce and collide ("nonce too low"). See `withEoaBroadcastLock`.
487
+ return withEoaBroadcastLock(args.from, () => withNonceLedgerInner(args, fn));
488
+ }
489
+ async function withNonceLedgerInner(args, fn) {
415
490
  const ledger = args.ledger ?? defaultTxSubmissionLedger;
416
491
  const chainId = args.chainId ?? await resolveTxChainId(args.publicClient);
417
492
  if (args.recoverStuckNonce) {
@@ -458,6 +533,11 @@ export async function withNonceLedger(args, fn) {
458
533
  async markResolved(resolvedAtMs = Date.now()) {
459
534
  await ledger.markTxSubmissionResolved({ chainId, from: args.from, nonce, resolvedAtMs });
460
535
  },
536
+ async refreshNonce() {
537
+ const fresh = await resolvePendingNonce(args.publicClient, args.from);
538
+ context.nonce = fresh;
539
+ return fresh;
540
+ },
461
541
  };
462
542
  return fn(context);
463
543
  }
@@ -518,7 +598,7 @@ export async function viemSendTransactionWithRetry(walletClient, publicClient, t
518
598
  const shouldTrackNonce = from !== undefined && supportsNonceTracking(publicClient);
519
599
  const requestedNonce = txRequest.nonce === undefined ? undefined : Number(txRequest.nonce);
520
600
  const sendWithRetry = async (nonceLedger) => {
521
- const pinnedNonce = nonceLedger?.nonce ?? requestedNonce;
601
+ let pinnedNonce = nonceLedger?.nonce ?? requestedNonce;
522
602
  let lastError;
523
603
  for (let attempt = 0; attempt < maxAttempts; attempt++) {
524
604
  try {
@@ -555,11 +635,19 @@ export async function viemSendTransactionWithRetry(walletClient, publicClient, t
555
635
  if (!isRecoverableTransactionError(err) || attempt >= maxAttempts - 1) {
556
636
  throw err;
557
637
  }
558
- options.onRetry?.({
559
- attempt: attempt + 1,
560
- error: err,
561
- message: flattenErrorMessage(err),
562
- });
638
+ const message = flattenErrorMessage(err);
639
+ options.onRetry?.({ attempt: attempt + 1, error: err, message });
640
+ // Issue #562: on `nonce too low` the locally-pinned value is stale —
641
+ // re-derive from the RPC's pending nonce so the next attempt does
642
+ // not resubmit with the same stale value.
643
+ if (isNonceTooLowError(err)) {
644
+ if (nonceLedger) {
645
+ pinnedNonce = await nonceLedger.refreshNonce();
646
+ }
647
+ else if (from && supportsNonceTracking(publicClient)) {
648
+ pinnedNonce = await resolvePendingNonce(publicClient, from);
649
+ }
650
+ }
563
651
  await backoffDelay(attempt, baseDelayMs, maxDelayMs);
564
652
  }
565
653
  }
@@ -1 +1 @@
1
- {"version":3,"file":"tx-retry.js","sourceRoot":"","sources":["../src/tx-retry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tx-retry.js","sourceRoot":"","sources":["../src/tx-retry.ts"],"names":[],"mappings":"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"}
@@ -392,6 +392,7 @@ export declare const PortfolioV0VerdictPayloadSchema: z.ZodEffects<z.ZodObject<{
392
392
  fillsHash: string;
393
393
  fillsCount: number;
394
394
  };
395
+ score: string;
395
396
  solutionEnvelope: {
396
397
  cid: string;
397
398
  sha256: string;
@@ -412,7 +413,6 @@ export declare const PortfolioV0VerdictPayloadSchema: z.ZodEffects<z.ZodObject<{
412
413
  }[];
413
414
  overall: "valid" | "invalid";
414
415
  };
415
- score: string;
416
416
  scoreBasis: string;
417
417
  scoreVersion: string;
418
418
  rederived: {
@@ -442,6 +442,7 @@ export declare const PortfolioV0VerdictPayloadSchema: z.ZodEffects<z.ZodObject<{
442
442
  fillsHash: string;
443
443
  fillsCount: number;
444
444
  };
445
+ score: string;
445
446
  solutionEnvelope: {
446
447
  cid: string;
447
448
  sha256: string;
@@ -462,7 +463,6 @@ export declare const PortfolioV0VerdictPayloadSchema: z.ZodEffects<z.ZodObject<{
462
463
  }[];
463
464
  overall: "valid" | "invalid";
464
465
  };
465
- score: string;
466
466
  scoreBasis: string;
467
467
  scoreVersion: string;
468
468
  rederived: {
@@ -492,6 +492,7 @@ export declare const PortfolioV0VerdictPayloadSchema: z.ZodEffects<z.ZodObject<{
492
492
  fillsHash: string;
493
493
  fillsCount: number;
494
494
  };
495
+ score: string;
495
496
  solutionEnvelope: {
496
497
  cid: string;
497
498
  sha256: string;
@@ -512,7 +513,6 @@ export declare const PortfolioV0VerdictPayloadSchema: z.ZodEffects<z.ZodObject<{
512
513
  }[];
513
514
  overall: "valid" | "invalid";
514
515
  };
515
- score: string;
516
516
  scoreBasis: string;
517
517
  scoreVersion: string;
518
518
  rederived: {
@@ -151,6 +151,7 @@ export declare const PredictionApyV0VerdictPayloadSchema: z.ZodEffects<z.ZodObje
151
151
  predictedBps: string;
152
152
  submissionManifestCid?: string | undefined;
153
153
  };
154
+ score: string;
154
155
  solutionEnvelope: {
155
156
  cid: string;
156
157
  sha256: string;
@@ -171,7 +172,6 @@ export declare const PredictionApyV0VerdictPayloadSchema: z.ZodEffects<z.ZodObje
171
172
  }[];
172
173
  overall: "valid" | "invalid";
173
174
  };
174
- score: string;
175
175
  scoreBasis: "absolute-error-linear.v1";
176
176
  scoreVersion: string;
177
177
  oracleReading: {
@@ -193,6 +193,7 @@ export declare const PredictionApyV0VerdictPayloadSchema: z.ZodEffects<z.ZodObje
193
193
  predictedBps: string;
194
194
  submissionManifestCid?: string | undefined;
195
195
  };
196
+ score: string;
196
197
  solutionEnvelope: {
197
198
  cid: string;
198
199
  sha256: string;
@@ -213,7 +214,6 @@ export declare const PredictionApyV0VerdictPayloadSchema: z.ZodEffects<z.ZodObje
213
214
  }[];
214
215
  overall: "valid" | "invalid";
215
216
  };
216
- score: string;
217
217
  scoreBasis: "absolute-error-linear.v1";
218
218
  scoreVersion: string;
219
219
  oracleReading: {
@@ -235,6 +235,7 @@ export declare const PredictionApyV0VerdictPayloadSchema: z.ZodEffects<z.ZodObje
235
235
  predictedBps: string;
236
236
  submissionManifestCid?: string | undefined;
237
237
  };
238
+ score: string;
238
239
  solutionEnvelope: {
239
240
  cid: string;
240
241
  sha256: string;
@@ -255,7 +256,6 @@ export declare const PredictionApyV0VerdictPayloadSchema: z.ZodEffects<z.ZodObje
255
256
  }[];
256
257
  overall: "valid" | "invalid";
257
258
  };
258
- score: string;
259
259
  scoreBasis: "absolute-error-linear.v1";
260
260
  scoreVersion: string;
261
261
  oracleReading: {
@@ -24,14 +24,14 @@ export declare const PredictionV0RestorationPayloadSchema: z.ZodObject<{
24
24
  updatedAt: z.ZodNumber;
25
25
  }, "strip", z.ZodTypeAny, {
26
26
  feed: string;
27
+ updatedAt: number;
27
28
  roundId: string;
28
29
  answer: string;
29
- updatedAt: number;
30
30
  }, {
31
31
  feed: string;
32
+ updatedAt: number;
32
33
  roundId: string;
33
34
  answer: string;
34
- updatedAt: number;
35
35
  }>>;
36
36
  rationale: z.ZodOptional<z.ZodArray<z.ZodObject<{
37
37
  ts: z.ZodNumber;
@@ -55,9 +55,9 @@ export declare const PredictionV0RestorationPayloadSchema: z.ZodObject<{
55
55
  }[] | undefined;
56
56
  oracleSnapshot?: {
57
57
  feed: string;
58
+ updatedAt: number;
58
59
  roundId: string;
59
60
  answer: string;
60
- updatedAt: number;
61
61
  } | undefined;
62
62
  }, {
63
63
  prediction: {
@@ -71,9 +71,9 @@ export declare const PredictionV0RestorationPayloadSchema: z.ZodObject<{
71
71
  }[] | undefined;
72
72
  oracleSnapshot?: {
73
73
  feed: string;
74
+ updatedAt: number;
74
75
  roundId: string;
75
76
  answer: string;
76
- updatedAt: number;
77
77
  } | undefined;
78
78
  }>;
79
79
  export type PredictionV0RestorationPayload = z.infer<typeof PredictionV0RestorationPayloadSchema>;
@@ -139,15 +139,15 @@ export declare const PredictionV0VerdictPayloadSchema: z.ZodEffects<z.ZodObject<
139
139
  nextRoundUpdatedAt: z.ZodOptional<z.ZodNumber>;
140
140
  }, "strip", z.ZodTypeAny, {
141
141
  feed: string;
142
+ updatedAt: number;
142
143
  roundId: string;
143
144
  answer: string;
144
- updatedAt: number;
145
145
  nextRoundUpdatedAt?: number | undefined;
146
146
  }, {
147
147
  feed: string;
148
+ updatedAt: number;
148
149
  roundId: string;
149
150
  answer: string;
150
- updatedAt: number;
151
151
  nextRoundUpdatedAt?: number | undefined;
152
152
  }>;
153
153
  claimed: z.ZodObject<{
@@ -188,6 +188,7 @@ export declare const PredictionV0VerdictPayloadSchema: z.ZodEffects<z.ZodObject<
188
188
  modelId: string;
189
189
  submissionManifestCid?: string | undefined;
190
190
  };
191
+ score: string;
191
192
  solutionEnvelope: {
192
193
  cid: string;
193
194
  sha256: string;
@@ -208,14 +209,13 @@ export declare const PredictionV0VerdictPayloadSchema: z.ZodEffects<z.ZodObject<
208
209
  }[];
209
210
  overall: "valid" | "invalid";
210
211
  };
211
- score: string;
212
212
  scoreBasis: "brier.v1";
213
213
  scoreVersion: string;
214
214
  oracleReading: {
215
215
  feed: string;
216
+ updatedAt: number;
216
217
  roundId: string;
217
218
  answer: string;
218
- updatedAt: number;
219
219
  nextRoundUpdatedAt?: number | undefined;
220
220
  };
221
221
  groundTruth: "YES" | "NO";
@@ -227,6 +227,7 @@ export declare const PredictionV0VerdictPayloadSchema: z.ZodEffects<z.ZodObject<
227
227
  modelId: string;
228
228
  submissionManifestCid?: string | undefined;
229
229
  };
230
+ score: string;
230
231
  solutionEnvelope: {
231
232
  cid: string;
232
233
  sha256: string;
@@ -247,14 +248,13 @@ export declare const PredictionV0VerdictPayloadSchema: z.ZodEffects<z.ZodObject<
247
248
  }[];
248
249
  overall: "valid" | "invalid";
249
250
  };
250
- score: string;
251
251
  scoreBasis: "brier.v1";
252
252
  scoreVersion: string;
253
253
  oracleReading: {
254
254
  feed: string;
255
+ updatedAt: number;
255
256
  roundId: string;
256
257
  answer: string;
257
- updatedAt: number;
258
258
  nextRoundUpdatedAt?: number | undefined;
259
259
  };
260
260
  groundTruth: "YES" | "NO";
@@ -266,6 +266,7 @@ export declare const PredictionV0VerdictPayloadSchema: z.ZodEffects<z.ZodObject<
266
266
  modelId: string;
267
267
  submissionManifestCid?: string | undefined;
268
268
  };
269
+ score: string;
269
270
  solutionEnvelope: {
270
271
  cid: string;
271
272
  sha256: string;
@@ -286,14 +287,13 @@ export declare const PredictionV0VerdictPayloadSchema: z.ZodEffects<z.ZodObject<
286
287
  }[];
287
288
  overall: "valid" | "invalid";
288
289
  };
289
- score: string;
290
290
  scoreBasis: "brier.v1";
291
291
  scoreVersion: string;
292
292
  oracleReading: {
293
293
  feed: string;
294
+ updatedAt: number;
294
295
  roundId: string;
295
296
  answer: string;
296
- updatedAt: number;
297
297
  nextRoundUpdatedAt?: number | undefined;
298
298
  };
299
299
  groundTruth: "YES" | "NO";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jinn-network/client",
3
- "version": "0.1.7",
3
+ "version": "0.1.8",
4
4
  "description": "Jinn protocol client — headless daemon for the restoration training loop",
5
5
  "type": "module",
6
6
  "packageManager": "yarn@4.13.0",
@@ -42,10 +42,11 @@
42
42
  "postinstall": "node dist/scripts/fix-node-pty.mjs 2>/dev/null || node scripts/fix-node-pty.mjs 2>/dev/null || true",
43
43
  "e2e:cold-start-builder": "vitest run --config vitest.acceptance.config.ts",
44
44
  "e2e:full-cycle": "tsx test/e2e/learner-full-cycle.ts",
45
+ "e2e:full-cycle-swe-rebench-v2": "tsx test/e2e/learner-full-cycle-swe-rebench-v2.ts",
45
46
  "jinn": "tsx src/bin/jinn.ts",
46
47
  "dev": "yarn build && node dist/bin/jinn.js",
47
48
  "build:sdk": "yarn --cwd ../packages/sdk install --immutable && yarn --cwd ../packages/sdk build",
48
- "build": "yarn build:sdk && yarn build:spa && tsc && chmod +x dist/bin/jinn.js && rm -rf dist/dashboard && mkdir -p dist/dashboard && cp -R src/dashboard/spa/dist/. dist/dashboard/ && rm -rf dist/templates && cp -R templates dist/templates && rm -rf dist/plugins/learner && mkdir -p dist/plugins && cp -R plugins/learner dist/plugins/learner && mkdir -p dist/scripts && cp scripts/fix-node-pty.mjs scripts/swe-rebench-v2-seed-pool.json scripts/swe-rebench-v2-known-bad.json dist/scripts/ && node scripts/vendor-sdk.mjs && node scripts/write-dist-build-meta.mjs",
49
+ "build": "yarn build:sdk && yarn build:spa && tsc && chmod +x dist/bin/jinn.js && rm -rf dist/dashboard && mkdir -p dist/dashboard && cp -R src/dashboard/spa/dist/. dist/dashboard/ && rm -rf dist/templates && cp -R templates dist/templates && rm -rf dist/plugins/learner && mkdir -p dist/plugins && cp -R plugins/learner dist/plugins/learner && mkdir -p dist/scripts && cp scripts/fix-node-pty.mjs scripts/swe-rebench-v2-seed-pool.json scripts/swe-rebench-v2-known-bad.json scripts/swe-rebench-v2-pytest-missing.json dist/scripts/ && node scripts/vendor-sdk.mjs && node scripts/write-dist-build-meta.mjs",
49
50
  "typecheck": "yarn build:sdk && tsc --noEmit",
50
51
  "test": "yarn build:sdk && vitest run",
51
52
  "lint:no-late-mount": "node scripts/check-no-late-route-mount.mjs",
@@ -93,6 +94,7 @@
93
94
  "stolas": "tsx test/e2e/stolas.ts",
94
95
  "substrate:adopt": "tsx scripts/release/substrate-adopt.ts",
95
96
  "substrate:copy": "tsx scripts/release/substrate-copy.ts",
97
+ "substrate:provision": "tsx scripts/release/substrate-provision.ts",
96
98
  "substrate:reap": "tsx scripts/release/substrate-reap.ts",
97
99
  "substrate:topup": "tsx scripts/release/substrate-topup.ts",
98
100
  "substrate:verify": "tsx scripts/release/substrate-verify.ts",
@@ -105,6 +107,11 @@
105
107
  "e2e:dashboard": "yarn build && playwright test --config=playwright.config.ts",
106
108
  "e2e:donation": "vitest run test/smoke/donation-mode-smoke.test.ts test/smoke/donation-ipfs-http-smoke.test.ts"
107
109
  },
110
+ "resolutions": {
111
+ "axios": "^1.15.2",
112
+ "fast-uri": "^3.1.2",
113
+ "protobufjs": "^8.0.3"
114
+ },
108
115
  "dependencies": {
109
116
  "@ethereumjs/wallet": "^10.0.0",
110
117
  "@grpc/grpc-js": "^1.14.3",
@@ -115,7 +122,7 @@
115
122
  "@noble/hashes": "^2.2.0",
116
123
  "@opentelemetry/api": "^1.9.1",
117
124
  "@opentelemetry/core": "^2.7.1",
118
- "@opentelemetry/exporter-trace-otlp-grpc": "^0.217.0",
125
+ "@opentelemetry/exporter-trace-otlp-grpc": "^0.218.0",
119
126
  "@opentelemetry/exporter-trace-otlp-http": "^0.217.0",
120
127
  "@opentelemetry/resources": "^2.7.1",
121
128
  "@opentelemetry/sdk-node": "^0.217.0",
@@ -140,6 +147,7 @@
140
147
  "node-pty": "^1.1.0",
141
148
  "protobufjs": "^8.0.3",
142
149
  "semver": "^7.7.4",
150
+ "tokenlens": "^1.3.1",
143
151
  "viem": "^2.0.0",
144
152
  "ws": "^8.20.0",
145
153
  "yaml": "^2.8.4",
@@ -16,7 +16,24 @@ All paths listed in the memory-consolidation skill's spawn-input block. Read the
16
16
  Anything that writes to `implStateDir` happens here, including:
17
17
 
18
18
  - **Unused skills / hooks / tools** — anything not invoked in the last N runs (default 20; check policy override). Move to `implStateDir/.archive/<ts>/` or delete per policy.
19
- - **Regressed promotions** — if the trend in `analysisPath` indicates a recent change made things worse, `git revert <commit-sha>` it. Be specific: revert the exact commit identified, not a bulk rollback. The target sha is `improvePromotionsDir/<n>.json`'s `implStateDirShaAfter`.
19
+ - **Regressed promotions** — revert an Improve commit only when it actually made things worse. There are two triggers; act on either:
20
+ 1. **Qualitative trigger** — if the trend in `analysisPath` (the Debrief signal) indicates a recent change made things worse, `git revert <commit-sha>` it. Be specific: revert the exact commit identified, not a bulk rollback. The target sha is `improvePromotionsDir/<n>.json`'s `implStateDirShaAfter`.
21
+ 2. **Quantitative trigger (#764)** — for each candidate Improve commit on recent `implStateDir` git history (the commits since `implStateDirShaBefore`, identified from each `improvePromotionsDir/<n>.json` `implStateDirShaAfter`), ask the network-truth indexer whether the commit's per-codeDigest pass rate is significantly worse than its parent's. **Do not hand-roll the codeDigest hash or the statistics — shell out to the CLI**, which exports each commit's tree (`git archive`, no `.git`) and hashes it the way production stamps codeDigest, then runs the documented test:
22
+
23
+ ```bash
24
+ IMPL_STATE_DIR="<implStateDir from spawn input>"
25
+ # $sha = a candidate Improve commit; $parent = its git parent ($sha^).
26
+ decision=$(jinn codedigest-revert-check \
27
+ --impl-state-dir "$IMPL_STATE_DIR" \
28
+ --commit "$sha" \
29
+ --parent "$(cd "$IMPL_STATE_DIR" && git rev-parse "$sha^")" \
30
+ --json)
31
+ # decision = { withCommit:{codeDigest,n,passRate}, atParent:{...}, delta, pValue, significant, recommendRevert, reason }
32
+ ```
33
+
34
+ Act ONLY on `recommendRevert === true` (then `git revert "$sha"`). Do NOT re-derive the thresholds here. On `reason: "discovery_unavailable"` or `"insufficient_samples"`, **do not revert** — the indexer is degraded, or the commit has not accumulated enough frozen-eval attempts yet (expected plateau, not a regression). Carry the decision's `reason` into the output record's `promotionsReverted[].reason`.
35
+
36
+ **Documented thresholds (canonical in `client/src/learner/revert-decision.ts` — do not redefine):** `min-samples = 30` per arm, `alpha = 0.05` (95% confidence), `window = 200` recent attempts. The test is a two-proportion z-test on pass/total (codeDigest-with-commit vs codeDigest-at-parent); a revert fires only when `delta < 0 AND p < alpha AND both arms ≥ min-samples`. These defaults are overridable via `implStateDir/policy.json` `policy.revert.*` (and per-invocation via `--min-samples/--alpha/--window`).
20
37
  - **Noisy notes / records** — if `implStateDir/notes/` has accumulated more than `policy.maxNotesBytes` (default 1 MB), keep the last 50 by mtime, archive the rest.
21
38
  - **Conflicts between recent promotions** — Improve may have promoted two skills with conflicting prompts. Detect and resolve (favor newer; flag conflict in the output record).
22
39
  - **Migrate operator-private content from this run.** Operator-private session transcripts and operator-requests should be persisted into `implStateDir` so the operator has a durable history across runs: