@openai/codex-security 0.1.28 → 0.1.30
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 +93 -4
- package/_bundled_plugin/examples/completed-scan/report.md +0 -1
- package/_bundled_plugin/mcp/native/win32-arm64/windows.node +0 -0
- package/_bundled_plugin/mcp/native/win32-x64/windows.node +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-000 +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-001 +0 -0
- package/_bundled_plugin/scripts/finalize_scan_contract.py +2 -0
- package/_bundled_plugin/scripts/generate_in_scope_files.py +12 -2
- package/_bundled_plugin/scripts/generate_rank_input.py +1 -6
- package/_bundled_plugin/scripts/rank_preview.py +8 -7
- package/_bundled_plugin/scripts/report_projection.py +0 -1
- package/_bundled_plugin/scripts/workbench_dashboard.py +24 -3
- package/_bundled_plugin/scripts/workbench_saved_results.py +5 -0
- package/dist/cli-scan-logs-json.d.ts +3 -0
- package/dist/cli-scan-logs-json.d.ts.map +1 -0
- package/dist/cli-scan-logs-json.js +22 -0
- package/dist/cli-scan-logs-json.js.map +1 -0
- package/dist/cli.d.ts +2 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +206 -34
- package/dist/cli.js.map +1 -1
- package/dist/deduplication/codex-review.d.ts +2 -7
- package/dist/deduplication/codex-review.d.ts.map +1 -1
- package/dist/deduplication/codex-review.js +26 -4
- package/dist/deduplication/codex-review.js.map +1 -1
- package/dist/deduplication/deduplication-prompts.d.ts +2 -0
- package/dist/deduplication/deduplication-prompts.d.ts.map +1 -1
- package/dist/deduplication/deduplication-prompts.js +2 -2
- package/dist/deduplication/deduplication-prompts.js.map +1 -1
- package/dist/deduplication/deduplication-reviewer.d.ts.map +1 -1
- package/dist/deduplication/deduplication-reviewer.js +4 -10
- package/dist/deduplication/deduplication-reviewer.js.map +1 -1
- package/dist/deduplication/deduplication.d.ts +12 -1
- package/dist/deduplication/deduplication.d.ts.map +1 -1
- package/dist/deduplication/deduplication.js +41 -7
- package/dist/deduplication/deduplication.js.map +1 -1
- package/dist/deduplication/finding-schema.d.ts +4 -0
- package/dist/deduplication/finding-schema.d.ts.map +1 -0
- package/dist/deduplication/finding-schema.js +14 -0
- package/dist/deduplication/finding-schema.js.map +1 -0
- package/dist/deduplication/records-protocol.d.ts +9 -0
- package/dist/deduplication/records-protocol.d.ts.map +1 -0
- package/dist/deduplication/records-protocol.js +191 -0
- package/dist/deduplication/records-protocol.js.map +1 -0
- package/dist/deduplication/records.d.ts +33 -0
- package/dist/deduplication/records.d.ts.map +1 -0
- package/dist/deduplication/records.js +134 -0
- package/dist/deduplication/records.js.map +1 -0
- package/dist/deduplication/refusal.d.ts +3 -0
- package/dist/deduplication/refusal.d.ts.map +1 -0
- package/dist/deduplication/refusal.js +16 -0
- package/dist/deduplication/refusal.js.map +1 -0
- package/dist/deduplication/review.d.ts +21 -0
- package/dist/deduplication/review.d.ts.map +1 -0
- package/dist/deduplication/review.js +2 -0
- package/dist/deduplication/review.js.map +1 -0
- package/dist/errors.d.ts +1 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/scan-logs.d.ts.map +1 -1
- package/dist/scan-logs.js +34 -8
- package/dist/scan-logs.js.map +1 -1
- package/dist/server/dashboard/THIRD_PARTY_NOTICES.txt +3 -3
- package/dist/server/dashboard/app.css +1 -1
- package/dist/server/dashboard/app.js +7 -7
- package/dist/server/dashboard-types.d.ts +4 -1
- package/dist/server/dashboard-types.d.ts.map +1 -1
- package/dist/server/dashboard-types.js.map +1 -1
- package/dist/server/dashboard.d.ts.map +1 -1
- package/dist/server/dashboard.js +18 -4
- package/dist/server/dashboard.js.map +1 -1
- package/dist/targets.d.ts.map +1 -1
- package/dist/targets.js +4 -4
- package/dist/targets.js.map +1 -1
- package/docs/dedupe-records.md +305 -0
- package/package.json +14 -13
package/README.md
CHANGED
|
@@ -587,6 +587,26 @@ Scans are report-only by default. Set `--fail-on-severity high` to exit with
|
|
|
587
587
|
`1` if a completed scan finds high or critical issues. Incomplete scans exit
|
|
588
588
|
with `2`, writing available results to stdout and a coverage warning to stderr.
|
|
589
589
|
|
|
590
|
+
For machine-readable scan output (`--format json` or `--format jsonl`), a scan
|
|
591
|
+
execution failure writes one structured object to stdout:
|
|
592
|
+
|
|
593
|
+
```json
|
|
594
|
+
{
|
|
595
|
+
"status": "failed",
|
|
596
|
+
"code": "SCAN_FAILED",
|
|
597
|
+
"message": "..."
|
|
598
|
+
}
|
|
599
|
+
```
|
|
600
|
+
|
|
601
|
+
With `--full-output`, the same code and message are reported under `error` in
|
|
602
|
+
an `ok: false` envelope instead.
|
|
603
|
+
|
|
604
|
+
The command still exits with `2` for runtime, export, invalid-input, or
|
|
605
|
+
incomplete-scan failures, and human-readable diagnostics remain on stderr.
|
|
606
|
+
Use `scan --schema --format json` to discover this failure variant alongside
|
|
607
|
+
the successful scan output. Cancellation and termination retain their `130`
|
|
608
|
+
and `143` exit codes.
|
|
609
|
+
|
|
590
610
|
### Import findings as a saved scan
|
|
591
611
|
|
|
592
612
|
Import an existing findings CSV or JSON file into local scan history and SQLite:
|
|
@@ -1623,6 +1643,26 @@ Use the SDK loop for a disposition per alert.
|
|
|
1623
1643
|
files or literal text and work in the current directory. Pass a saved finding
|
|
1624
1644
|
or occurrence ID to `patch` to use its original repository.
|
|
1625
1645
|
|
|
1646
|
+
Add `--validation-prompt-file PATH` to supply custom dynamic validation
|
|
1647
|
+
instructions, using the same UTF-8 prompt file format as `scan`. The patch task
|
|
1648
|
+
uses these instructions to set up the environment, build or start the application,
|
|
1649
|
+
exercise the fix, check legitimate behavior, and clean up. Include the commands,
|
|
1650
|
+
authorized targets, expected results, and cleanup steps for your environment.
|
|
1651
|
+
The task must report validation evidence or explain which checks failed or could
|
|
1652
|
+
not run before claiming the patch is fixed or verified.
|
|
1653
|
+
|
|
1654
|
+
```bash
|
|
1655
|
+
npx @openai/codex-security patch OCCURRENCE_ID --validation-prompt-file validation.md
|
|
1656
|
+
npx @openai/codex-security patch issues.md --validation-prompt-file validation.md
|
|
1657
|
+
```
|
|
1658
|
+
|
|
1659
|
+
The flag works with saved findings, issue text/files, and Linear inputs. Relative
|
|
1660
|
+
prompt paths resolve from the directory where you invoke the CLI, including when
|
|
1661
|
+
the saved finding belongs to another repository. The file is read once before
|
|
1662
|
+
patching; missing, empty, or non-regular files fail before the patch task starts.
|
|
1663
|
+
Without the flag, the usual fix-finding verification applies. The flag does not
|
|
1664
|
+
change sandbox permissions and cannot be combined with `--resume-pr`.
|
|
1665
|
+
|
|
1626
1666
|
Add `--assess-patch-risk` to a `patch` command to run the bundled patch-risk
|
|
1627
1667
|
assessment skill once on the completed patch. The assessment is advisory and
|
|
1628
1668
|
does not change the patch or its merge state. Human-readable commands print the
|
|
@@ -1670,6 +1710,8 @@ its read-only Codex sandbox.
|
|
|
1670
1710
|
to select findings and add patch instructions. Results include a `patches`
|
|
1671
1711
|
entry per finding with status `verified`, `no_change`, `blocked`, or `failed`.
|
|
1672
1712
|
Verified and already-fixed findings no longer fail `--fail-on-severity`.
|
|
1713
|
+
Patching shows each finding's position, elapsed time, and live Codex activity.
|
|
1714
|
+
Progress goes to stderr; completed results stay in the terminal history.
|
|
1673
1715
|
|
|
1674
1716
|
`--create-pr` commits generated patch files and opens a draft GitHub pull request
|
|
1675
1717
|
with `gh` or a draft GitLab merge request with `glab`. Install and authenticate
|
|
@@ -1773,6 +1815,12 @@ cancels, resumes, publishes, edits, or deduplicates anything.
|
|
|
1773
1815
|
|
|
1774
1816
|
The dashboard opens on Findings, followed by Duplicate groups. Both views
|
|
1775
1817
|
support search, repository filtering, sorting, pagination, and record details.
|
|
1818
|
+
Click any column header to sort all matching records; click it again to reverse
|
|
1819
|
+
the order. The arrow marks the active column and direction. Changing the sort
|
|
1820
|
+
returns to the first page, and automatic refreshes keep the selected order.
|
|
1821
|
+
By default, findings sort by last update descending, then severity descending,
|
|
1822
|
+
then ID ascending to break ties. Groups sort by last update descending and ID
|
|
1823
|
+
ascending.
|
|
1776
1824
|
Findings show stored content and links to their duplicate groups. Groups link
|
|
1777
1825
|
back to their member findings, preserving separate overlapping groups and the
|
|
1778
1826
|
original finding records.
|
|
@@ -1789,7 +1837,10 @@ repository choices, a page of records, and optional selected-record details:
|
|
|
1789
1837
|
|
|
1790
1838
|
- `view`: `findings` (default) or `groups`.
|
|
1791
1839
|
- `query`, `repository`: optional search text and exact repository ID.
|
|
1792
|
-
- `sort`: `activity` (default;
|
|
1840
|
+
- `sort`: `activity` (default; last update), `newest` (created), `title`,
|
|
1841
|
+
`repository`, `severity` (findings only), or `members` (groups only).
|
|
1842
|
+
- `direction`: `asc` or `desc` (default). Text sorts alphabetically without
|
|
1843
|
+
case sensitivity, severity by level, and member counts numerically.
|
|
1793
1844
|
- `limit`, `offset`: existing pagination conventions, defaulting to 50 and 0.
|
|
1794
1845
|
- `id`: optional exact record ID to include in `detail`; unknown IDs return
|
|
1795
1846
|
`detail: null` without hiding the list.
|
|
@@ -1916,7 +1967,7 @@ console.log(receipt.repositoryId, receipt.findingIds);
|
|
|
1916
1967
|
Publish the scan with `--to custom` (or import it through the bulk API with its
|
|
1917
1968
|
`repositoryId`) before deduplicating. The
|
|
1918
1969
|
workflow reads a completed saved scan, queries candidates by finding ID, and
|
|
1919
|
-
runs Luna and Sol in the calling SDK/CLI process. Once all reviews
|
|
1970
|
+
runs Luna and Sol in the calling SDK/CLI process. Once all reviews finish,
|
|
1920
1971
|
it posts accepted groups to the service. It does not re-upload findings or
|
|
1921
1972
|
change scan artifacts.
|
|
1922
1973
|
|
|
@@ -1937,7 +1988,14 @@ has finished and none voted `DISTINCT`. It can run while unrelated Luna
|
|
|
1937
1988
|
screenings continue. Results are combined in input order so completion timing
|
|
1938
1989
|
does not change the groups.
|
|
1939
1990
|
|
|
1940
|
-
|
|
1991
|
+
An explicit model refusal keeps the affected pairs separate and allows unrelated
|
|
1992
|
+
reviews to continue. It is recorded as `NO_DECISION`, not a reviewed `DISTINCT`
|
|
1993
|
+
verdict. A screening refusal applies to every anchor/candidate pair in that
|
|
1994
|
+
screening; a pair-review refusal applies only to its assigned pair. Neither pair
|
|
1995
|
+
can be merged indirectly through other findings. Recognized policy errors and
|
|
1996
|
+
explicit refusal responses are not retried or sent to another model.
|
|
1997
|
+
|
|
1998
|
+
If another kind of job fails after its retries, queued jobs stop and already running jobs
|
|
1941
1999
|
finish before the command reports the failure. No groups are posted from an
|
|
1942
2000
|
incomplete review. To retain completed reviews across runs, use a
|
|
1943
2001
|
`--workflow-id` as described below.
|
|
@@ -2001,6 +2059,31 @@ has the highest reported severity; ties use finding ID. Results do not delete,
|
|
|
2001
2059
|
merge, or change stored finding documents. Accepted groups are saved as durable
|
|
2002
2060
|
associations in the service before `deduplicationStatus` becomes `completed`.
|
|
2003
2061
|
|
|
2062
|
+
When any review is refused, the result instead has
|
|
2063
|
+
`deduplicationStatus: "completed_with_refusals"` and a `refusals` array. Each
|
|
2064
|
+
entry contains `decision: "NO_DECISION"`, `stage`, `model`, `findingIds`, and
|
|
2065
|
+
`reason`. For screening, the first finding ID is the anchor and the remaining
|
|
2066
|
+
IDs are its candidates. The CLI logs each refusal to stderr and exits
|
|
2067
|
+
successfully after saving the accepted groups. SDK callers can inspect and log
|
|
2068
|
+
the same structured entries. Findings retained because of a refusal are not
|
|
2069
|
+
confirmed unique. Successful runs without refusals keep their existing output
|
|
2070
|
+
shape. No command, flag, or default changes are required.
|
|
2071
|
+
|
|
2072
|
+
This behavior applies to post-scan Luna/Sol deduplication. Deep Scan's internal
|
|
2073
|
+
reducer uses a separate workflow.
|
|
2074
|
+
|
|
2075
|
+
### Host-provided records deduplication
|
|
2076
|
+
|
|
2077
|
+
`codex-security dedupe --records` accepts a versioned JSON-RPC run over stdin
|
|
2078
|
+
and emits serial `review.run` requests on stdout for a host-provided model
|
|
2079
|
+
backend. It requires no saved scan or Findings API and performs no local model
|
|
2080
|
+
execution or persistence. The SDK exposes `deduplicateRecords(input,
|
|
2081
|
+
{ reviewRunner, signal })`. The input contains original observations and explicit candidate links. Results
|
|
2082
|
+
contain groups of observation IDs and unresolved observations.
|
|
2083
|
+
|
|
2084
|
+
See the [records protocol and Python fake-host example](docs/dedupe-records.md)
|
|
2085
|
+
for the complete input, review contract, cancellation, and persistence rules.
|
|
2086
|
+
|
|
2004
2087
|
### Stored duplicate groups
|
|
2005
2088
|
|
|
2006
2089
|
`POST /v1/dedupe-groups` accepts a batch of explicitly reviewed member sets:
|
|
@@ -2102,10 +2185,16 @@ exponential backoff with jitter; HTTP retries honor `Retry-After`. Waiting to re
|
|
|
2102
2185
|
occupies the job's concurrency slot.
|
|
2103
2186
|
|
|
2104
2187
|
Cancellation, authentication or configuration errors, permanent HTTP errors, and
|
|
2105
|
-
required-source-access blockers are not retried.
|
|
2188
|
+
required-source-access blockers are not retried. Model refusals continue with
|
|
2189
|
+
`NO_DECISION` as described above. Other exhausted retries fail deduplication;
|
|
2106
2190
|
invalid or unfinished reviews are not cached. Completed checkpoints remain
|
|
2107
2191
|
available when the workflow resumes.
|
|
2108
2192
|
|
|
2193
|
+
Refusals are not saved as validated review checkpoints. A completed workflow
|
|
2194
|
+
retains its final `completed_with_refusals` result, including all refusal entries,
|
|
2195
|
+
and returns it on subsequent calls. To attempt those reviews again after
|
|
2196
|
+
resolving the refusal, run dedupe without that workflow ID or with a new one.
|
|
2197
|
+
|
|
2109
2198
|
Checkpoints bind to the exact original records and ordering, approved source path,
|
|
2110
2199
|
Git revision and current file contents (including ignored files), repository scope,
|
|
2111
2200
|
model and reasoning settings, Codex configuration and version, and prompt/contract version. Changed
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -2679,6 +2679,8 @@ def _prepare_scan_finalization(
|
|
|
2679
2679
|
else _read_scan_local_json(scan_dir, "scan-manifest.json", "scan-manifest.json")
|
|
2680
2680
|
)
|
|
2681
2681
|
scan = _require_dict(manifest, "scan", "manifest")
|
|
2682
|
+
if scan.get("sealedAt") is None and scan.get("artifacts") == []:
|
|
2683
|
+
del scan["artifacts"]
|
|
2682
2684
|
was_sealed = scan.get("sealedAt") is not None or scan.get("artifacts") is not None
|
|
2683
2685
|
if not was_sealed:
|
|
2684
2686
|
_populate_unsealed_manifest_envelope(manifest, scan, completion_binding)
|
|
@@ -86,6 +86,7 @@ def generate_in_scope_files(repository: Path, scope: str, output: Path) -> int:
|
|
|
86
86
|
command = [
|
|
87
87
|
"rg",
|
|
88
88
|
"--files",
|
|
89
|
+
"--null",
|
|
89
90
|
"--hidden",
|
|
90
91
|
"--path-separator",
|
|
91
92
|
"/",
|
|
@@ -138,10 +139,19 @@ def generate_in_scope_files(repository: Path, scope: str, output: Path) -> int:
|
|
|
138
139
|
for path in tracked.stdout.split(b"\0"):
|
|
139
140
|
candidate = repository / os.fsdecode(path)
|
|
140
141
|
if path and candidate.is_file() and not candidate.is_symlink():
|
|
141
|
-
inventory.write(prefix + path + b"\
|
|
142
|
+
inventory.write(prefix + path + b"\0")
|
|
142
143
|
|
|
143
144
|
inventory.seek(0)
|
|
144
|
-
rows =
|
|
145
|
+
rows: list[bytes] = []
|
|
146
|
+
for path in inventory.read().split(b"\0"):
|
|
147
|
+
if not path:
|
|
148
|
+
continue
|
|
149
|
+
if b"\n" in path or b"\r" in path:
|
|
150
|
+
raise InventoryError(
|
|
151
|
+
"Repository contains a path that cannot fit in the file inventory"
|
|
152
|
+
)
|
|
153
|
+
rows.append(path + b"\n")
|
|
154
|
+
rows.sort()
|
|
145
155
|
|
|
146
156
|
return write_inventory(output, rows)
|
|
147
157
|
|
|
@@ -124,7 +124,6 @@ EXCLUDED_FILENAMES = {
|
|
|
124
124
|
SHARD_INPUT_GLOB = "rank-shard-*.input.jsonl"
|
|
125
125
|
SHARD_OUTPUT_GLOB = "rank-shard-*.output.jsonl"
|
|
126
126
|
SHARD_INPUT_PATTERN = re.compile(r"^rank-shard-([0-9]{4,})\.input\.jsonl$")
|
|
127
|
-
DIRECT_SCOPE_PREVIEW_READ_BYTES = 64 * 1024
|
|
128
127
|
RANK_POOL_PLAN_SCHEMA_VERSION = 1
|
|
129
128
|
RANK_POOL_STRATEGY = "round_robin"
|
|
130
129
|
RANK_POOL_WORKER_CAP = 6
|
|
@@ -507,11 +506,7 @@ def make_repo_rank_input(args: argparse.Namespace) -> None:
|
|
|
507
506
|
):
|
|
508
507
|
preview = ""
|
|
509
508
|
else:
|
|
510
|
-
preview, is_binary = preview_for(
|
|
511
|
-
path,
|
|
512
|
-
args.preview_bytes,
|
|
513
|
-
max_read_bytes=DIRECT_SCOPE_PREVIEW_READ_BYTES if directly_requested else None,
|
|
514
|
-
)
|
|
509
|
+
preview, is_binary = preview_for(path, args.preview_bytes)
|
|
515
510
|
if is_binary and not directly_requested:
|
|
516
511
|
continue
|
|
517
512
|
rows_by_path.setdefault(
|
|
@@ -9,6 +9,7 @@ import re
|
|
|
9
9
|
from pathlib import Path
|
|
10
10
|
|
|
11
11
|
DEFAULT_PREVIEW_BYTES = 1024
|
|
12
|
+
DEFAULT_PREVIEW_READ_BYTES = 64 * 1024
|
|
12
13
|
PREVIEW_HEAD_LINES = 12
|
|
13
14
|
PREVIEW_SAMPLE_LINES = 10
|
|
14
15
|
_UTF16_BOMS = (b"\xff\xfe", b"\xfe\xff")
|
|
@@ -56,6 +57,7 @@ TEXT_CODE_EXTENSIONS = {
|
|
|
56
57
|
".sh",
|
|
57
58
|
".sql",
|
|
58
59
|
".swift",
|
|
60
|
+
".tf",
|
|
59
61
|
".toml",
|
|
60
62
|
".ts",
|
|
61
63
|
".tsx",
|
|
@@ -948,18 +950,17 @@ def structural_outline(path: Path, text: str) -> list[str]:
|
|
|
948
950
|
|
|
949
951
|
|
|
950
952
|
def preview_for(
|
|
951
|
-
path: Path, preview_bytes: int, *, max_read_bytes: int
|
|
953
|
+
path: Path, preview_bytes: int, *, max_read_bytes: int = DEFAULT_PREVIEW_READ_BYTES
|
|
952
954
|
) -> tuple[str, bool]:
|
|
955
|
+
"""Preview the first 64 KiB by default, including the binary-detection sample."""
|
|
956
|
+
if max_read_bytes <= 0:
|
|
957
|
+
raise ValueError("max_read_bytes must be positive")
|
|
953
958
|
try:
|
|
954
959
|
with path.open("rb") as source:
|
|
955
|
-
sample = source.read(4096)
|
|
960
|
+
sample = source.read(min(4096, max_read_bytes))
|
|
956
961
|
if is_binary_sample(sample):
|
|
957
962
|
return "", True
|
|
958
|
-
remaining = (
|
|
959
|
-
source.read()
|
|
960
|
-
if max_read_bytes is None
|
|
961
|
-
else source.read(max(0, max_read_bytes - len(sample)))
|
|
962
|
-
)
|
|
963
|
+
remaining = source.read(max_read_bytes - len(sample))
|
|
963
964
|
data = sample + remaining
|
|
964
965
|
except OSError:
|
|
965
966
|
return "", True
|
|
@@ -822,7 +822,6 @@ def build_report_markdown(
|
|
|
822
822
|
f"- Inventory strategy: {coverage['inventoryStrategy']}",
|
|
823
823
|
f"- Included paths: {', '.join(include_paths) or 'none'}",
|
|
824
824
|
f"- Excluded paths: {', '.join(exclude_paths) or 'none'}",
|
|
825
|
-
f"- Runtime or test status: {_text(scope.get('runtimeStatus'), 'not recorded')}",
|
|
826
825
|
]
|
|
827
826
|
artifacts_reviewed = _strings(scope.get("artifactsReviewed"))
|
|
828
827
|
if artifacts_reviewed:
|
|
@@ -40,10 +40,24 @@ RECORDS = {
|
|
|
40
40
|
"groups": GROUP_RECORDS,
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
+
SORT_COLUMNS = {
|
|
44
|
+
"activity": "updatedAt",
|
|
45
|
+
"newest": "createdAt",
|
|
46
|
+
"title": "casefold(title)",
|
|
47
|
+
"repository": "casefold(repository_label(repositoryIds))",
|
|
48
|
+
"severity": "CASE severity WHEN 'informational' THEN 0 WHEN 'low' THEN 1 "
|
|
49
|
+
"WHEN 'medium' THEN 2 WHEN 'high' THEN 3 WHEN 'critical' THEN 4 END",
|
|
50
|
+
"members": "memberCount",
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
|
|
54
|
+
def repository_ids(value: str) -> list[str]:
|
|
55
|
+
return sorted(json.loads(value), key=lambda name: (name.casefold(), name))
|
|
56
|
+
|
|
43
57
|
|
|
44
58
|
def item(row: sqlite3.Row) -> dict[str, Any]:
|
|
45
59
|
result = dict(row)
|
|
46
|
-
result["repositoryIds"] =
|
|
60
|
+
result["repositoryIds"] = repository_ids(result["repositoryIds"])
|
|
47
61
|
return result
|
|
48
62
|
|
|
49
63
|
|
|
@@ -77,10 +91,13 @@ def dashboard(connection: sqlite3.Connection, query: dict[str, Any]) -> dict[str
|
|
|
77
91
|
"""One snapshot, no artifact reads, model calls, or writes."""
|
|
78
92
|
view = query["view"]
|
|
79
93
|
records = RECORDS[view]
|
|
94
|
+
connection.create_function("casefold", 1, str.casefold, deterministic=True)
|
|
95
|
+
connection.create_function(
|
|
96
|
+
"repository_label", 1, lambda value: ", ".join(repository_ids(value)), deterministic=True
|
|
97
|
+
)
|
|
80
98
|
clauses: list[str] = []
|
|
81
99
|
values: list[Any] = []
|
|
82
100
|
if query.get("query"):
|
|
83
|
-
connection.create_function("casefold", 1, str.casefold, deterministic=True)
|
|
84
101
|
columns = ["id", "title", "repositoryIds"]
|
|
85
102
|
clauses.append(
|
|
86
103
|
"("
|
|
@@ -92,7 +109,11 @@ def dashboard(connection: sqlite3.Connection, query: dict[str, Any]) -> dict[str
|
|
|
92
109
|
clauses.append("EXISTS (SELECT 1 FROM json_each(repositoryIds) WHERE value = ?)")
|
|
93
110
|
values.append(query["repository"])
|
|
94
111
|
where = " WHERE " + " AND ".join(clauses) if clauses else ""
|
|
95
|
-
|
|
112
|
+
direction = {"asc": "ASC", "desc": "DESC"}[query.get("direction", "desc")]
|
|
113
|
+
order = f"{SORT_COLUMNS[query['sort']]} {direction}"
|
|
114
|
+
if view == "findings" and query["sort"] == "activity":
|
|
115
|
+
order += f", {SORT_COLUMNS['severity']} DESC"
|
|
116
|
+
order += ", id"
|
|
96
117
|
connection.execute("BEGIN")
|
|
97
118
|
with connection:
|
|
98
119
|
repositories = connection.execute("""
|
|
@@ -685,6 +685,11 @@ def merge_saved_results(
|
|
|
685
685
|
"deferred": [],
|
|
686
686
|
}
|
|
687
687
|
)
|
|
688
|
+
if isinstance(coverage.get("openQuestions"), list):
|
|
689
|
+
coverage["openQuestions"] = [
|
|
690
|
+
{"question": item.strip()} if isinstance(item, str) else item
|
|
691
|
+
for item in coverage["openQuestions"]
|
|
692
|
+
]
|
|
688
693
|
canonical_rows = (
|
|
689
694
|
{
|
|
690
695
|
id(item)
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli-scan-logs-json.d.ts","sourceRoot":"","sources":["../src/cli-scan-logs-json.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAIxD,wBAAuB,YAAY,CACjC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,EACnD,GAAG,CAAC,EAAE,OAAO,GACZ,cAAc,CAAC,UAAU,CAAC,CAsB5B"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Formatter } from "incur";
|
|
2
|
+
// Format records separately: a saved log document can exceed the runtime's
|
|
3
|
+
// maximum string length even though each session and event fits comfortably.
|
|
4
|
+
export async function* scanLogsJson(logs, cta) {
|
|
5
|
+
yield Buffer.from(`{\n "scanId": ${JSON.stringify(logs.scanId)},\n "threadId": ${JSON.stringify(logs.threadId)}`);
|
|
6
|
+
for (const key of ["sessions", "events"]) {
|
|
7
|
+
yield Buffer.from(`,\n "${key}": [`);
|
|
8
|
+
let first = true;
|
|
9
|
+
for (const record of logs[key]) {
|
|
10
|
+
const formatted = Formatter.format(record, "json").replaceAll("\n", "\n ");
|
|
11
|
+
yield Buffer.from(`${first ? "\n" : ",\n"} ${formatted}`);
|
|
12
|
+
first = false;
|
|
13
|
+
}
|
|
14
|
+
yield Buffer.from(first ? "]" : "\n ]");
|
|
15
|
+
}
|
|
16
|
+
if (cta !== undefined) {
|
|
17
|
+
const formatted = Formatter.format(cta, "json").replaceAll("\n", "\n ");
|
|
18
|
+
yield Buffer.from(`,\n "cta": ${formatted}`);
|
|
19
|
+
}
|
|
20
|
+
yield Buffer.from("\n}\n");
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=cli-scan-logs-json.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli-scan-logs-json.js","sourceRoot":"","sources":["../src/cli-scan-logs-json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGlC,2EAA2E;AAC3E,6EAA6E;AAC7E,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,YAAY,CACjC,IAAmD,EACnD,GAAa;IAEb,MAAM,MAAM,CAAC,IAAI,CACf,kBAAkB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CACjG,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAU,EAAE,CAAC;QAClD,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,CAAC;QACtC,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,UAAU,CAC3D,IAAI,EACJ,QAAQ,CACT,CAAC;YACF,MAAM,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,SAAS,EAAE,CAAC,CAAC;YAC7D,KAAK,GAAG,KAAK,CAAC;QAChB,CAAC;QACD,MAAM,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzE,MAAM,MAAM,CAAC,IAAI,CAAC,eAAe,SAAS,EAAE,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC","sourcesContent":["import { Formatter } from \"incur\";\nimport type { readSavedScanLogs } from \"./scan-logs.js\";\n\n// Format records separately: a saved log document can exceed the runtime's\n// maximum string length even though each session and event fits comfortably.\nexport async function* scanLogsJson(\n logs: Awaited<ReturnType<typeof readSavedScanLogs>>,\n cta?: unknown,\n): AsyncGenerator<Uint8Array> {\n yield Buffer.from(\n `{\\n \"scanId\": ${JSON.stringify(logs.scanId)},\\n \"threadId\": ${JSON.stringify(logs.threadId)}`,\n );\n for (const key of [\"sessions\", \"events\"] as const) {\n yield Buffer.from(`,\\n \"${key}\": [`);\n let first = true;\n for (const record of logs[key]) {\n const formatted = Formatter.format(record, \"json\").replaceAll(\n \"\\n\",\n \"\\n \",\n );\n yield Buffer.from(`${first ? \"\\n\" : \",\\n\"} ${formatted}`);\n first = false;\n }\n yield Buffer.from(first ? \"]\" : \"\\n ]\");\n }\n if (cta !== undefined) {\n const formatted = Formatter.format(cta, \"json\").replaceAll(\"\\n\", \"\\n \");\n yield Buffer.from(`,\\n \"cta\": ${formatted}`);\n }\n yield Buffer.from(\"\\n}\\n\");\n}\n"]}
|
package/dist/cli.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
+
import { Readable } from "node:stream";
|
|
2
3
|
import { CodexSecurity, type ScanAuthMode, type ScanAuthentication } from "./api.js";
|
|
3
4
|
import { publishScanToCustom } from "./custom-publish.js";
|
|
4
5
|
import { deduplicateScanInternal } from "./deduplication/scan.js";
|
|
@@ -89,6 +90,7 @@ interface CliDependencies {
|
|
|
89
90
|
deduplicateScan?: typeof deduplicateScanInternal;
|
|
90
91
|
classifyScanSeverity?: typeof classifyScanSeverityInternal;
|
|
91
92
|
classifyScanDirectorySeverity?: typeof classifyScanDirectorySeverityInternal;
|
|
93
|
+
recordsInput?: Readable;
|
|
92
94
|
publishFindingsCsvToCloud?: typeof publishFindingsCsvToCloud;
|
|
93
95
|
publishScanToCloud?: typeof publishScanToCloud;
|
|
94
96
|
publishScanToCustom?: typeof publishScanToCustom;
|
package/dist/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AA0CA,OAAO,EAAE,QAAQ,EAA4B,MAAM,aAAa,CAAC;AAOjE,OAAO,EAEL,aAAa,EAWb,KAAK,YAAY,EACjB,KAAK,kBAAkB,EAGxB,MAAM,UAAU,CAAC;AASlB,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EACL,4BAA4B,EAC5B,qCAAqC,EACtC,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EACL,yBAAyB,EACzB,kBAAkB,EAEnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAGL,KAAK,6BAA6B,EAClC,KAAK,cAAc,EACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAcL,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC1B,KAAK,UAAU,EAEhB,MAAM,aAAa,CAAC;AAyBrB,OAAO,EAEL,8BAA8B,EAC/B,MAAM,aAAa,CAAC;AACrB,OAAO,EAKL,KAAK,mBAAmB,EACzB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,OAAO,EAAiB,MAAM,aAAa,CAAC;AAE1D,OAAO,EAAuB,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAK1E,OAAO,EACL,oBAAoB,EAEpB,WAAW,EAIZ,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,UAAU,EAA0B,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAeL,KAAK,YAAY,EAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EAKL,KAAK,iBAAiB,EAIvB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,6BAA6B,EAC7B,KAAK,yBAAyB,EAC/B,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAK7C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,cAAc,EACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAarD,OAAO,EAOL,KAAK,YAAY,EAElB,MAAM,cAAc,CAAC;AAatB,OAAO,EAAqB,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAgCxE,KAAK,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG;IAClD,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC;IAC/D,GAAG,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC;IAChE,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AACF,KAAK,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC;AAGvC,QAAA,MAAM,uBAAuB,YAC3B,SAAS,EACT,KAAK,EACL,QAAQ,EACR,MAAM,EACN,OAAO,EACP,KAAK,CACG,CAAC;AACX,KAAK,mBAAmB,GAAG,CAAC,OAAO,uBAAuB,CAAC,CAAC,MAAM,CAAC,CAAC;AAcpE,QAAA,MAAM,sBAAsB;aAC1B,GAAG,EAAE,cAAc;aACnB,IAAI,EAAE,eAAe;aACrB,KAAK,EAAE,eAAe;CACd,CAAC;AA4oBX,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAE7E;AAyCD,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,OAAO,sBAAsB,CAAC;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAUD,KAAK,iBAAiB,GAAG,OAAO,CAC9B,yBAAyB,EACvB,OAAO,6BAA6B,CAAC,WAAW,GAChD,OAAO,6BAA6B,CAAC,UAAU,CAClD,CAAC;AAEF,UAAU,kBAAkB;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,UAAU,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,GAAG,YAAY,CAAC;IACtD,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE;QACnB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAC;QACzC,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,iBAAiB,CAAC;QACnD,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;QACnC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,IAAI,CAAC;KACvE,CAAC;CACH;AA8DD,UAAU,gBAAgB;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,MAAM,EAAE,mBAAmB,GAAG,SAAS,CAAC;CACzC;AAED,UAAU,eAAe;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB;AAMD,UAAU,eAAe;IACvB,cAAc,CACZ,MAAM,EAAE,mBAAmB,GAC1B,IAAI,CAAC,aAAa,EAAE,KAAK,GAAG,WAAW,GAAG,OAAO,CAAC,CAAC;IACtD,oBAAoB,CAAC,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,cAAc,CAAC;IACvE,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC;IAC/B,yBAAyB,CAAC,EAAE,CAC1B,WAAW,EAAE,MAAM,CAAC,UAAU,KAC3B,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,sBAAsB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACpE,wBAAwB,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,eAAe,GAAG,QAAQ,CAAC,CAAC;IAC5E,SAAS,CAAC,EAAE,qBAAqB,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACpE,aAAa,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,eAAe,GAAG,QAAQ,CAAC,GAC9D,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC;IAC5C,oBAAoB,CAAC,EAAE,OAAO,oBAAoB,CAAC;IACnD,WAAW,CAAC,EAAE,OAAO,WAAW,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,uBAAuB,CAAC;IACjD,oBAAoB,CAAC,EAAE,OAAO,4BAA4B,CAAC;IAC3D,6BAA6B,CAAC,EAAE,OAAO,qCAAqC,CAAC;IAC7E,YAAY,CAAC,EAAE,QAAQ,CAAC;IACxB,yBAAyB,CAAC,EAAE,OAAO,yBAAyB,CAAC;IAC7D,kBAAkB,CAAC,EAAE,OAAO,kBAAkB,CAAC;IAC/C,mBAAmB,CAAC,EAAE,OAAO,mBAAmB,CAAC;IACjD,YAAY,CAAC,EAAE,OAAO,YAAY,CAAC;IACnC,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5D,WAAW,CAAC,EAAE,CACZ,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,SAAS,OAAO,EAAE,KACzB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IACpC,gBAAgB,IAAI,MAAM,CAAC;IAC3B,GAAG,IAAI,MAAM,CAAC;IACd,WAAW,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;IACxE,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IAC3C,iBAAiB,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAClE,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IACrE,kBAAkB,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1D,mBAAmB,CAAC,IAAI,IAAI,CAAC;IAC7B,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IACpC,cAAc,CACZ,UAAU,EAAE,eAAe,EAC3B,MAAM,CAAC,EAAE,QAAQ,GAChB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IACnC,QAAQ,CACN,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,WAAW,CAAC,EAAE,MAAM,CAAC,UAAU,EAC/B,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAAC;IACnB,oBAAoB,CAClB,OAAO,EAAE,KAAK,GAAG,IAAI,GAAG,MAAM,EAC9B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;KAAE,GAC5D,OAAO,CAAC,MAAM,CAAC,CAAC;IACnB,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;IAC1E,QAAQ,CAAC,EAAE,6BAA6B,CAAC;IACzC,cAAc,CAAC,EAAE,OAAO,cAAc,CAAC;IACvC,YAAY,CAAC,EAAE,mBAAmB,CAAC;IACnC,kBAAkB,CAAC,EAAE,OAAO,8BAA8B,CAAC;IAC3D,UAAU,CAAC,EAAE,OAAO,UAAU,CAAC;IAC/B,YAAY,CACV,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,KAAK,CAAC,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,CAAC,CAAC;IACvB,aAAa,EAAE,OAAO,iBAAiB,CAAC;IACxC,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAAC;CACxE;AAuKD,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,OAAO,GAAE,YAAoC,EAC7C,kBAAkB,GAAE,MAAM,CAAC,UAAwB,EACnD,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAyUjB;AA2CD,wBAAgB,iBAAiB,CAC/B,WAAW,GAAE,MAAM,CAAC,UAAwB,GAC3C,MAAM,CAAC,UAAU,CAsBnB;AAED,wBAAsB,IAAI,CACxB,IAAI,GAAE,SAAS,MAAM,EAA0B,EAC/C,MAAM,GAAE,QAAyB,EACjC,WAAW,GAAE,QAAyB,EACtC,YAAY,GAAE,eAAsC,GACnD,OAAO,CAAC,MAAM,CAAC,CAu/HjB;AA+oDD,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,EACtC,SAAS,CAAC,EAAE;IACV,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAC;IACzC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC;IACtC,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,iBAAiB,CAAC;IACnD,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,IAAI,CAAC;CACvE,GACA,OAAO,CAAC;IACT,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC,CA8RD;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,UAAU,GAAG,OAAO,GAAG,YAAY,EAC5C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,cAAc,GAAE,kBAAkB,GAAG,IAAW,GAC/C,MAAM,CAyBR;AAo9CD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,SAAS,MAAM,EAAE,EACzB,KAAK,CAAC,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,mBAAmB,EAC5B,QAAQ,CAAC,EAAE,QAAQ,GAAG,gBAAgB,GAAG,qBAAqB,EAC9D,QAAQ,CAAC,EAAE,UAAU,GACpB,UAAU,CAqFZ;AAwBD,qBAAa,QAAQ;;IAiBnB,YACE,MAAM,GAAE,QAAyB,EACjC,YAAY,GAAE,IAAI,CAChB,eAAe,EACf,KAAK,GAAG,aAAa,GAAG,eAAe,CACjB,EACxB,WAAW,UAAO,EAMnB;IAED,IAAW,WAAW,IAAI,OAAO,CAEhC;IAED,IAAW,cAAc,IAAI,MAAM,CAKlC;IAEM,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAGlC;IAEM,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAevC;IAEM,SAAS,IAAI,IAAI,CAsCvB;IAEM,eAAe,CAAC,KAAK,EAAE,MAAM,IAAI,GAAG,IAAI,CAY9C;CAmCF"}
|