modkh 0.1.0 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +42 -0
- package/dist/agent/bundled-skills.d.ts +1 -1
- package/dist/agent/bundled-skills.js +1 -1
- package/dist/agent/compaction.d.ts +53 -0
- package/dist/agent/compaction.js +191 -0
- package/dist/agent/loop.d.ts +55 -8
- package/dist/agent/loop.js +119 -7
- package/dist/agent/skills.d.ts +7 -1
- package/dist/agent/skills.js +26 -5
- package/dist/agent/types.d.ts +14 -9
- package/dist/cli/agenticreplay.d.ts +1 -0
- package/dist/cli/agenticreplay.js +66 -0
- package/dist/cli/answer-markdown.d.ts +3 -0
- package/dist/cli/answer-markdown.js +29 -0
- package/dist/cli/approval.d.ts +2 -0
- package/dist/cli/approval.js +35 -5
- package/dist/cli/catalog.d.ts +30 -32
- package/dist/cli/catalog.js +37 -67
- package/dist/cli/chat.js +406 -78
- package/dist/cli/clipboard.d.ts +2 -0
- package/dist/cli/clipboard.js +28 -0
- package/dist/cli/color.d.ts +20 -3
- package/dist/cli/color.js +87 -19
- package/dist/cli/compaction-settings.d.ts +21 -0
- package/dist/cli/compaction-settings.js +54 -0
- package/dist/cli/completion-art.d.ts +2 -0
- package/dist/cli/completion-art.js +62 -0
- package/dist/cli/config.d.ts +9 -0
- package/dist/cli/config.js +5 -1
- package/dist/cli/editor.d.ts +7 -0
- package/dist/cli/editor.js +43 -5
- package/dist/cli/file-mentions.d.ts +14 -0
- package/dist/cli/file-mentions.js +141 -0
- package/dist/cli/head-checks.d.ts +41 -0
- package/dist/cli/head-checks.js +146 -0
- package/dist/cli/initial-connection.d.ts +7 -0
- package/dist/cli/initial-connection.js +20 -0
- package/dist/cli/keys.d.ts +12 -1
- package/dist/cli/keys.js +29 -4
- package/dist/cli/model-catalog.d.ts +16 -0
- package/dist/cli/model-catalog.js +130 -0
- package/dist/cli/models.d.ts +2 -2
- package/dist/cli/models.js +51 -19
- package/dist/cli/official-models.d.ts +6 -0
- package/dist/cli/official-models.js +77 -0
- package/dist/cli/pdf.d.ts +8 -0
- package/dist/cli/pdf.js +71 -0
- package/dist/cli/providers.d.ts +6 -42
- package/dist/cli/providers.js +44 -38
- package/dist/cli/shell-display.d.ts +6 -0
- package/dist/cli/shell-display.js +35 -0
- package/dist/cli/stateright.d.ts +1 -0
- package/dist/cli/stateright.js +37 -0
- package/dist/cli/terminal-mouse.d.ts +21 -0
- package/dist/cli/terminal-mouse.js +51 -0
- package/dist/cli/terminal.d.ts +95 -7
- package/dist/cli/terminal.js +783 -108
- package/dist/cli/tool-display.d.ts +9 -0
- package/dist/cli/tool-display.js +87 -0
- package/dist/cli/transcript-selection.d.ts +22 -0
- package/dist/cli/transcript-selection.js +75 -0
- package/dist/cli/usage.d.ts +9 -16
- package/dist/cli/usage.js +60 -18
- package/dist/cli/waiting-nyan.d.ts +3 -0
- package/dist/cli/waiting-nyan.js +17 -0
- package/dist/cli/waiting-whales.d.ts +3 -0
- package/dist/cli/waiting-whales.js +24 -0
- package/dist/index.js +30 -8
- package/dist/language/commonlisp-install.d.ts +1 -0
- package/dist/language/commonlisp-install.js +3 -2
- package/dist/language/lsp/client.js +4 -1
- package/dist/language/lsp/pool.d.ts +8 -0
- package/dist/language/lsp/pool.js +21 -3
- package/dist/language/lsp/service.d.ts +8 -4
- package/dist/language/lsp/service.js +51 -15
- package/dist/language/syntax/parser.d.ts +10 -1
- package/dist/language/syntax/parser.js +34 -16
- package/dist/lisp/builtin-agents.d.ts +5 -0
- package/dist/lisp/builtin-agents.js +52 -0
- package/dist/lisp/config.d.ts +9 -0
- package/dist/lisp/config.js +50 -7
- package/dist/lisp/routing.js +2 -2
- package/dist/lisp/runtime.d.ts +5 -0
- package/dist/lisp/runtime.js +26 -2
- package/dist/model/ai-sdk.js +13 -8
- package/dist/model/chatgpt/login.js +1 -1
- package/dist/model/chatgpt/responses.js +56 -4
- package/dist/model/connection.js +2 -0
- package/dist/model/context-window.d.ts +3 -0
- package/dist/model/context-window.js +64 -0
- package/dist/model/context.d.ts +3 -1
- package/dist/model/context.js +24 -24
- package/dist/model/factory.d.ts +3 -1
- package/dist/model/factory.js +28 -27
- package/dist/model/harness-profile.d.ts +6 -0
- package/dist/model/harness-profile.js +23 -0
- package/dist/model/providers.d.ts +32 -0
- package/dist/model/providers.js +72 -0
- package/dist/model/reasoning.d.ts +3 -3
- package/dist/model/reasoning.js +30 -8
- package/dist/model/record-fetch.d.ts +2 -0
- package/dist/model/record-fetch.js +19 -0
- package/dist/plugins/manager.d.ts +2 -1
- package/dist/plugins/manager.js +21 -2
- package/dist/session/store.d.ts +11 -0
- package/dist/session/store.js +27 -1
- package/dist/subagents/head-assignment.d.ts +11 -0
- package/dist/subagents/head-assignment.js +47 -0
- package/dist/subagents/limits.d.ts +4 -0
- package/dist/subagents/limits.js +6 -0
- package/dist/subagents/request.js +18 -1
- package/dist/subagents/service.d.ts +36 -2
- package/dist/subagents/service.js +331 -38
- package/dist/subagents/types.d.ts +20 -0
- package/dist/subagents/verification.d.ts +5 -2
- package/dist/subagents/verification.js +59 -22
- package/dist/tools/browse.d.ts +13 -0
- package/dist/tools/browse.js +117 -0
- package/dist/tools/browser-capability.d.ts +3 -0
- package/dist/tools/browser-capability.js +29 -0
- package/dist/tools/formal-input.d.ts +6 -0
- package/dist/tools/formal-input.js +29 -0
- package/dist/tools/formal.d.ts +3 -2
- package/dist/tools/formal.js +54 -52
- package/dist/tools/jobs.d.ts +2 -0
- package/dist/tools/jobs.js +5 -0
- package/dist/tools/language.js +25 -27
- package/dist/tools/lean-proof.d.ts +38 -0
- package/dist/tools/lean-proof.js +83 -0
- package/dist/tools/registry.d.ts +5 -3
- package/dist/tools/registry.js +13 -5
- package/dist/tools/run.js +13 -9
- package/dist/tools/shell-process.js +17 -6
- package/dist/tools/stateright-runtime.d.ts +3 -0
- package/dist/tools/stateright-runtime.js +16 -0
- package/dist/tools/stateright.d.ts +3 -0
- package/dist/tools/stateright.js +78 -0
- package/dist/tools/web.js +7 -2
- package/dist/version.d.ts +2 -0
- package/dist/version.js +2 -0
- package/docs/commonlisp-build-output.md +14 -0
- package/docs/context-efficiency.md +25 -3
- package/docs/input.md +63 -3
- package/docs/languages.md +3 -3
- package/docs/models.md +30 -6
- package/docs/modkh.md +11 -7
- package/docs/presets.md +45 -0
- package/docs/setup.md +3 -16
- package/docs/stateright.md +45 -0
- package/docs/subagents.md +21 -3
- package/docs/web.md +1 -1
- package/experiments/presets/formal.lisp +15 -4
- package/experiments/presets/language-microagents.lisp +29 -0
- package/native/stateright/Cargo.lock +478 -0
- package/native/stateright/Cargo.toml +11 -0
- package/native/stateright/src/lib.rs +163 -0
- package/native/stateright/src/main.rs +38 -0
- package/package.json +10 -2
|
@@ -0,0 +1,478 @@
|
|
|
1
|
+
# This file is automatically @generated by Cargo.
|
|
2
|
+
# It is not intended for manual editing.
|
|
3
|
+
version = 4
|
|
4
|
+
|
|
5
|
+
[[package]]
|
|
6
|
+
name = "ahash"
|
|
7
|
+
version = "0.8.12"
|
|
8
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
9
|
+
checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
|
|
10
|
+
dependencies = [
|
|
11
|
+
"cfg-if",
|
|
12
|
+
"getrandom",
|
|
13
|
+
"once_cell",
|
|
14
|
+
"version_check",
|
|
15
|
+
"zerocopy",
|
|
16
|
+
]
|
|
17
|
+
|
|
18
|
+
[[package]]
|
|
19
|
+
name = "ascii"
|
|
20
|
+
version = "1.1.0"
|
|
21
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
22
|
+
checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
|
|
23
|
+
|
|
24
|
+
[[package]]
|
|
25
|
+
name = "bitflags"
|
|
26
|
+
version = "2.13.2"
|
|
27
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
28
|
+
checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
|
|
29
|
+
|
|
30
|
+
[[package]]
|
|
31
|
+
name = "block-buffer"
|
|
32
|
+
version = "0.10.4"
|
|
33
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
34
|
+
checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
|
|
35
|
+
dependencies = [
|
|
36
|
+
"generic-array",
|
|
37
|
+
]
|
|
38
|
+
|
|
39
|
+
[[package]]
|
|
40
|
+
name = "cfg-if"
|
|
41
|
+
version = "1.0.5"
|
|
42
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
43
|
+
checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600"
|
|
44
|
+
|
|
45
|
+
[[package]]
|
|
46
|
+
name = "choice"
|
|
47
|
+
version = "0.0.2"
|
|
48
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
49
|
+
checksum = "a3b71fc821deaf602a933ada5c845d088156d0cdf2ebf43ede390afe93466553"
|
|
50
|
+
|
|
51
|
+
[[package]]
|
|
52
|
+
name = "chunked_transfer"
|
|
53
|
+
version = "1.5.0"
|
|
54
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
55
|
+
checksum = "6e4de3bc4ea267985becf712dc6d9eed8b04c953b3fcfb339ebc87acd9804901"
|
|
56
|
+
|
|
57
|
+
[[package]]
|
|
58
|
+
name = "cpufeatures"
|
|
59
|
+
version = "0.2.17"
|
|
60
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
61
|
+
checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
|
|
62
|
+
dependencies = [
|
|
63
|
+
"libc",
|
|
64
|
+
]
|
|
65
|
+
|
|
66
|
+
[[package]]
|
|
67
|
+
name = "crossbeam-utils"
|
|
68
|
+
version = "0.8.23"
|
|
69
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
70
|
+
checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6"
|
|
71
|
+
|
|
72
|
+
[[package]]
|
|
73
|
+
name = "crypto-common"
|
|
74
|
+
version = "0.1.7"
|
|
75
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
76
|
+
checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
|
|
77
|
+
dependencies = [
|
|
78
|
+
"generic-array",
|
|
79
|
+
"typenum",
|
|
80
|
+
]
|
|
81
|
+
|
|
82
|
+
[[package]]
|
|
83
|
+
name = "dashmap"
|
|
84
|
+
version = "6.2.1"
|
|
85
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
86
|
+
checksum = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c"
|
|
87
|
+
dependencies = [
|
|
88
|
+
"cfg-if",
|
|
89
|
+
"crossbeam-utils",
|
|
90
|
+
"hashbrown",
|
|
91
|
+
"lock_api",
|
|
92
|
+
"once_cell",
|
|
93
|
+
"parking_lot_core",
|
|
94
|
+
]
|
|
95
|
+
|
|
96
|
+
[[package]]
|
|
97
|
+
name = "digest"
|
|
98
|
+
version = "0.10.7"
|
|
99
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
100
|
+
checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
|
|
101
|
+
dependencies = [
|
|
102
|
+
"block-buffer",
|
|
103
|
+
"crypto-common",
|
|
104
|
+
]
|
|
105
|
+
|
|
106
|
+
[[package]]
|
|
107
|
+
name = "generic-array"
|
|
108
|
+
version = "0.14.7"
|
|
109
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
110
|
+
checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
|
|
111
|
+
dependencies = [
|
|
112
|
+
"typenum",
|
|
113
|
+
"version_check",
|
|
114
|
+
]
|
|
115
|
+
|
|
116
|
+
[[package]]
|
|
117
|
+
name = "getrandom"
|
|
118
|
+
version = "0.3.4"
|
|
119
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
120
|
+
checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
|
|
121
|
+
dependencies = [
|
|
122
|
+
"cfg-if",
|
|
123
|
+
"libc",
|
|
124
|
+
"r-efi",
|
|
125
|
+
"wasip2",
|
|
126
|
+
]
|
|
127
|
+
|
|
128
|
+
[[package]]
|
|
129
|
+
name = "hashbrown"
|
|
130
|
+
version = "0.14.5"
|
|
131
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
132
|
+
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
|
|
133
|
+
|
|
134
|
+
[[package]]
|
|
135
|
+
name = "httpdate"
|
|
136
|
+
version = "1.0.3"
|
|
137
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
138
|
+
checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
|
|
139
|
+
|
|
140
|
+
[[package]]
|
|
141
|
+
name = "id-set"
|
|
142
|
+
version = "0.2.2"
|
|
143
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
144
|
+
checksum = "9633fadf6346456cf8531119ba4838bc6d82ac4ce84d9852126dd2aa34d49264"
|
|
145
|
+
|
|
146
|
+
[[package]]
|
|
147
|
+
name = "itoa"
|
|
148
|
+
version = "1.0.19"
|
|
149
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
150
|
+
checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4"
|
|
151
|
+
|
|
152
|
+
[[package]]
|
|
153
|
+
name = "libc"
|
|
154
|
+
version = "0.2.191"
|
|
155
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
156
|
+
checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
|
|
157
|
+
|
|
158
|
+
[[package]]
|
|
159
|
+
name = "lock_api"
|
|
160
|
+
version = "0.4.14"
|
|
161
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
162
|
+
checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
|
|
163
|
+
dependencies = [
|
|
164
|
+
"scopeguard",
|
|
165
|
+
]
|
|
166
|
+
|
|
167
|
+
[[package]]
|
|
168
|
+
name = "log"
|
|
169
|
+
version = "0.4.35"
|
|
170
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
171
|
+
checksum = "5d15f86d12da44cd8d4ec3c73984537eb7f4cadcb9776a575a0a8a05ca11005c"
|
|
172
|
+
|
|
173
|
+
[[package]]
|
|
174
|
+
name = "memchr"
|
|
175
|
+
version = "2.8.3"
|
|
176
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
177
|
+
checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
|
|
178
|
+
|
|
179
|
+
[[package]]
|
|
180
|
+
name = "modkh-stateright"
|
|
181
|
+
version = "0.1.0"
|
|
182
|
+
dependencies = [
|
|
183
|
+
"serde",
|
|
184
|
+
"serde_json",
|
|
185
|
+
"sha2",
|
|
186
|
+
"stateright",
|
|
187
|
+
]
|
|
188
|
+
|
|
189
|
+
[[package]]
|
|
190
|
+
name = "nohash-hasher"
|
|
191
|
+
version = "0.2.0"
|
|
192
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
193
|
+
checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
|
|
194
|
+
|
|
195
|
+
[[package]]
|
|
196
|
+
name = "once_cell"
|
|
197
|
+
version = "1.21.4"
|
|
198
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
199
|
+
checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
|
|
200
|
+
|
|
201
|
+
[[package]]
|
|
202
|
+
name = "parking_lot"
|
|
203
|
+
version = "0.12.5"
|
|
204
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
205
|
+
checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
|
|
206
|
+
dependencies = [
|
|
207
|
+
"lock_api",
|
|
208
|
+
"parking_lot_core",
|
|
209
|
+
]
|
|
210
|
+
|
|
211
|
+
[[package]]
|
|
212
|
+
name = "parking_lot_core"
|
|
213
|
+
version = "0.9.12"
|
|
214
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
215
|
+
checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
|
|
216
|
+
dependencies = [
|
|
217
|
+
"cfg-if",
|
|
218
|
+
"libc",
|
|
219
|
+
"redox_syscall",
|
|
220
|
+
"smallvec",
|
|
221
|
+
"windows-link",
|
|
222
|
+
]
|
|
223
|
+
|
|
224
|
+
[[package]]
|
|
225
|
+
name = "ppv-lite86"
|
|
226
|
+
version = "0.2.21"
|
|
227
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
228
|
+
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
|
|
229
|
+
dependencies = [
|
|
230
|
+
"zerocopy",
|
|
231
|
+
]
|
|
232
|
+
|
|
233
|
+
[[package]]
|
|
234
|
+
name = "proc-macro2"
|
|
235
|
+
version = "1.0.107"
|
|
236
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
237
|
+
checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
|
|
238
|
+
dependencies = [
|
|
239
|
+
"unicode-ident",
|
|
240
|
+
]
|
|
241
|
+
|
|
242
|
+
[[package]]
|
|
243
|
+
name = "quote"
|
|
244
|
+
version = "1.0.47"
|
|
245
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
246
|
+
checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001"
|
|
247
|
+
dependencies = [
|
|
248
|
+
"proc-macro2",
|
|
249
|
+
]
|
|
250
|
+
|
|
251
|
+
[[package]]
|
|
252
|
+
name = "r-efi"
|
|
253
|
+
version = "5.3.0"
|
|
254
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
255
|
+
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
|
|
256
|
+
|
|
257
|
+
[[package]]
|
|
258
|
+
name = "rand"
|
|
259
|
+
version = "0.9.5"
|
|
260
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
261
|
+
checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"
|
|
262
|
+
dependencies = [
|
|
263
|
+
"rand_chacha",
|
|
264
|
+
"rand_core",
|
|
265
|
+
]
|
|
266
|
+
|
|
267
|
+
[[package]]
|
|
268
|
+
name = "rand_chacha"
|
|
269
|
+
version = "0.9.0"
|
|
270
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
271
|
+
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
|
|
272
|
+
dependencies = [
|
|
273
|
+
"ppv-lite86",
|
|
274
|
+
"rand_core",
|
|
275
|
+
]
|
|
276
|
+
|
|
277
|
+
[[package]]
|
|
278
|
+
name = "rand_core"
|
|
279
|
+
version = "0.9.5"
|
|
280
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
281
|
+
checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
|
|
282
|
+
dependencies = [
|
|
283
|
+
"getrandom",
|
|
284
|
+
]
|
|
285
|
+
|
|
286
|
+
[[package]]
|
|
287
|
+
name = "redox_syscall"
|
|
288
|
+
version = "0.5.18"
|
|
289
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
290
|
+
checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
|
|
291
|
+
dependencies = [
|
|
292
|
+
"bitflags",
|
|
293
|
+
]
|
|
294
|
+
|
|
295
|
+
[[package]]
|
|
296
|
+
name = "scopeguard"
|
|
297
|
+
version = "1.2.0"
|
|
298
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
299
|
+
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
|
300
|
+
|
|
301
|
+
[[package]]
|
|
302
|
+
name = "serde"
|
|
303
|
+
version = "1.0.229"
|
|
304
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
305
|
+
checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
|
|
306
|
+
dependencies = [
|
|
307
|
+
"serde_core",
|
|
308
|
+
"serde_derive",
|
|
309
|
+
]
|
|
310
|
+
|
|
311
|
+
[[package]]
|
|
312
|
+
name = "serde_core"
|
|
313
|
+
version = "1.0.229"
|
|
314
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
315
|
+
checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
|
|
316
|
+
dependencies = [
|
|
317
|
+
"serde_derive",
|
|
318
|
+
]
|
|
319
|
+
|
|
320
|
+
[[package]]
|
|
321
|
+
name = "serde_derive"
|
|
322
|
+
version = "1.0.229"
|
|
323
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
324
|
+
checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
|
|
325
|
+
dependencies = [
|
|
326
|
+
"proc-macro2",
|
|
327
|
+
"quote",
|
|
328
|
+
"syn 3.0.10",
|
|
329
|
+
]
|
|
330
|
+
|
|
331
|
+
[[package]]
|
|
332
|
+
name = "serde_json"
|
|
333
|
+
version = "1.0.154"
|
|
334
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
335
|
+
checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6"
|
|
336
|
+
dependencies = [
|
|
337
|
+
"itoa",
|
|
338
|
+
"memchr",
|
|
339
|
+
"serde",
|
|
340
|
+
"serde_core",
|
|
341
|
+
"zmij",
|
|
342
|
+
]
|
|
343
|
+
|
|
344
|
+
[[package]]
|
|
345
|
+
name = "sha2"
|
|
346
|
+
version = "0.10.9"
|
|
347
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
348
|
+
checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
|
|
349
|
+
dependencies = [
|
|
350
|
+
"cfg-if",
|
|
351
|
+
"cpufeatures",
|
|
352
|
+
"digest",
|
|
353
|
+
]
|
|
354
|
+
|
|
355
|
+
[[package]]
|
|
356
|
+
name = "smallvec"
|
|
357
|
+
version = "1.16.5"
|
|
358
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
359
|
+
checksum = "149309498a5f7334b12ddae0cad8aba81ce785fe91755068867e017cf98fee46"
|
|
360
|
+
|
|
361
|
+
[[package]]
|
|
362
|
+
name = "stateright"
|
|
363
|
+
version = "0.31.0"
|
|
364
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
365
|
+
checksum = "fd1157f21b11916f90fe1f2ac9a8d0e09a8813b28701584141060f414eedf6ba"
|
|
366
|
+
dependencies = [
|
|
367
|
+
"ahash",
|
|
368
|
+
"choice",
|
|
369
|
+
"crossbeam-utils",
|
|
370
|
+
"dashmap",
|
|
371
|
+
"id-set",
|
|
372
|
+
"log",
|
|
373
|
+
"nohash-hasher",
|
|
374
|
+
"parking_lot",
|
|
375
|
+
"rand",
|
|
376
|
+
"serde",
|
|
377
|
+
"serde_json",
|
|
378
|
+
"tiny_http",
|
|
379
|
+
]
|
|
380
|
+
|
|
381
|
+
[[package]]
|
|
382
|
+
name = "syn"
|
|
383
|
+
version = "2.0.119"
|
|
384
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
385
|
+
checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
|
|
386
|
+
dependencies = [
|
|
387
|
+
"proc-macro2",
|
|
388
|
+
"quote",
|
|
389
|
+
"unicode-ident",
|
|
390
|
+
]
|
|
391
|
+
|
|
392
|
+
[[package]]
|
|
393
|
+
name = "syn"
|
|
394
|
+
version = "3.0.10"
|
|
395
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
396
|
+
checksum = "4ae9ccbea3a7b0b09443036490c8f34a8b1b760fd345e5c0dae0aac718faea79"
|
|
397
|
+
dependencies = [
|
|
398
|
+
"proc-macro2",
|
|
399
|
+
"quote",
|
|
400
|
+
"unicode-ident",
|
|
401
|
+
]
|
|
402
|
+
|
|
403
|
+
[[package]]
|
|
404
|
+
name = "tiny_http"
|
|
405
|
+
version = "0.12.0"
|
|
406
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
407
|
+
checksum = "389915df6413a2e74fb181895f933386023c71110878cd0825588928e64cdc82"
|
|
408
|
+
dependencies = [
|
|
409
|
+
"ascii",
|
|
410
|
+
"chunked_transfer",
|
|
411
|
+
"httpdate",
|
|
412
|
+
"log",
|
|
413
|
+
]
|
|
414
|
+
|
|
415
|
+
[[package]]
|
|
416
|
+
name = "typenum"
|
|
417
|
+
version = "1.20.1"
|
|
418
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
419
|
+
checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
|
|
420
|
+
|
|
421
|
+
[[package]]
|
|
422
|
+
name = "unicode-ident"
|
|
423
|
+
version = "1.0.27"
|
|
424
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
425
|
+
checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563"
|
|
426
|
+
|
|
427
|
+
[[package]]
|
|
428
|
+
name = "version_check"
|
|
429
|
+
version = "0.9.5"
|
|
430
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
431
|
+
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
|
|
432
|
+
|
|
433
|
+
[[package]]
|
|
434
|
+
name = "wasip2"
|
|
435
|
+
version = "1.0.4+wasi-0.2.12"
|
|
436
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
437
|
+
checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
|
|
438
|
+
dependencies = [
|
|
439
|
+
"wit-bindgen",
|
|
440
|
+
]
|
|
441
|
+
|
|
442
|
+
[[package]]
|
|
443
|
+
name = "windows-link"
|
|
444
|
+
version = "0.2.1"
|
|
445
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
446
|
+
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
|
|
447
|
+
|
|
448
|
+
[[package]]
|
|
449
|
+
name = "wit-bindgen"
|
|
450
|
+
version = "0.57.1"
|
|
451
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
452
|
+
checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
|
|
453
|
+
|
|
454
|
+
[[package]]
|
|
455
|
+
name = "zerocopy"
|
|
456
|
+
version = "0.8.63"
|
|
457
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
458
|
+
checksum = "e5fe1f8f1b06191a00962174c61aa5005e0bb391a6d80d07e24d115c01a92ed8"
|
|
459
|
+
dependencies = [
|
|
460
|
+
"zerocopy-derive",
|
|
461
|
+
]
|
|
462
|
+
|
|
463
|
+
[[package]]
|
|
464
|
+
name = "zerocopy-derive"
|
|
465
|
+
version = "0.8.63"
|
|
466
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
467
|
+
checksum = "863ad3ac83293fb4d740aedbfdc9240dd8d1a50c1099acd76ce80ce7c7230c7f"
|
|
468
|
+
dependencies = [
|
|
469
|
+
"proc-macro2",
|
|
470
|
+
"quote",
|
|
471
|
+
"syn 2.0.119",
|
|
472
|
+
]
|
|
473
|
+
|
|
474
|
+
[[package]]
|
|
475
|
+
name = "zmij"
|
|
476
|
+
version = "1.0.23"
|
|
477
|
+
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
478
|
+
checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
|
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
use serde::{Deserialize, Serialize};
|
|
2
|
+
use sha2::{Digest, Sha256};
|
|
3
|
+
use stateright::{Checker, Model, Property};
|
|
4
|
+
use std::collections::HashSet;
|
|
5
|
+
|
|
6
|
+
#[derive(Clone, Deserialize)]
|
|
7
|
+
#[serde(deny_unknown_fields, rename_all = "camelCase")]
|
|
8
|
+
pub struct Spec {
|
|
9
|
+
pub schema_version: u8,
|
|
10
|
+
pub states: Vec<String>,
|
|
11
|
+
pub initial: Vec<String>,
|
|
12
|
+
pub transitions: Vec<Transition>,
|
|
13
|
+
pub invariants: Vec<Invariant>,
|
|
14
|
+
pub check_deadlocks: bool,
|
|
15
|
+
}
|
|
16
|
+
#[derive(Clone, Deserialize)]
|
|
17
|
+
#[serde(deny_unknown_fields)]
|
|
18
|
+
pub struct Transition {
|
|
19
|
+
pub from: String,
|
|
20
|
+
pub to: String,
|
|
21
|
+
pub action: String,
|
|
22
|
+
}
|
|
23
|
+
#[derive(Clone, Deserialize)]
|
|
24
|
+
#[serde(deny_unknown_fields, rename_all = "camelCase")]
|
|
25
|
+
pub struct Invariant {
|
|
26
|
+
pub name: String,
|
|
27
|
+
pub allowed_states: Vec<String>,
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
fn names(values: &[String]) -> bool {
|
|
31
|
+
values
|
|
32
|
+
.iter()
|
|
33
|
+
.all(|s| !s.is_empty() && s.len() <= 128 && !s.chars().any(char::is_control))
|
|
34
|
+
&& values.iter().collect::<HashSet<_>>().len() == values.len()
|
|
35
|
+
}
|
|
36
|
+
impl Spec {
|
|
37
|
+
pub fn parse(bytes: &[u8]) -> Result<Self, String> {
|
|
38
|
+
if bytes.len() > 262144 {
|
|
39
|
+
return Err("Model exceeds 256 KiB".into());
|
|
40
|
+
}
|
|
41
|
+
let spec: Self = serde_json::from_slice(bytes).map_err(|e| e.to_string())?;
|
|
42
|
+
if spec.schema_version != 1
|
|
43
|
+
|| spec.states.is_empty()
|
|
44
|
+
|| spec.states.len() > 10000
|
|
45
|
+
|| !names(&spec.states)
|
|
46
|
+
|| spec.initial.is_empty()
|
|
47
|
+
|| !names(&spec.initial)
|
|
48
|
+
|| spec.invariants.is_empty()
|
|
49
|
+
|| spec.invariants.len() > 64
|
|
50
|
+
|| spec.transitions.len() > 50000
|
|
51
|
+
{
|
|
52
|
+
return Err("Invalid model bounds or schema".into());
|
|
53
|
+
}
|
|
54
|
+
let states: HashSet<_> = spec.states.iter().collect();
|
|
55
|
+
if spec.initial.iter().any(|s| !states.contains(s))
|
|
56
|
+
|| spec.transitions.iter().any(|t| {
|
|
57
|
+
!states.contains(&t.from)
|
|
58
|
+
|| !states.contains(&t.to)
|
|
59
|
+
|| t.action.is_empty()
|
|
60
|
+
|| t.action.len() > 128
|
|
61
|
+
|| t.action.chars().any(char::is_control)
|
|
62
|
+
})
|
|
63
|
+
|| !names(
|
|
64
|
+
&spec
|
|
65
|
+
.invariants
|
|
66
|
+
.iter()
|
|
67
|
+
.map(|p| p.name.clone())
|
|
68
|
+
.collect::<Vec<_>>(),
|
|
69
|
+
)
|
|
70
|
+
|| spec.invariants.iter().any(|p| {
|
|
71
|
+
!names(&p.allowed_states) || p.allowed_states.iter().any(|s| !states.contains(s))
|
|
72
|
+
})
|
|
73
|
+
{
|
|
74
|
+
return Err("Unknown state, duplicate name or invalid transition/invariant".into());
|
|
75
|
+
}
|
|
76
|
+
Ok(spec)
|
|
77
|
+
}
|
|
78
|
+
fn violations(&self, state: &str) -> Vec<String> {
|
|
79
|
+
self.invariants
|
|
80
|
+
.iter()
|
|
81
|
+
.filter(|p| !p.allowed_states.iter().any(|s| s == state))
|
|
82
|
+
.map(|p| p.name.clone())
|
|
83
|
+
.collect()
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
impl Model for Spec {
|
|
87
|
+
type State = String;
|
|
88
|
+
type Action = usize;
|
|
89
|
+
fn init_states(&self) -> Vec<String> {
|
|
90
|
+
self.initial.clone()
|
|
91
|
+
}
|
|
92
|
+
fn actions(&self, state: &String, actions: &mut Vec<usize>) {
|
|
93
|
+
actions.extend(
|
|
94
|
+
self.transitions
|
|
95
|
+
.iter()
|
|
96
|
+
.enumerate()
|
|
97
|
+
.filter(|(_, t)| &t.from == state)
|
|
98
|
+
.map(|(i, _)| i),
|
|
99
|
+
);
|
|
100
|
+
}
|
|
101
|
+
fn next_state(&self, state: &String, action: usize) -> Option<String> {
|
|
102
|
+
self.transitions
|
|
103
|
+
.get(action)
|
|
104
|
+
.filter(|t| &t.from == state)
|
|
105
|
+
.map(|t| t.to.clone())
|
|
106
|
+
}
|
|
107
|
+
fn properties(&self) -> Vec<Property<Self>> {
|
|
108
|
+
vec![Property::always("requirements", |m: &Self, s: &String| {
|
|
109
|
+
m.violations(s).is_empty()
|
|
110
|
+
&& (!m.check_deadlocks || m.transitions.iter().any(|t| &t.from == s))
|
|
111
|
+
})]
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
#[derive(Serialize)]
|
|
115
|
+
#[serde(rename_all = "camelCase")]
|
|
116
|
+
pub struct Report {
|
|
117
|
+
pub schema_version: u8,
|
|
118
|
+
pub verifier: &'static str,
|
|
119
|
+
pub input_sha256: String,
|
|
120
|
+
pub status: &'static str,
|
|
121
|
+
pub complete: bool,
|
|
122
|
+
pub explored_states: usize,
|
|
123
|
+
pub violated_invariants: Vec<String>,
|
|
124
|
+
pub deadlock: bool,
|
|
125
|
+
pub counterexample: Option<Vec<String>>,
|
|
126
|
+
pub actions: Option<Vec<String>>,
|
|
127
|
+
}
|
|
128
|
+
pub fn check(bytes: &[u8]) -> Result<Report, String> {
|
|
129
|
+
let model = Spec::parse(bytes)?;
|
|
130
|
+
let checker = model.clone().checker().threads(1).spawn_bfs().join();
|
|
131
|
+
let path = checker.discovery("requirements");
|
|
132
|
+
let violated = path
|
|
133
|
+
.as_ref()
|
|
134
|
+
.map(|p| model.violations(p.last_state()))
|
|
135
|
+
.unwrap_or_default();
|
|
136
|
+
let deadlock = path.as_ref().is_some_and(|p| {
|
|
137
|
+
model.check_deadlocks && !model.transitions.iter().any(|t| &t.from == p.last_state())
|
|
138
|
+
});
|
|
139
|
+
let complete = path.is_none() && checker.is_done();
|
|
140
|
+
Ok(Report {
|
|
141
|
+
schema_version: 1,
|
|
142
|
+
verifier: "stateright",
|
|
143
|
+
input_sha256: format!("{:x}", Sha256::digest(bytes)),
|
|
144
|
+
status: if path.is_some() {
|
|
145
|
+
"failed"
|
|
146
|
+
} else if complete {
|
|
147
|
+
"passed"
|
|
148
|
+
} else {
|
|
149
|
+
"unverified"
|
|
150
|
+
},
|
|
151
|
+
complete,
|
|
152
|
+
explored_states: checker.unique_state_count(),
|
|
153
|
+
violated_invariants: violated,
|
|
154
|
+
deadlock,
|
|
155
|
+
counterexample: path.clone().map(|p| p.into_states()),
|
|
156
|
+
actions: path.map(|p| {
|
|
157
|
+
p.into_actions()
|
|
158
|
+
.into_iter()
|
|
159
|
+
.map(|i| model.transitions[i].action.clone())
|
|
160
|
+
.collect()
|
|
161
|
+
}),
|
|
162
|
+
})
|
|
163
|
+
}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
use std::{fs::File, io::Read, process::ExitCode};
|
|
2
|
+
fn main() -> ExitCode {
|
|
3
|
+
let args: Vec<_> = std::env::args().skip(1).collect();
|
|
4
|
+
if args == ["--protocol"] {
|
|
5
|
+
println!("{{\"name\":\"modkh-stateright\",\"schemaVersion\":1}}");
|
|
6
|
+
return ExitCode::SUCCESS;
|
|
7
|
+
}
|
|
8
|
+
if args == ["--version"] {
|
|
9
|
+
println!("modkh-stateright {}", env!("CARGO_PKG_VERSION"));
|
|
10
|
+
return ExitCode::SUCCESS;
|
|
11
|
+
}
|
|
12
|
+
let run = || -> Result<_, String> {
|
|
13
|
+
if args.len() != 2 || args[0] != "--check" {
|
|
14
|
+
return Err("Usage: modkh-stateright --check model.json".into());
|
|
15
|
+
}
|
|
16
|
+
let mut bytes = vec![];
|
|
17
|
+
File::open(&args[1])
|
|
18
|
+
.map_err(|e| e.to_string())?
|
|
19
|
+
.take(262145)
|
|
20
|
+
.read_to_end(&mut bytes)
|
|
21
|
+
.map_err(|e| e.to_string())?;
|
|
22
|
+
modkh_stateright::check(&bytes)
|
|
23
|
+
};
|
|
24
|
+
match run() {
|
|
25
|
+
Ok(report) => {
|
|
26
|
+
println!("{}", serde_json::to_string(&report).expect("report"));
|
|
27
|
+
ExitCode::from(match report.status {
|
|
28
|
+
"passed" => 0,
|
|
29
|
+
"failed" => 1,
|
|
30
|
+
_ => 2,
|
|
31
|
+
})
|
|
32
|
+
}
|
|
33
|
+
Err(e) => {
|
|
34
|
+
eprintln!("Invalid model: {e}");
|
|
35
|
+
ExitCode::from(2)
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|