@jinn-network/client 0.1.9-canary.5c19fc6d → 0.1.9-canary.5ff3d8cb
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/CONTRIBUTING.md +2 -2
- package/dist/adapters/mech/adapter.d.ts +10 -0
- package/dist/adapters/mech/adapter.js +19 -1
- package/dist/adapters/mech/adapter.js.map +1 -1
- package/dist/adapters/mech/types.d.ts +1 -88
- package/dist/adapters/mech/types.js +1 -45
- package/dist/adapters/mech/types.js.map +1 -1
- package/dist/api/bootstrap-endpoint.d.ts +18 -3
- package/dist/api/bootstrap-endpoint.js +3 -0
- package/dist/api/bootstrap-endpoint.js.map +1 -1
- package/dist/api/gather-status.js +6 -5
- package/dist/api/gather-status.js.map +1 -1
- package/dist/api/launcher-endpoints.js +6 -1
- package/dist/api/launcher-endpoints.js.map +1 -1
- package/dist/api/launcher-status.d.ts +2 -0
- package/dist/api/launcher-status.js.map +1 -1
- package/dist/api/launcher-tasks.d.ts +47 -0
- package/dist/api/launcher-tasks.js +88 -3
- package/dist/api/launcher-tasks.js.map +1 -1
- package/dist/api/loop-completion-build.d.ts +2 -2
- package/dist/api/loop-completion-build.js +2 -3
- package/dist/api/loop-completion-build.js.map +1 -1
- package/dist/api/portfolio-v0-build.d.ts +2 -1
- package/dist/api/portfolio-v0-build.js +5 -7
- package/dist/api/portfolio-v0-build.js.map +1 -1
- package/dist/api/prediction-v1-build.d.ts +2 -2
- package/dist/api/prediction-v1-build.js +5 -7
- package/dist/api/prediction-v1-build.js.map +1 -1
- package/dist/api/setup-endpoints.d.ts +4 -0
- package/dist/api/setup-endpoints.js +13 -7
- package/dist/api/setup-endpoints.js.map +1 -1
- package/dist/api/status-build.js +1 -4
- package/dist/api/status-build.js.map +1 -1
- package/dist/api/task-run-routing.d.ts +1 -1
- package/dist/api/task-runs-build.d.ts +2 -2
- package/dist/api/task-runs-build.js +5 -7
- package/dist/api/task-runs-build.js.map +1 -1
- package/dist/bin/jinn-distill-mcp.js +813 -0
- package/dist/bin/jinn-layer.js +4992 -1151
- package/dist/build-info.json +4 -4
- package/dist/build-meta.json +1 -1
- package/dist/captures/distil-export.d.ts +54 -0
- package/dist/captures/distil-export.js +135 -0
- package/dist/captures/distil-export.js.map +1 -0
- package/dist/captures/ingest.d.ts +21 -0
- package/dist/captures/ingest.js +144 -0
- package/dist/captures/ingest.js.map +1 -0
- package/dist/captures/live-publisher.js +4 -3
- package/dist/captures/live-publisher.js.map +1 -1
- package/dist/captures/publish.d.ts +4 -0
- package/dist/captures/publish.js +2 -2
- package/dist/captures/publish.js.map +1 -1
- package/dist/cli/execution-context.js +2 -1
- package/dist/cli/execution-context.js.map +1 -1
- package/dist/config.js +34 -1
- package/dist/config.js.map +1 -1
- package/dist/contracts/abis.d.ts +100 -0
- package/dist/contracts/abis.js +58 -0
- package/dist/contracts/abis.js.map +1 -0
- package/dist/contracts/addresses.d.ts +36 -0
- package/dist/contracts/addresses.js +60 -0
- package/dist/contracts/addresses.js.map +1 -0
- package/dist/corpus/onchain-query.d.ts +0 -1
- package/dist/corpus/onchain-query.js +2 -5
- package/dist/corpus/onchain-query.js.map +1 -1
- package/dist/daemon/balance-topup-loop.js +27 -12
- package/dist/daemon/balance-topup-loop.js.map +1 -1
- package/dist/daemon/creator.js +15 -13
- package/dist/daemon/creator.js.map +1 -1
- package/dist/daemon/daemon.js +35 -13
- package/dist/daemon/daemon.js.map +1 -1
- package/dist/daemon/loop-heartbeat.d.ts +62 -7
- package/dist/daemon/loop-heartbeat.js +50 -13
- package/dist/daemon/loop-heartbeat.js.map +1 -1
- package/dist/{api/peers.js → daemon/peer-sync.js} +2 -2
- package/dist/daemon/peer-sync.js.map +1 -0
- package/dist/daemon/reward-claim-loop.js +27 -12
- package/dist/daemon/reward-claim-loop.js.map +1 -1
- package/dist/daemon/spend-cap-gate.d.ts +0 -6
- package/dist/daemon/spend-cap-gate.js +1 -8
- package/dist/daemon/spend-cap-gate.js.map +1 -1
- package/dist/dashboard/assets/index-BdGCkGPF.js +157 -0
- package/dist/dashboard/assets/index-D7rvJRNa.css +1 -0
- package/dist/dashboard/index.html +2 -2
- package/dist/discovery/http.js +83 -1
- package/dist/discovery/http.js.map +1 -1
- package/dist/discovery/onchain.js +16 -8
- package/dist/discovery/onchain.js.map +1 -1
- package/dist/discovery/types.d.ts +43 -0
- package/dist/discovery/types.js.map +1 -1
- package/dist/discovery/with-fallback.js +10 -0
- package/dist/discovery/with-fallback.js.map +1 -1
- package/dist/earning/bootstrap-run.d.ts +25 -0
- package/dist/earning/bootstrap-run.js +315 -0
- package/dist/earning/bootstrap-run.js.map +1 -0
- package/dist/earning/bootstrap.d.ts +6 -11
- package/dist/earning/bootstrap.js +45 -195
- package/dist/earning/bootstrap.js.map +1 -1
- package/dist/earning/contracts.d.ts +2 -3
- package/dist/earning/contracts.js +12 -21
- package/dist/earning/contracts.js.map +1 -1
- package/dist/earning/master-gas.d.ts +10 -0
- package/dist/earning/master-gas.js +11 -0
- package/dist/earning/master-gas.js.map +1 -0
- package/dist/earning/safe-adapter.js +1 -45
- package/dist/earning/safe-adapter.js.map +1 -1
- package/dist/earning/steps/context.d.ts +42 -0
- package/dist/earning/steps/context.js +4 -0
- package/dist/earning/steps/context.js.map +1 -0
- package/dist/earning/steps/fleet-identity-register.d.ts +4 -0
- package/dist/earning/steps/fleet-identity-register.js +65 -0
- package/dist/earning/steps/fleet-identity-register.js.map +1 -0
- package/dist/earning/steps/fleet-safe-deploy.d.ts +4 -0
- package/dist/earning/steps/fleet-safe-deploy.js +62 -0
- package/dist/earning/steps/fleet-safe-deploy.js.map +1 -0
- package/dist/earning/steps/fleet-safe-predict.d.ts +4 -0
- package/dist/earning/steps/fleet-safe-predict.js +18 -0
- package/dist/earning/steps/fleet-safe-predict.js.map +1 -0
- package/dist/earning/steps/receipt-parsing.d.ts +12 -0
- package/dist/earning/steps/receipt-parsing.js +71 -0
- package/dist/earning/steps/receipt-parsing.js.map +1 -0
- package/dist/earning/stolas-staking.js +20 -14
- package/dist/earning/stolas-staking.js.map +1 -1
- package/dist/erc8004/addresses.d.ts +6 -5
- package/dist/erc8004/addresses.js +7 -5
- package/dist/erc8004/addresses.js.map +1 -1
- package/dist/erc8004/identity.d.ts +12 -1
- package/dist/erc8004/identity.js +31 -0
- package/dist/erc8004/identity.js.map +1 -1
- package/dist/erc8004/index.d.ts +1 -1
- package/dist/erc8004/index.js +1 -1
- package/dist/erc8004/index.js.map +1 -1
- package/dist/erc8004/reputation.js +16 -12
- package/dist/erc8004/reputation.js.map +1 -1
- package/dist/erc8004/validation.js +5 -4
- package/dist/erc8004/validation.js.map +1 -1
- package/dist/eval/capability-slate.d.ts +54 -0
- package/dist/eval/capability-slate.js +116 -0
- package/dist/eval/capability-slate.js.map +1 -0
- package/dist/eval/capability-stats.d.ts +39 -0
- package/dist/eval/capability-stats.js +123 -0
- package/dist/eval/capability-stats.js.map +1 -0
- package/dist/eval/contested-band.d.ts +18 -0
- package/dist/eval/contested-band.js +19 -0
- package/dist/eval/contested-band.js.map +1 -0
- package/dist/eval/corpus-index.d.ts +21 -0
- package/dist/eval/corpus-index.js +55 -0
- package/dist/eval/corpus-index.js.map +1 -0
- package/dist/eval/disjointness.d.ts +26 -0
- package/dist/eval/disjointness.js +67 -0
- package/dist/eval/disjointness.js.map +1 -0
- package/dist/eval/mcnemar-power.d.ts +14 -0
- package/dist/eval/mcnemar-power.js +40 -0
- package/dist/eval/mcnemar-power.js.map +1 -0
- package/dist/harnesses/engine/engine.d.ts +2 -1
- package/dist/harnesses/engine/engine.js +15 -2
- package/dist/harnesses/engine/engine.js.map +1 -1
- package/dist/harnesses/engine/persistence.d.ts +2 -61
- package/dist/harnesses/engine/persistence.js.map +1 -1
- package/dist/harnesses/impls/_evaluator-base.d.ts +48 -0
- package/dist/harnesses/impls/_evaluator-base.js +35 -0
- package/dist/harnesses/impls/_evaluator-base.js.map +1 -0
- package/dist/harnesses/impls/claude-mcp-prediction/index.d.ts +2 -3
- package/dist/harnesses/impls/claude-mcp-prediction/index.js +29 -99
- package/dist/harnesses/impls/claude-mcp-prediction/index.js.map +1 -1
- package/dist/harnesses/impls/claude-mcp-prediction/mcp-tools.js +4 -21
- package/dist/harnesses/impls/claude-mcp-prediction/mcp-tools.js.map +1 -1
- package/dist/harnesses/impls/claude-mcp-prediction/session-orchestrator.d.ts +2 -0
- package/dist/harnesses/impls/claude-mcp-prediction/session-orchestrator.js +1 -1
- package/dist/harnesses/impls/claude-mcp-prediction/session-orchestrator.js.map +1 -1
- package/dist/harnesses/impls/claude-mcp-prediction-apy/index.js +30 -79
- package/dist/harnesses/impls/claude-mcp-prediction-apy/index.js.map +1 -1
- package/dist/harnesses/impls/claude-mcp-prediction-apy/mcp-tools.js +4 -19
- package/dist/harnesses/impls/claude-mcp-prediction-apy/mcp-tools.js.map +1 -1
- package/dist/harnesses/impls/claude-mcp-prediction-apy/session-orchestrator.d.ts +2 -0
- package/dist/harnesses/impls/claude-mcp-prediction-apy/session-orchestrator.js +1 -1
- package/dist/harnesses/impls/claude-mcp-prediction-apy/session-orchestrator.js.map +1 -1
- package/dist/harnesses/impls/claude-mcp-shared/mcp-server-script.d.ts +39 -0
- package/dist/harnesses/impls/claude-mcp-shared/mcp-server-script.js +62 -0
- package/dist/harnesses/impls/claude-mcp-shared/mcp-server-script.js.map +1 -0
- package/dist/harnesses/impls/claude-mcp-shared/mcp-server.d.ts +40 -0
- package/dist/harnesses/impls/claude-mcp-shared/mcp-server.js +44 -0
- package/dist/harnesses/impls/claude-mcp-shared/mcp-server.js.map +1 -0
- package/dist/harnesses/impls/claude-mcp-shared/single-session-harness.d.ts +56 -0
- package/dist/harnesses/impls/claude-mcp-shared/single-session-harness.js +79 -0
- package/dist/harnesses/impls/claude-mcp-shared/single-session-harness.js.map +1 -0
- package/dist/harnesses/impls/learner/adapters/codex-code.d.ts +3 -1
- package/dist/harnesses/impls/learner/adapters/codex-code.js +39 -4
- package/dist/harnesses/impls/learner/adapters/codex-code.js.map +1 -1
- package/dist/harnesses/impls/portfolio-v0-evaluator/index.d.ts +5 -15
- package/dist/harnesses/impls/portfolio-v0-evaluator/index.js +10 -29
- package/dist/harnesses/impls/portfolio-v0-evaluator/index.js.map +1 -1
- package/dist/harnesses/impls/prediction-apy-v0-evaluator/index.d.ts +5 -15
- package/dist/harnesses/impls/prediction-apy-v0-evaluator/index.js +10 -23
- package/dist/harnesses/impls/prediction-apy-v0-evaluator/index.js.map +1 -1
- package/dist/harnesses/impls/prediction-v0-evaluator/index.d.ts +5 -15
- package/dist/harnesses/impls/prediction-v0-evaluator/index.js +10 -25
- package/dist/harnesses/impls/prediction-v0-evaluator/index.js.map +1 -1
- package/dist/harnesses/impls/swe-rebench-v2-evaluator/eval-runner.js +8 -0
- package/dist/harnesses/impls/swe-rebench-v2-evaluator/eval-runner.js.map +1 -1
- package/dist/learner/verification-gate.d.ts +53 -0
- package/dist/learner/verification-gate.js +80 -0
- package/dist/learner/verification-gate.js.map +1 -0
- package/dist/main.js +74 -457
- package/dist/main.js.map +1 -1
- package/dist/monitoring/net-liveness.d.ts +143 -0
- package/dist/monitoring/net-liveness.js +301 -0
- package/dist/monitoring/net-liveness.js.map +1 -0
- package/dist/observability/progress.d.ts +11 -0
- package/dist/observability/progress.js +16 -0
- package/dist/observability/progress.js.map +1 -0
- package/dist/pilot/cost.d.ts +19 -0
- package/dist/pilot/cost.js +31 -0
- package/dist/pilot/cost.js.map +1 -0
- package/dist/pilot/instance.d.ts +20 -0
- package/dist/pilot/instance.js +19 -0
- package/dist/pilot/instance.js.map +1 -0
- package/dist/pilot/repo.d.ts +31 -0
- package/dist/pilot/repo.js +42 -0
- package/dist/pilot/repo.js.map +1 -0
- package/dist/pilot/solve.d.ts +22 -0
- package/dist/pilot/solve.js +37 -0
- package/dist/pilot/solve.js.map +1 -0
- package/dist/pilot/tally.d.ts +35 -0
- package/dist/pilot/tally.js +61 -0
- package/dist/pilot/tally.js.map +1 -0
- package/dist/plugins/local-trace-distiller/.claude-plugin/plugin.json +9 -0
- package/dist/plugins/local-trace-distiller/.codex-plugin/plugin.json +41 -0
- package/dist/plugins/local-trace-distiller/.mcp.json +8 -0
- package/dist/plugins/local-trace-distiller/README.md +27 -0
- package/dist/plugins/local-trace-distiller/jinn.plugin.json +36 -0
- package/dist/plugins/local-trace-distiller/skills/distill/SKILL.md +51 -0
- package/dist/preflight/rpc-network.d.ts +10 -3
- package/dist/preflight/rpc-network.js +46 -13
- package/dist/preflight/rpc-network.js.map +1 -1
- package/dist/preflight/stable-cwd.d.ts +29 -0
- package/dist/preflight/stable-cwd.js +98 -0
- package/dist/preflight/stable-cwd.js.map +1 -0
- package/dist/solvernets/launched-record-dispatcher.js +6 -0
- package/dist/solvernets/launched-record-dispatcher.js.map +1 -1
- package/dist/spend/credential.d.ts +2 -2
- package/dist/spend/credential.js +9 -3
- package/dist/spend/credential.js.map +1 -1
- package/dist/spend/spend-cap.d.ts +10 -0
- package/dist/spend/spend-cap.js +13 -0
- package/dist/spend/spend-cap.js.map +1 -0
- package/dist/store/store.d.ts +14 -0
- package/dist/store/store.js +10 -1
- package/dist/store/store.js.map +1 -1
- package/dist/trajectory/processors/identity-scrub.js +22 -3
- package/dist/trajectory/processors/identity-scrub.js.map +1 -1
- package/dist/trajectory/scrub/build.d.ts +19 -0
- package/dist/trajectory/scrub/build.js +25 -0
- package/dist/trajectory/scrub/build.js.map +1 -1
- package/dist/trajectory/scrub/layer2.d.ts +23 -0
- package/dist/trajectory/scrub/layer2.js +33 -0
- package/dist/trajectory/scrub/layer2.js.map +1 -0
- package/dist/trajectory/scrub/openredaction-stage.d.ts +127 -0
- package/dist/trajectory/scrub/openredaction-stage.js +186 -2
- package/dist/trajectory/scrub/openredaction-stage.js.map +1 -1
- package/dist/trajectory/scrub/pipeline.d.ts +21 -0
- package/dist/trajectory/scrub/pipeline.js +57 -0
- package/dist/trajectory/scrub/pipeline.js.map +1 -1
- package/dist/trajectory/scrub/plain-patterns-stage.d.ts +14 -1
- package/dist/trajectory/scrub/plain-patterns-stage.js +35 -5
- package/dist/trajectory/scrub/plain-patterns-stage.js.map +1 -1
- package/dist/trajectory/scrub/secretlint-stage.d.ts +22 -3
- package/dist/trajectory/scrub/secretlint-stage.js +118 -27
- package/dist/trajectory/scrub/secretlint-stage.js.map +1 -1
- package/dist/trajectory/transcript-watcher.d.ts +26 -0
- package/dist/trajectory/transcript-watcher.js +33 -0
- package/dist/trajectory/transcript-watcher.js.map +1 -1
- package/dist/types/skill-artifact.d.ts +442 -0
- package/dist/types/skill-artifact.js +137 -0
- package/dist/types/skill-artifact.js.map +1 -0
- package/dist/types/task-run-read-model.d.ts +21 -0
- package/dist/types/task-run-read-model.js +2 -0
- package/dist/types/task-run-read-model.js.map +1 -0
- package/dist/types/task-run.d.ts +75 -0
- package/dist/types/task-run.js +2 -0
- package/dist/types/task-run.js.map +1 -0
- package/dist/util/redact-rpc-urls.d.ts +1 -1
- package/dist/util/redact-rpc-urls.js +57 -2
- package/dist/util/redact-rpc-urls.js.map +1 -1
- package/package.json +11 -8
- package/plugins/local-trace-distiller/.claude-plugin/plugin.json +9 -0
- package/plugins/local-trace-distiller/.codex-plugin/plugin.json +41 -0
- package/plugins/local-trace-distiller/.mcp.json +8 -0
- package/plugins/local-trace-distiller/README.md +27 -0
- package/plugins/local-trace-distiller/jinn.plugin.json +36 -0
- package/plugins/local-trace-distiller/skills/distill/SKILL.md +51 -0
- package/dist/api/peers.js.map +0 -1
- package/dist/dashboard/assets/index-BsrAAmvC.js +0 -171
- package/dist/dashboard/assets/index-DQOWJ2SF.css +0 -1
- /package/dist/{api/peers.d.ts → daemon/peer-sync.d.ts} +0 -0
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { lintSource } from '@secretlint/core';
|
|
2
2
|
import { creator } from '@secretlint/secretlint-rule-preset-recommend';
|
|
3
3
|
import { classifyKey } from './key-policy.js';
|
|
4
|
-
const VERSION = '0.
|
|
4
|
+
const VERSION = '0.4.1'; // 0.4.1: public SWE-rebench instance ids skip the entropy fallback
|
|
5
5
|
const PRESET_RULE_ID = '@secretlint/secretlint-rule-preset-recommend';
|
|
6
6
|
// Entropy fallback thresholds. Conservative on purpose: a long token whose
|
|
7
7
|
// character distribution is near-random is almost certainly a key/token, not
|
|
@@ -38,6 +38,51 @@ const SECRET_CHARSET = /^[A-Za-z0-9+/=_-]+$/;
|
|
|
38
38
|
// every `[/.]`-split segment is under 16 chars (or below the entropy bar)
|
|
39
39
|
// qualifies as a path and escapes the fallback.
|
|
40
40
|
const PATH_SHAPED = /^[A-Za-z0-9._-]+(\/[A-Za-z0-9._-]+)+$/;
|
|
41
|
+
// SWE-rebench instance ids are public corpus identifiers (`owner__repo-PR`),
|
|
42
|
+
// not key material. Some short bridge summaries repeat them and otherwise cross
|
|
43
|
+
// the defacement gate after entropy redaction.
|
|
44
|
+
const SWE_REBENCH_INSTANCE_ID = /^[a-z0-9][a-z0-9._-]*__[a-z0-9][a-z0-9._-]*-\d+$/;
|
|
45
|
+
// Tuning note (#1391): the entropy fallback's threat model is ASCII key
|
|
46
|
+
// material — base64 / base64url / hex runs. Natural-language text outside the
|
|
47
|
+
// Latin script (CJK especially) has char-level Shannon entropy far above 4.0
|
|
48
|
+
// bits/char (most characters in a sentence are unique), so whole-token entropy
|
|
49
|
+
// classified ordinary Chinese skill prose as secrets and shredded it. A token
|
|
50
|
+
// whose non-ASCII share exceeds this threshold skips the entropy fallback
|
|
51
|
+
// entirely; the pass-1 secretlint preset rules still run on everything.
|
|
52
|
+
// Residual exposure: a generic (rule-less) secret glued WITHOUT whitespace
|
|
53
|
+
// into a majority-non-ASCII token escapes the fallback — prefixed keys
|
|
54
|
+
// (ghp_…, AKIA…, sk-…) are still caught by pass 1, and CJK prose separates
|
|
55
|
+
// embedded ASCII material with spacing or punctuation in practice.
|
|
56
|
+
const NON_ASCII_MAX_SHARE = 0.3;
|
|
57
|
+
// Tuning note (#1391): a STRUCTURED token — one containing characters outside
|
|
58
|
+
// SECRET_CHARSET, i.e. URLs (`://`, `?`, `&`, `#`), markdown links (`](`),
|
|
59
|
+
// shell interpolations (`${…}`), serialised code — cannot itself be a
|
|
60
|
+
// contiguous key: real key material never contains brackets, quotes or `?`.
|
|
61
|
+
// A key can only be EMBEDDED in such a token as a delimited segment, so the
|
|
62
|
+
// token is judged per-segment (mirroring the #1348 PATH_SHAPED carve-out)
|
|
63
|
+
// instead of by whole-token entropy, which URLs and markdown links inflate
|
|
64
|
+
// past 4.0 bits/char purely by punctuation/length variety (every seed
|
|
65
|
+
// envelope's attribution URL published as [SECRET:high-entropy]).
|
|
66
|
+
// Segments split on everything outside `[A-Za-z0-9+=_-]`: `/` and `.` split
|
|
67
|
+
// (slug and query-string segments stay short and human-readable — matching
|
|
68
|
+
// the PATH gate's `[/.]` split), while `-`, `_`, `+`, `=` stay inside a
|
|
69
|
+
// segment because base64url alphabets and key=value pairs use them
|
|
70
|
+
// (`?key=<blob>` gates as one segment; a JWT's `.`-separated base64url
|
|
71
|
+
// segments gate individually). Residual exposure, same shape as the #1348
|
|
72
|
+
// note: a secret whose every delimited segment falls under 16 chars (or the
|
|
73
|
+
// entropy bar, or a single character class) escapes — e.g. a base64 blob
|
|
74
|
+
// with `/` every few chars additionally wrapped in punctuation.
|
|
75
|
+
const STRUCTURED_SEGMENT_DELIMITER = /[^A-Za-z0-9+=_-]+/;
|
|
76
|
+
// Tuning note (#1391): a "wordish" segment — two or more purely-alphabetic
|
|
77
|
+
// runs joined by `_` or `-` (`Microsoft_Azure_Capacity`, `backend-refactor`)
|
|
78
|
+
// — is an identifier, not key material, even when its length and character
|
|
79
|
+
// variety clear the entropy bar (the Azure portal URL's
|
|
80
|
+
// `Microsoft_Azure_Capacity` sits at 4.002 bits/char). Key material of
|
|
81
|
+
// segment-gate length (≥ 16 chars) drawn from a base64/base64url alphabet
|
|
82
|
+
// contains a digit with ~94% probability and separator-split all-alphabetic
|
|
83
|
+
// runs almost never; the residual all-alpha, separator-structured key is
|
|
84
|
+
// accepted as out of the fallback's reach.
|
|
85
|
+
const WORDISH_SEGMENT = /^[A-Za-z]+([_-][A-Za-z]+)+$/;
|
|
41
86
|
function shannonEntropy(s) {
|
|
42
87
|
const freq = {};
|
|
43
88
|
for (const ch of s)
|
|
@@ -60,6 +105,9 @@ function charClassCount(s) {
|
|
|
60
105
|
n += 1;
|
|
61
106
|
return n;
|
|
62
107
|
}
|
|
108
|
+
function isSweRebenchInstanceId(token) {
|
|
109
|
+
return SWE_REBENCH_INSTANCE_ID.test(token);
|
|
110
|
+
}
|
|
63
111
|
/**
|
|
64
112
|
* Decide whether a single whitespace-delimited token should be redacted as a
|
|
65
113
|
* high-entropy / secret-shaped value. Purely additive over the original rule:
|
|
@@ -83,40 +131,78 @@ function charClassCount(s) {
|
|
|
83
131
|
* Splitting on dots as well as slashes means a sentence full stop or a file
|
|
84
132
|
* extension yields its own (failing) segment instead of poisoning the
|
|
85
133
|
* secret blob next to it. Non-path tokens are unaffected.
|
|
134
|
+
*
|
|
135
|
+
* #1391 additions, checked in order:
|
|
136
|
+
* - a non-ASCII-dominant token (share > NON_ASCII_MAX_SHARE) is prose in a
|
|
137
|
+
* non-Latin script, not ASCII key material — never entropy-gated;
|
|
138
|
+
* - a structured token (any character outside SECRET_CHARSET: URLs,
|
|
139
|
+
* markdown links, shell interpolations) is judged per delimited segment
|
|
140
|
+
* via the same strict gate as path segments — see the
|
|
141
|
+
* STRUCTURED_SEGMENT_DELIMITER tuning note.
|
|
142
|
+
* Pure SECRET_CHARSET runs keep the original whole-token behaviour.
|
|
86
143
|
*/
|
|
87
144
|
function isSecretShapedToken(token) {
|
|
88
145
|
if (token.length < ENTROPY_MIN_LEN)
|
|
89
146
|
return false;
|
|
147
|
+
if (nonAsciiShare(token) > NON_ASCII_MAX_SHARE)
|
|
148
|
+
return false;
|
|
149
|
+
if (isSweRebenchInstanceId(token))
|
|
150
|
+
return false;
|
|
90
151
|
if (PATH_SHAPED.test(token) && charClassCount(token) <= 2) {
|
|
91
|
-
return token.split(/[/.]/).some(
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
152
|
+
return token.split(/[/.]/).some(passesStrictSegmentGate);
|
|
153
|
+
}
|
|
154
|
+
if (!SECRET_CHARSET.test(token)) {
|
|
155
|
+
// Structured token (#1391) — URL, markdown link, shell interpolation…
|
|
156
|
+
// A contiguous key can only live inside a delimited segment.
|
|
157
|
+
return token.split(STRUCTURED_SEGMENT_DELIMITER).some(passesStrictSegmentGate);
|
|
95
158
|
}
|
|
96
159
|
if (shannonEntropy(token) < ENTROPY_MIN_BITS)
|
|
97
160
|
return false;
|
|
98
161
|
if (token.length >= ENTROPY_STRICT_LEN)
|
|
99
162
|
return true;
|
|
100
|
-
return
|
|
163
|
+
return charClassCount(token) >= 2;
|
|
164
|
+
}
|
|
165
|
+
/**
|
|
166
|
+
* The strict per-segment gate shared by the PATH_SHAPED (#1348) and
|
|
167
|
+
* structured-token (#1391) carve-outs: a segment is secret-shaped only when
|
|
168
|
+
* it is ≥ ENTROPY_MIN_LEN chars, clears the entropy bar, is a single
|
|
169
|
+
* secret-charset run, and mixes ≥ 2 character classes.
|
|
170
|
+
*/
|
|
171
|
+
function passesStrictSegmentGate(segment) {
|
|
172
|
+
return (segment.length >= ENTROPY_MIN_LEN &&
|
|
173
|
+
!WORDISH_SEGMENT.test(segment) &&
|
|
174
|
+
shannonEntropy(segment) >= ENTROPY_MIN_BITS &&
|
|
175
|
+
SECRET_CHARSET.test(segment) &&
|
|
176
|
+
charClassCount(segment) >= 2);
|
|
177
|
+
}
|
|
178
|
+
/** Share of characters outside the 7-bit ASCII range (by code point). */
|
|
179
|
+
function nonAsciiShare(s) {
|
|
180
|
+
let n = 0;
|
|
181
|
+
let total = 0;
|
|
182
|
+
for (const ch of s) {
|
|
183
|
+
total += 1;
|
|
184
|
+
if ((ch.codePointAt(0) ?? 0) > 0x7f)
|
|
185
|
+
n += 1;
|
|
186
|
+
}
|
|
187
|
+
return total === 0 ? 0 : n / total;
|
|
101
188
|
}
|
|
102
189
|
/** Short label from a secretlint ruleId, e.g. `@secretlint/secretlint-rule-github` → `github`. */
|
|
103
190
|
function shortRule(ruleId) {
|
|
104
191
|
return ruleId.replace(/^@secretlint\/secretlint-rule-/, '').replace(/^@secretlint\//, '');
|
|
105
192
|
}
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
export function secretlintStage(policy) {
|
|
193
|
+
// #1378 cosmetic: a `\S+` token inside serialised JSON drags its wrapping
|
|
194
|
+
// delimiters along (`"…/blob",` is one whitespace-delimited token), so
|
|
195
|
+
// replacing the whole token swallowed the quotes/comma and left malformed
|
|
196
|
+
// JSON (`"resolved_path": [SECRET:high-entropy] "files_modified": …`). Split
|
|
197
|
+
// each token into leading punctuation / core / trailing punctuation, gate on
|
|
198
|
+
// the core, and reattach the punctuation around the placeholder. None of the
|
|
199
|
+
// stripped characters belong to SECRET_CHARSET (`=` deliberately excluded —
|
|
200
|
+
// base64 padding), so no secret material is ever preserved; if anything,
|
|
201
|
+
// stripping the wrapper improves detection (the 16–19 char shape gate
|
|
202
|
+
// previously failed on quoted tokens because the quotes broke the charset).
|
|
203
|
+
const TOKEN_WRAPPING = /^([("'`[{,;:]*)([\s\S]*?)([)"'`\]},;:.]*)$/;
|
|
204
|
+
export function secretlintStage(policy, opts = {}) {
|
|
205
|
+
const entropyFallback = opts.entropyFallback ?? true;
|
|
120
206
|
const config = { rules: [{ id: PRESET_RULE_ID, rule: creator }] };
|
|
121
207
|
return {
|
|
122
208
|
name: 'secretlint',
|
|
@@ -143,13 +229,18 @@ export function secretlintStage(policy) {
|
|
|
143
229
|
redactions.push({ key, stage: 'secretlint', kind: 'secret', detail: label });
|
|
144
230
|
}
|
|
145
231
|
// Pass 2 — entropy + secret-shape fallback on whatever survived.
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
232
|
+
// Wrapping punctuation is preserved around the placeholder (#1378).
|
|
233
|
+
// Skipped entirely under the seed profile (#1409).
|
|
234
|
+
if (entropyFallback) {
|
|
235
|
+
text = text.replace(/\S+/g, (token) => {
|
|
236
|
+
const [, lead = '', core = token, trail = ''] = TOKEN_WRAPPING.exec(token) ?? [];
|
|
237
|
+
if (isSecretShapedToken(core)) {
|
|
238
|
+
redactions.push({ key, stage: 'secretlint', kind: 'secret', detail: 'high-entropy' });
|
|
239
|
+
return `${lead}[SECRET:high-entropy]${trail}`;
|
|
240
|
+
}
|
|
241
|
+
return token;
|
|
242
|
+
});
|
|
243
|
+
}
|
|
153
244
|
out[key] = text;
|
|
154
245
|
}
|
|
155
246
|
return { attributes: out, redactions };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secretlint-stage.js","sourceRoot":"","sources":["../../../src/trajectory/scrub/secretlint-stage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,8CAA8C,CAAC;AACvE,OAAO,EAAE,WAAW,EAAkB,MAAM,iBAAiB,CAAC;AAG9D,MAAM,OAAO,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"secretlint-stage.js","sourceRoot":"","sources":["../../../src/trajectory/scrub/secretlint-stage.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,8 +74,34 @@ export interface TranscriptWatcherConfig {
|
|
|
74
74
|
/** Standard session directories (Codex, Claude Code, …). */
|
|
75
75
|
directories?: WatchedDirectory[];
|
|
76
76
|
onEvent: (envelope: DispatchEnvelope) => void;
|
|
77
|
+
/**
|
|
78
|
+
* #1422: skip `directories`-mode session files whose mtime is older than
|
|
79
|
+
* this many ms — dormant sessions are done growing and don't need a live
|
|
80
|
+
* OS-level watch handle. On an operator machine with a large accumulated
|
|
81
|
+
* history under `~/.claude/projects` / `~/.codex/sessions`, watching every
|
|
82
|
+
* historical file unbounded creates tens of thousands of native FSWatcher
|
|
83
|
+
* handles, starving the daemon's event loop (confirmed live: 15k+ handles,
|
|
84
|
+
* multiple daemon loops wedged for 70+ minutes; closing the handles
|
|
85
|
+
* in-process immediately unwedged them). Explicit `sources` are always
|
|
86
|
+
* watched regardless — they're operator-supplied, not bulk-enumerated.
|
|
87
|
+
* Default 7 days. `jinn capture import` remains the one-shot path for
|
|
88
|
+
* ingesting older history.
|
|
89
|
+
*/
|
|
90
|
+
maxDirectoryFileAgeMs?: number;
|
|
77
91
|
}
|
|
78
92
|
export interface TranscriptWatcher {
|
|
79
93
|
shutdown(): Promise<void>;
|
|
80
94
|
}
|
|
95
|
+
/**
|
|
96
|
+
* #1422: whether a `directories`-mode file is recent enough to warrant an
|
|
97
|
+
* active watch (pre-registration + chokidar's native handle). `stats` is
|
|
98
|
+
* `undefined` on chokidar's path-only pre-check (before it has stat'd the
|
|
99
|
+
* candidate) — always allow through at that stage; it re-checks with stats
|
|
100
|
+
* once available. Directories are always kept so recursion can still
|
|
101
|
+
* discover freshly-active sessions underneath an old-looking parent.
|
|
102
|
+
*/
|
|
103
|
+
export declare function shouldWatchDirectoryFile(filePath: string, stats: {
|
|
104
|
+
isDirectory(): boolean;
|
|
105
|
+
mtimeMs: number;
|
|
106
|
+
} | undefined, maxAgeMs: number): boolean;
|
|
81
107
|
export declare function startTranscriptWatcher(cfg: TranscriptWatcherConfig): Promise<TranscriptWatcher>;
|
|
@@ -51,6 +51,7 @@ import { GeminiSessionParser } from './transcript-parsers/gemini-session.js';
|
|
|
51
51
|
import { AiderHistoryParser } from './transcript-parsers/aider-history.js';
|
|
52
52
|
import { ContinueDevDataParser } from './transcript-parsers/continue-devdata.js';
|
|
53
53
|
import { listSessionJsonlFiles } from './transcript-session-dirs.js';
|
|
54
|
+
const DEFAULT_MAX_DIRECTORY_FILE_AGE_MS = 7 * 24 * 60 * 60 * 1000;
|
|
54
55
|
function makeParser(tool) {
|
|
55
56
|
switch (tool) {
|
|
56
57
|
case 'claude-code':
|
|
@@ -84,6 +85,23 @@ async function tailOffsetForPath(filePath) {
|
|
|
84
85
|
function isJsonlSessionFile(filePath) {
|
|
85
86
|
return filePath.endsWith('.jsonl');
|
|
86
87
|
}
|
|
88
|
+
/**
|
|
89
|
+
* #1422: whether a `directories`-mode file is recent enough to warrant an
|
|
90
|
+
* active watch (pre-registration + chokidar's native handle). `stats` is
|
|
91
|
+
* `undefined` on chokidar's path-only pre-check (before it has stat'd the
|
|
92
|
+
* candidate) — always allow through at that stage; it re-checks with stats
|
|
93
|
+
* once available. Directories are always kept so recursion can still
|
|
94
|
+
* discover freshly-active sessions underneath an old-looking parent.
|
|
95
|
+
*/
|
|
96
|
+
export function shouldWatchDirectoryFile(filePath, stats, maxAgeMs) {
|
|
97
|
+
if (!stats)
|
|
98
|
+
return true;
|
|
99
|
+
if (stats.isDirectory())
|
|
100
|
+
return true;
|
|
101
|
+
if (!isJsonlSessionFile(filePath))
|
|
102
|
+
return false;
|
|
103
|
+
return Date.now() - stats.mtimeMs <= maxAgeMs;
|
|
104
|
+
}
|
|
87
105
|
export async function startTranscriptWatcher(cfg) {
|
|
88
106
|
const sources = cfg.sources ?? [];
|
|
89
107
|
const directories = cfg.directories ?? [];
|
|
@@ -92,6 +110,7 @@ export async function startTranscriptWatcher(cfg) {
|
|
|
92
110
|
}
|
|
93
111
|
const states = new Map();
|
|
94
112
|
const directoryParsers = new Map();
|
|
113
|
+
const maxDirectoryFileAgeMs = cfg.maxDirectoryFileAgeMs ?? DEFAULT_MAX_DIRECTORY_FILE_AGE_MS;
|
|
95
114
|
const registerSource = async (source, opts) => {
|
|
96
115
|
const normalizedPath = resolvePath(source.path);
|
|
97
116
|
const nextOffset = opts.tailFromEnd ? await tailOffsetForPath(normalizedPath) : 0;
|
|
@@ -111,6 +130,9 @@ export async function startTranscriptWatcher(cfg) {
|
|
|
111
130
|
directoryParsers.set(dir.tool, parser);
|
|
112
131
|
const files = await listSessionJsonlFiles(dir.directory, dir.recursive === true);
|
|
113
132
|
for (const filePath of files) {
|
|
133
|
+
const stats = await fs.stat(filePath).catch(() => undefined);
|
|
134
|
+
if (!shouldWatchDirectoryFile(filePath, stats, maxDirectoryFileAgeMs))
|
|
135
|
+
continue;
|
|
114
136
|
await registerSource({
|
|
115
137
|
tool: dir.tool,
|
|
116
138
|
path: filePath,
|
|
@@ -123,10 +145,21 @@ export async function startTranscriptWatcher(cfg) {
|
|
|
123
145
|
...sources.map((s) => s.path),
|
|
124
146
|
...directories.map((d) => d.directory),
|
|
125
147
|
];
|
|
148
|
+
// #1422: explicit `sources` are operator-supplied and always watched
|
|
149
|
+
// regardless of extension/age; only `directories`-mode bulk enumeration is
|
|
150
|
+
// bounded (see maxDirectoryFileAgeMs above — this is the other half of the
|
|
151
|
+
// same fix, applied where it actually matters: chokidar's own native watch
|
|
152
|
+
// handles, not just this module's pre-registration).
|
|
153
|
+
const explicitSourcePaths = new Set(sources.map((s) => resolvePath(s.path)));
|
|
126
154
|
const watcher = chokidar.watch(watchPaths, {
|
|
127
155
|
persistent: true,
|
|
128
156
|
awaitWriteFinish: { stabilityThreshold: 50, pollInterval: 25 },
|
|
129
157
|
ignoreInitial: true,
|
|
158
|
+
ignored: (candidatePath, stats) => {
|
|
159
|
+
if (explicitSourcePaths.has(resolvePath(candidatePath)))
|
|
160
|
+
return false;
|
|
161
|
+
return !shouldWatchDirectoryFile(candidatePath, stats, maxDirectoryFileAgeMs);
|
|
162
|
+
},
|
|
130
163
|
});
|
|
131
164
|
const resolveDirectoryForPath = (filepath) => {
|
|
132
165
|
const normalized = resolvePath(filepath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transcript-watcher.js","sourceRoot":"","sources":["../../src/trajectory/transcript-watcher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AAEH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,QAA4B,MAAM,UAAU,CAAC;AAEpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"transcript-watcher.js","sourceRoot":"","sources":["../../src/trajectory/transcript-watcher.ts"],"names":[],"mappings":"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"}
|