@openai/codex-security 0.5.0 → 0.5.1
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 +7 -0
- package/_bundled_plugin/mcp/helpers.mjs.br.part-000 +0 -0
- 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/permission-profile-preflight.mjs +60 -9
- 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/schemas/definitions/artifact-common.schema.json +1 -1
- package/_bundled_plugin/scripts/finalize_scan_contract.py +12 -1
- package/_bundled_plugin/scripts/generate_in_scope_files.py +6 -6
- package/_bundled_plugin/scripts/generate_rank_input.py +12 -6
- package/_bundled_plugin/scripts/report_projection.py +2 -1
- package/_bundled_plugin/scripts/threat_model_projection.py +1 -3
- package/_bundled_plugin/scripts/workbench/saved_coverage.py +234 -0
- package/_bundled_plugin/scripts/workbench_cli.py +5 -7
- package/_bundled_plugin/scripts/workbench_db.py +12 -6
- package/_bundled_plugin/scripts/workbench_native_indexes.py +10 -7
- package/_bundled_plugin/scripts/workbench_publication.py +4 -3
- package/_bundled_plugin/scripts/workbench_remediation.py +5 -1
- package/_bundled_plugin/scripts/workbench_saved_results.py +542 -148
- package/_bundled_plugin/scripts/workbench_scan_history.py +79 -78
- package/_bundled_plugin/scripts/workbench_scan_usage.py +61 -13
- package/_bundled_plugin/scripts/workbench_target.py +21 -7
- package/_bundled_plugin/scripts/workbench_validation.py +21 -18
- package/_bundled_plugin/shared/workbench-migrations.json +10 -0
- package/dist/api.d.ts +1 -1
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +161 -57
- package/dist/api.js.map +1 -1
- package/dist/classify-scan-severity.d.ts.map +1 -1
- package/dist/classify-scan-severity.js +16 -18
- package/dist/classify-scan-severity.js.map +1 -1
- package/dist/cli-daybreak.d.ts +5 -0
- package/dist/cli-daybreak.d.ts.map +1 -0
- package/dist/cli-daybreak.js +89 -0
- package/dist/cli-daybreak.js.map +1 -0
- package/dist/cli.d.ts +5 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +821 -591
- package/dist/cli.js.map +1 -1
- package/dist/codeowners.js +2 -2
- package/dist/codeowners.js.map +1 -1
- package/dist/component-plan.d.ts.map +1 -1
- package/dist/component-plan.js +3 -2
- package/dist/component-plan.js.map +1 -1
- package/dist/component-scan.js +2 -2
- package/dist/component-scan.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +5 -1
- package/dist/config.js.map +1 -1
- package/dist/cost.d.ts +2 -1
- package/dist/cost.d.ts.map +1 -1
- package/dist/cost.js +17 -8
- package/dist/cost.js.map +1 -1
- package/dist/custom-validation.d.ts.map +1 -1
- package/dist/custom-validation.js +2 -5
- package/dist/custom-validation.js.map +1 -1
- package/dist/deduplication/codex-review.d.ts.map +1 -1
- package/dist/deduplication/codex-review.js +8 -6
- package/dist/deduplication/codex-review.js.map +1 -1
- package/dist/deduplication/local.d.ts.map +1 -1
- package/dist/deduplication/local.js +5 -2
- package/dist/deduplication/local.js.map +1 -1
- package/dist/deduplication/retry.d.ts.map +1 -1
- package/dist/deduplication/retry.js +5 -0
- package/dist/deduplication/retry.js.map +1 -1
- package/dist/deduplication/scan.js +5 -1
- package/dist/deduplication/scan.js.map +1 -1
- package/dist/deep-scan.d.ts +6 -0
- package/dist/deep-scan.d.ts.map +1 -1
- package/dist/deep-scan.js +8 -6
- package/dist/deep-scan.js.map +1 -1
- package/dist/findings-import.d.ts.map +1 -1
- package/dist/findings-import.js +23 -3
- package/dist/findings-import.js.map +1 -1
- package/dist/host-protocol.d.ts +1 -0
- package/dist/host-protocol.d.ts.map +1 -1
- package/dist/host-protocol.js +1 -1
- package/dist/host-protocol.js.map +1 -1
- package/dist/hosted-remediation-protocol.d.ts +5 -0
- package/dist/hosted-remediation-protocol.d.ts.map +1 -0
- package/dist/hosted-remediation-protocol.js +26 -0
- package/dist/hosted-remediation-protocol.js.map +1 -0
- package/dist/hosted-remediation.d.ts +89 -0
- package/dist/hosted-remediation.d.ts.map +1 -0
- package/dist/hosted-remediation.js +122 -0
- package/dist/hosted-remediation.js.map +1 -0
- package/dist/import-scan.d.ts +1 -0
- package/dist/import-scan.d.ts.map +1 -1
- package/dist/import-scan.js +5 -1
- package/dist/import-scan.js.map +1 -1
- package/dist/index.d.ts +5 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/multiscan.d.ts.map +1 -1
- package/dist/multiscan.js +3 -1
- package/dist/multiscan.js.map +1 -1
- package/dist/project-config.d.ts.map +1 -1
- package/dist/project-config.js +13 -9
- package/dist/project-config.js.map +1 -1
- package/dist/publish.d.ts +2 -0
- package/dist/publish.d.ts.map +1 -1
- package/dist/publish.js +9 -0
- package/dist/publish.js.map +1 -1
- package/dist/remediation.d.ts +63 -0
- package/dist/remediation.d.ts.map +1 -0
- package/dist/remediation.js +110 -0
- package/dist/remediation.js.map +1 -0
- package/dist/request-metadata.d.ts +17 -7
- package/dist/request-metadata.d.ts.map +1 -1
- package/dist/request-metadata.js +43 -8
- package/dist/request-metadata.js.map +1 -1
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +21 -14
- package/dist/runtime.js.map +1 -1
- package/dist/saved-scan-bootstrap.d.ts +1 -0
- package/dist/saved-scan-bootstrap.d.ts.map +1 -1
- package/dist/saved-scan-bootstrap.js +16 -4
- package/dist/saved-scan-bootstrap.js.map +1 -1
- package/dist/scan-activity.js +8 -8
- package/dist/scan-activity.js.map +1 -1
- package/dist/scan-comparison.d.ts.map +1 -1
- package/dist/scan-comparison.js +15 -9
- package/dist/scan-comparison.js.map +1 -1
- package/dist/scan-dashboard.d.ts.map +1 -1
- package/dist/scan-dashboard.js +12 -6
- package/dist/scan-dashboard.js.map +1 -1
- package/dist/scan-executor.d.ts +5 -1
- package/dist/scan-executor.d.ts.map +1 -1
- package/dist/scan-executor.js +9 -8
- package/dist/scan-executor.js.map +1 -1
- package/dist/{deep-progress.d.ts → scan-progress.d.ts} +15 -7
- package/dist/scan-progress.d.ts.map +1 -0
- package/dist/scan-progress.js +138 -0
- package/dist/scan-progress.js.map +1 -0
- package/dist/security-policy.js +1 -1
- package/dist/security-policy.js.map +1 -1
- package/dist/server/embeddings.d.ts.map +1 -1
- package/dist/server/embeddings.js +4 -0
- package/dist/server/embeddings.js.map +1 -1
- package/dist/server/sqlite-store.d.ts.map +1 -1
- package/dist/server/sqlite-store.js +14 -2
- package/dist/server/sqlite-store.js.map +1 -1
- package/dist/severity-store.js +4 -1
- package/dist/severity-store.js.map +1 -1
- package/dist/timestamps.d.ts +3 -0
- package/dist/timestamps.d.ts.map +1 -0
- package/dist/timestamps.js +14 -0
- package/dist/timestamps.js.map +1 -0
- package/dist/version.d.ts +1 -1
- package/dist/version.d.ts.map +1 -1
- package/dist/version.js +13 -2
- package/dist/version.js.map +1 -1
- package/dist/workbench-arguments.d.ts.map +1 -1
- package/dist/workbench-arguments.js +9 -3
- package/dist/workbench-arguments.js.map +1 -1
- package/dist/worker-progress.d.ts +11 -1
- package/dist/worker-progress.d.ts.map +1 -1
- package/dist/worker-progress.js +11 -1
- package/dist/worker-progress.js.map +1 -1
- package/docs/cli.md +86 -15
- package/docs/findings-service.md +7 -2
- package/docs/hosted-remediation.md +117 -0
- package/docs/hosted-scans.md +8 -3
- package/package.json +5 -4
- package/dist/deep-progress.d.ts.map +0 -1
- package/dist/deep-progress.js +0 -92
- package/dist/deep-progress.js.map +0 -1
|
@@ -202,6 +202,69 @@ def _repository_origin(target: Path) -> tuple[str, str] | None:
|
|
|
202
202
|
return (host.lower(), path) if host and path else None
|
|
203
203
|
|
|
204
204
|
|
|
205
|
+
SCAN_SUMMARY_QUERY = """
|
|
206
|
+
SELECT
|
|
207
|
+
scans.*,
|
|
208
|
+
progress.reportable_findings_count,
|
|
209
|
+
progress.scope_file_count,
|
|
210
|
+
progress.review_items_completed,
|
|
211
|
+
progress.review_items_total,
|
|
212
|
+
progress.updated_at AS progress_updated_at,
|
|
213
|
+
(
|
|
214
|
+
SELECT COUNT(*)
|
|
215
|
+
FROM finding_occurrences AS occurrences
|
|
216
|
+
WHERE occurrences.scan_id = scans.id
|
|
217
|
+
) AS finding_count
|
|
218
|
+
FROM scans
|
|
219
|
+
JOIN scan_progress AS progress ON progress.scan_id = scans.id
|
|
220
|
+
"""
|
|
221
|
+
|
|
222
|
+
|
|
223
|
+
def scan_summary(row: sqlite3.Row) -> dict[str, Any]:
|
|
224
|
+
return {
|
|
225
|
+
"completedAt": row["completed_at"],
|
|
226
|
+
"continuationThreadId": row["continuation_thread_id"],
|
|
227
|
+
**stored_scan_cost_fields(row["cost_json"]),
|
|
228
|
+
"findingCount": row["finding_count"],
|
|
229
|
+
"handoffStatus": row["handoff_status"],
|
|
230
|
+
"mode": row["mode"],
|
|
231
|
+
"model": row["model"],
|
|
232
|
+
"name": row["name"],
|
|
233
|
+
"parentScanId": row["parent_scan_id"],
|
|
234
|
+
"progress": {
|
|
235
|
+
"candidates": {"reportable": row["reportable_findings_count"]},
|
|
236
|
+
"coverage": {
|
|
237
|
+
"closedRows": row["review_items_completed"],
|
|
238
|
+
"filesTotal": row["scope_file_count"],
|
|
239
|
+
"worklistRows": row["review_items_total"],
|
|
240
|
+
},
|
|
241
|
+
"phase": row["phase"],
|
|
242
|
+
"status": "canceled" if row["canceled_at"] else row["status"],
|
|
243
|
+
"updatedAt": row["progress_updated_at"],
|
|
244
|
+
},
|
|
245
|
+
"recipeAvailable": row["recipe_json"] is not None,
|
|
246
|
+
"reasoningEffort": row["reasoning_effort"],
|
|
247
|
+
"scanDir": row["scan_dir"],
|
|
248
|
+
"scanId": row["id"],
|
|
249
|
+
"scope": row["scope"],
|
|
250
|
+
"startedAt": row["started_at"],
|
|
251
|
+
"targetId": row["target_id"],
|
|
252
|
+
"targetPath": row["target_path"],
|
|
253
|
+
"targetRevision": row["target_revision"],
|
|
254
|
+
"targetSummary": row["target_summary"],
|
|
255
|
+
"updatedAt": max(
|
|
256
|
+
row["updated_at"],
|
|
257
|
+
row["progress_updated_at"],
|
|
258
|
+
key=lambda value: (timestamp_key(value), value),
|
|
259
|
+
),
|
|
260
|
+
**(
|
|
261
|
+
{"warnings": json.loads(row["completion_warnings_json"])}
|
|
262
|
+
if row["completion_warnings_json"] != "[]"
|
|
263
|
+
else {}
|
|
264
|
+
),
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
|
|
205
268
|
def list_scans(
|
|
206
269
|
connection: sqlite3.Connection, args: argparse.Namespace | None = None
|
|
207
270
|
) -> dict[str, Any]:
|
|
@@ -281,20 +344,7 @@ def list_scans(
|
|
|
281
344
|
values.extend((limit + 1, args.offset))
|
|
282
345
|
rows = connection.execute(
|
|
283
346
|
f"""
|
|
284
|
-
|
|
285
|
-
scans.*,
|
|
286
|
-
progress.reportable_findings_count,
|
|
287
|
-
progress.scope_file_count,
|
|
288
|
-
progress.review_items_completed,
|
|
289
|
-
progress.review_items_total,
|
|
290
|
-
progress.updated_at AS progress_updated_at,
|
|
291
|
-
(
|
|
292
|
-
SELECT COUNT(*)
|
|
293
|
-
FROM finding_occurrences AS occurrences
|
|
294
|
-
WHERE occurrences.scan_id = scans.id
|
|
295
|
-
) AS finding_count
|
|
296
|
-
FROM scans
|
|
297
|
-
JOIN scan_progress AS progress ON progress.scan_id = scans.id
|
|
347
|
+
{SCAN_SUMMARY_QUERY}
|
|
298
348
|
{where}
|
|
299
349
|
ORDER BY
|
|
300
350
|
CASE WHEN scans.status = 'running' AND scans.canceled_at IS NULL THEN 0 ELSE 1 END,
|
|
@@ -305,53 +355,7 @@ def list_scans(
|
|
|
305
355
|
""",
|
|
306
356
|
values,
|
|
307
357
|
).fetchall()
|
|
308
|
-
result = {
|
|
309
|
-
"scans": [
|
|
310
|
-
{
|
|
311
|
-
"completedAt": row["completed_at"],
|
|
312
|
-
"continuationThreadId": row["continuation_thread_id"],
|
|
313
|
-
**stored_scan_cost_fields(row["cost_json"]),
|
|
314
|
-
"findingCount": row["finding_count"],
|
|
315
|
-
"handoffStatus": row["handoff_status"],
|
|
316
|
-
"mode": row["mode"],
|
|
317
|
-
"model": row["model"],
|
|
318
|
-
"name": row["name"],
|
|
319
|
-
"parentScanId": row["parent_scan_id"],
|
|
320
|
-
"progress": {
|
|
321
|
-
"candidates": {"reportable": row["reportable_findings_count"]},
|
|
322
|
-
"coverage": {
|
|
323
|
-
"closedRows": row["review_items_completed"],
|
|
324
|
-
"filesTotal": row["scope_file_count"],
|
|
325
|
-
"worklistRows": row["review_items_total"],
|
|
326
|
-
},
|
|
327
|
-
"phase": row["phase"],
|
|
328
|
-
"status": "canceled" if row["canceled_at"] else row["status"],
|
|
329
|
-
"updatedAt": row["progress_updated_at"],
|
|
330
|
-
},
|
|
331
|
-
"recipeAvailable": row["recipe_json"] is not None,
|
|
332
|
-
"reasoningEffort": row["reasoning_effort"],
|
|
333
|
-
"scanDir": row["scan_dir"],
|
|
334
|
-
"scanId": row["id"],
|
|
335
|
-
"scope": row["scope"],
|
|
336
|
-
"startedAt": row["started_at"],
|
|
337
|
-
"targetId": row["target_id"],
|
|
338
|
-
"targetPath": row["target_path"],
|
|
339
|
-
"targetRevision": row["target_revision"],
|
|
340
|
-
"targetSummary": row["target_summary"],
|
|
341
|
-
"updatedAt": max(
|
|
342
|
-
row["updated_at"],
|
|
343
|
-
row["progress_updated_at"],
|
|
344
|
-
key=lambda value: (timestamp_key(value), value),
|
|
345
|
-
),
|
|
346
|
-
**(
|
|
347
|
-
{"warnings": json.loads(row["completion_warnings_json"])}
|
|
348
|
-
if row["completion_warnings_json"] != "[]"
|
|
349
|
-
else {}
|
|
350
|
-
),
|
|
351
|
-
}
|
|
352
|
-
for row in rows[:limit]
|
|
353
|
-
]
|
|
354
|
-
}
|
|
358
|
+
result = {"scans": [scan_summary(row) for row in rows[:limit]]}
|
|
355
359
|
if limit is not None:
|
|
356
360
|
result.update(
|
|
357
361
|
{
|
|
@@ -380,19 +384,19 @@ def list_unmatched_scan_pairs(
|
|
|
380
384
|
).fetchone()
|
|
381
385
|
selected = [
|
|
382
386
|
scan
|
|
383
|
-
for scan in connection.execute(
|
|
384
|
-
"SELECT * FROM scans WHERE status = 'complete' ORDER BY started_at, id"
|
|
385
|
-
)
|
|
387
|
+
for scan in connection.execute("SELECT * FROM scans WHERE status = 'complete'")
|
|
386
388
|
if _same_repository(scan, requested)
|
|
387
389
|
]
|
|
388
390
|
|
|
391
|
+
selected.sort(key=lambda scan: (timestamp_key(scan["started_at"]), scan["id"]))
|
|
392
|
+
|
|
389
393
|
available = []
|
|
390
|
-
for scan in selected:
|
|
394
|
+
for selected_index, scan in enumerate(selected):
|
|
391
395
|
try:
|
|
392
396
|
read_coverage(scan)
|
|
393
397
|
except SystemExit:
|
|
394
398
|
continue
|
|
395
|
-
available.append(scan)
|
|
399
|
+
available.append((selected_index, scan))
|
|
396
400
|
|
|
397
401
|
saved_pairs = {
|
|
398
402
|
(row["before_scan_id"], row["after_scan_id"])
|
|
@@ -402,10 +406,10 @@ def list_unmatched_scan_pairs(
|
|
|
402
406
|
skipped = 0
|
|
403
407
|
matching_findings: dict[str, list[dict[str, Any]]] = {}
|
|
404
408
|
known_links: list[sqlite3.Row] | None = None
|
|
405
|
-
for index, after in enumerate(available):
|
|
409
|
+
for index, (selected_index, after) in enumerate(available):
|
|
406
410
|
previous = [
|
|
407
411
|
before
|
|
408
|
-
for before in available[:index]
|
|
412
|
+
for _, before in available[:index]
|
|
409
413
|
if args.force or (before["id"], after["id"]) not in saved_pairs
|
|
410
414
|
]
|
|
411
415
|
skipped += index - len(previous)
|
|
@@ -425,11 +429,7 @@ def list_unmatched_scan_pairs(
|
|
|
425
429
|
]
|
|
426
430
|
known_groups = _known_finding_groups(
|
|
427
431
|
known_links,
|
|
428
|
-
{
|
|
429
|
-
scan["id"]
|
|
430
|
-
for scan in selected
|
|
431
|
-
if (scan["started_at"], scan["id"]) <= (after["started_at"], after["id"])
|
|
432
|
-
},
|
|
432
|
+
{scan["id"] for scan in selected[: selected_index + 1]},
|
|
433
433
|
)
|
|
434
434
|
batches.append(
|
|
435
435
|
{
|
|
@@ -667,14 +667,14 @@ def compare_scans(
|
|
|
667
667
|
for pair in related
|
|
668
668
|
]
|
|
669
669
|
if include_matching_inputs:
|
|
670
|
+
after_key = (timestamp_key(after["started_at"]), after["id"])
|
|
670
671
|
known_scan_ids = {
|
|
671
672
|
scan["id"]
|
|
672
673
|
for scan in connection.execute(
|
|
673
|
-
"SELECT
|
|
674
|
-
"AND (started_at < ? OR (started_at = ? AND id <= ?))",
|
|
675
|
-
(after["started_at"], after["started_at"], after["id"]),
|
|
674
|
+
"SELECT id, started_at, target_id, target_path FROM scans WHERE status = 'complete'"
|
|
676
675
|
)
|
|
677
|
-
if
|
|
676
|
+
if (timestamp_key(scan["started_at"]), scan["id"]) <= after_key
|
|
677
|
+
and _same_repository(scan, after)
|
|
678
678
|
}
|
|
679
679
|
excluded_pairs = {(before["id"], after["id"]), (after["id"], before["id"])}
|
|
680
680
|
known_groups = _known_finding_groups(
|
|
@@ -990,7 +990,8 @@ def finding_matches(
|
|
|
990
990
|
)
|
|
991
991
|
)
|
|
992
992
|
known_scans = sorted(
|
|
993
|
-
{(started_at, scan_id)} | {(row["started_at"], row["scan_id"]) for row in linked_rows}
|
|
993
|
+
{(started_at, scan_id)} | {(row["started_at"], row["scan_id"]) for row in linked_rows},
|
|
994
|
+
key=lambda scan: (timestamp_key(scan[0]), scan[1]),
|
|
994
995
|
)
|
|
995
996
|
included = {occurrence_id, *(row["occurrence_id"] for row in rows)}
|
|
996
997
|
rows.extend(
|
|
@@ -127,6 +127,7 @@ def collect_scan_usage(
|
|
|
127
127
|
rate_limits: dict[str, dict[str, Any]] = {}
|
|
128
128
|
tokens_updated_at = None
|
|
129
129
|
accepted_thread_ids: set[str] = set()
|
|
130
|
+
measured_thread_ids: set[str] = set()
|
|
130
131
|
excluded_thread_ids: set[str] = set()
|
|
131
132
|
for session in sessions:
|
|
132
133
|
if session.parent_thread_id in excluded_thread_ids:
|
|
@@ -145,6 +146,10 @@ def collect_scan_usage(
|
|
|
145
146
|
started_at=started_at,
|
|
146
147
|
completed_at=stopped_at,
|
|
147
148
|
completed_turn_id=completed_turn_id if session.thread_id == thread_id else None,
|
|
149
|
+
is_scan_owner=(
|
|
150
|
+
scan["mode"] == "deep"
|
|
151
|
+
and session.thread_id == scan["deep_scan_owner_thread_id"]
|
|
152
|
+
),
|
|
148
153
|
)
|
|
149
154
|
except (OSError, UnicodeError, ValueError):
|
|
150
155
|
missing_thread_ids.add(session.thread_id)
|
|
@@ -160,6 +165,13 @@ def collect_scan_usage(
|
|
|
160
165
|
missing_thread_ids.add(session.thread_id)
|
|
161
166
|
continue
|
|
162
167
|
accepted_thread_ids.add(session.thread_id)
|
|
168
|
+
for key, snapshot in usage.rate_limits.items():
|
|
169
|
+
if key not in rate_limits or snapshot["observedAt"] > rate_limits[key]["observedAt"]:
|
|
170
|
+
rate_limits[key] = snapshot
|
|
171
|
+
if "token_usage_unavailable" in usage.warnings:
|
|
172
|
+
missing_thread_ids.add(session.thread_id)
|
|
173
|
+
continue
|
|
174
|
+
measured_thread_ids.add(session.thread_id)
|
|
163
175
|
role = by_role["parent" if session.thread_id in parent_ids else "workers"]
|
|
164
176
|
_add_token_usage(role, usage.tokens)
|
|
165
177
|
role["threadCount"] += 1
|
|
@@ -167,19 +179,22 @@ def collect_scan_usage(
|
|
|
167
179
|
tokens_updated_at = max(
|
|
168
180
|
tokens_updated_at or usage.tokens_updated_at, usage.tokens_updated_at
|
|
169
181
|
)
|
|
170
|
-
for key, snapshot in usage.rate_limits.items():
|
|
171
|
-
if key not in rate_limits or snapshot["observedAt"] > rate_limits[key]["observedAt"]:
|
|
172
|
-
rate_limits[key] = snapshot
|
|
173
182
|
|
|
174
183
|
if not accepted_thread_ids:
|
|
175
184
|
return _unavailable_usage("scan_thread_unavailable", warnings=warnings)
|
|
185
|
+
if not measured_thread_ids:
|
|
186
|
+
return _unavailable_usage(
|
|
187
|
+
"token_usage_unavailable", warnings=warnings, rate_limits=rate_limits
|
|
188
|
+
)
|
|
176
189
|
|
|
177
190
|
if any(
|
|
178
191
|
usage["cachedInputTokens"] + usage["cacheWriteInputTokens"] > usage["inputTokens"]
|
|
179
192
|
or usage["totalTokens"] != usage["inputTokens"] + usage["outputTokens"]
|
|
180
193
|
for usage in by_role.values()
|
|
181
194
|
):
|
|
182
|
-
return _unavailable_usage(
|
|
195
|
+
return _unavailable_usage(
|
|
196
|
+
"token_breakdown_unavailable", warnings=warnings, rate_limits=rate_limits
|
|
197
|
+
)
|
|
183
198
|
|
|
184
199
|
if completed_turn_id is not None and tokens_updated_at is not None:
|
|
185
200
|
stopped_at = max(stopped_at, tokens_updated_at)
|
|
@@ -187,7 +202,7 @@ def collect_scan_usage(
|
|
|
187
202
|
"coverage": "partial" if missing_thread_ids or warnings else "complete",
|
|
188
203
|
"source": "codex_rollout",
|
|
189
204
|
**{key: sum(role[key] for role in by_role.values()) for key in TOKEN_FIELDS.values()},
|
|
190
|
-
"threadCount": len(
|
|
205
|
+
"threadCount": len(measured_thread_ids),
|
|
191
206
|
"byRole": by_role,
|
|
192
207
|
"window": {"startedAt": started_at.isoformat(), "endedAt": stopped_at.isoformat()},
|
|
193
208
|
"observedAt": observed_at.isoformat(),
|
|
@@ -228,8 +243,8 @@ def _scan_root_thread_ids(
|
|
|
228
243
|
for row in connection.execute(
|
|
229
244
|
"""
|
|
230
245
|
SELECT DISTINCT sdk_thread_id
|
|
231
|
-
FROM
|
|
232
|
-
WHERE scan_id = ?
|
|
246
|
+
FROM deep_scan_worker_threads
|
|
247
|
+
WHERE scan_id = ?
|
|
233
248
|
ORDER BY sdk_thread_id
|
|
234
249
|
""",
|
|
235
250
|
(scan["id"],),
|
|
@@ -472,6 +487,7 @@ def _read_rollout_usage(
|
|
|
472
487
|
started_at: datetime,
|
|
473
488
|
completed_at: datetime | None,
|
|
474
489
|
completed_turn_id: str | None = None,
|
|
490
|
+
is_scan_owner: bool = False,
|
|
475
491
|
) -> RolloutUsage:
|
|
476
492
|
result = RolloutUsage(_empty_token_usage(), set(), None, {})
|
|
477
493
|
total = result.tokens
|
|
@@ -484,6 +500,7 @@ def _read_rollout_usage(
|
|
|
484
500
|
response_ids: set[str] = set()
|
|
485
501
|
current_turn_id: str | None = None
|
|
486
502
|
completed_turn_measured = False
|
|
503
|
+
direct_control_session = False
|
|
487
504
|
started_turns: set[str] = set()
|
|
488
505
|
open_turns: set[str] = set()
|
|
489
506
|
closed_turns: set[str] = set()
|
|
@@ -525,6 +542,13 @@ def _read_rollout_usage(
|
|
|
525
542
|
and not recorded_parent
|
|
526
543
|
and not payload.get("forked_from_id")
|
|
527
544
|
)
|
|
545
|
+
# prepareCliDeepScanSession creates this owner through app-server
|
|
546
|
+
# without a model turn, so its initial token usage is known zero.
|
|
547
|
+
direct_control_session = (
|
|
548
|
+
boundary_reached
|
|
549
|
+
and is_scan_owner
|
|
550
|
+
and payload.get("originator") == "codex_security_deep_scan"
|
|
551
|
+
)
|
|
528
552
|
continue
|
|
529
553
|
|
|
530
554
|
if not isinstance(payload, dict):
|
|
@@ -550,6 +574,19 @@ def _read_rollout_usage(
|
|
|
550
574
|
if not boundary_reached:
|
|
551
575
|
continue
|
|
552
576
|
if event.get("type") == "event_msg" and payload.get("type") == "task_started":
|
|
577
|
+
# The same owner can resume as a model-backed coordinator. Only
|
|
578
|
+
# a provably post-scan turn leaves the original control zero intact.
|
|
579
|
+
task_started_at = _timestamp(event.get("timestamp"))
|
|
580
|
+
if (
|
|
581
|
+
completed_at is None
|
|
582
|
+
or task_started_at is None
|
|
583
|
+
or task_started_at <= completed_at
|
|
584
|
+
or (
|
|
585
|
+
completed_turn_id is not None
|
|
586
|
+
and payload.get("turn_id") == completed_turn_id
|
|
587
|
+
)
|
|
588
|
+
):
|
|
589
|
+
direct_control_session = False
|
|
553
590
|
if (
|
|
554
591
|
completed_turn_id is not None
|
|
555
592
|
and current_turn_id == completed_turn_id
|
|
@@ -722,11 +759,13 @@ def _read_rollout_usage(
|
|
|
722
759
|
_add_token_usage(total, response_usage if response_usage is not None else legacy_usage)
|
|
723
760
|
if not boundary_reached:
|
|
724
761
|
warnings.add("thread_ownership_unavailable")
|
|
762
|
+
elif result.tokens_updated_at is None and not direct_control_session:
|
|
763
|
+
warnings.add("token_usage_unavailable")
|
|
725
764
|
if completed_turn_id is not None:
|
|
726
765
|
open_turns.discard(completed_turn_id)
|
|
727
766
|
if open_turns:
|
|
728
767
|
warnings.add("turn_in_progress")
|
|
729
|
-
if boundary_reached and result.tokens_updated_at is None:
|
|
768
|
+
if boundary_reached and result.tokens_updated_at is None and not direct_control_session:
|
|
730
769
|
warnings.add("token_record_missing")
|
|
731
770
|
if closed_turns - measured_turns:
|
|
732
771
|
warnings.add("token_record_missing")
|
|
@@ -846,7 +885,8 @@ def _usage_counts(usage: object) -> dict[str, int] | None:
|
|
|
846
885
|
input_tokens = usage.get("input_tokens")
|
|
847
886
|
cached_input_tokens = usage.get("cached_input_tokens", 0)
|
|
848
887
|
if (
|
|
849
|
-
cache_write
|
|
888
|
+
type(cache_write) is int
|
|
889
|
+
and cache_write == 0
|
|
850
890
|
and type(legacy_cache_write) is int
|
|
851
891
|
and legacy_cache_write > 0
|
|
852
892
|
and type(input_tokens) is int
|
|
@@ -890,18 +930,26 @@ def _timestamp(value: object) -> datetime | None:
|
|
|
890
930
|
if value.endswith("Z")
|
|
891
931
|
else datetime.fromisoformat(value)
|
|
892
932
|
)
|
|
893
|
-
|
|
933
|
+
return parsed.astimezone(timezone.utc) if parsed.tzinfo is not None else None
|
|
934
|
+
except (ValueError, OverflowError):
|
|
894
935
|
return None
|
|
895
|
-
return parsed.astimezone(timezone.utc) if parsed.tzinfo is not None else None
|
|
896
936
|
|
|
897
937
|
|
|
898
|
-
def _unavailable_usage(
|
|
899
|
-
|
|
938
|
+
def _unavailable_usage(
|
|
939
|
+
reason: str,
|
|
940
|
+
*,
|
|
941
|
+
warnings: set[str] | None = None,
|
|
942
|
+
rate_limits: dict[str, dict[str, Any]] | None = None,
|
|
943
|
+
) -> dict[str, Any]:
|
|
944
|
+
result: dict[str, Any] = {
|
|
900
945
|
"coverage": "unavailable",
|
|
901
946
|
"source": "codex_rollout",
|
|
902
947
|
"threadCount": 0,
|
|
903
948
|
"warnings": sorted({reason, *(warnings or set())}),
|
|
904
949
|
}
|
|
950
|
+
if rate_limits:
|
|
951
|
+
result["accountRateLimits"] = [rate_limits[key] for key in sorted(rate_limits)]
|
|
952
|
+
return result
|
|
905
953
|
|
|
906
954
|
|
|
907
955
|
def _reject_nonstandard_json_number(value: str) -> None:
|
|
@@ -24,6 +24,7 @@ from rank_preview import DEFAULT_PREVIEW_READ_BYTES, is_binary_sample
|
|
|
24
24
|
from windows_scan_local_files import copy_directory_junction
|
|
25
25
|
from workbench_constants import GIT_REPOSITORY_ENVIRONMENT
|
|
26
26
|
|
|
27
|
+
SOURCE_METADATA_DIRECTORIES = {".git", ".svn"}
|
|
27
28
|
_WINDOWS = os.name == "nt"
|
|
28
29
|
|
|
29
30
|
|
|
@@ -447,10 +448,16 @@ def worktree_content_digest_for_context(
|
|
|
447
448
|
) -> str:
|
|
448
449
|
digest = hashlib.sha256()
|
|
449
450
|
update_digest_field(digest, b"format", b"codex-security-snapshot/v1")
|
|
451
|
+
source_pathspecs = [
|
|
452
|
+
f":(literal){pathspec}",
|
|
453
|
+
":(top,glob,exclude)**/.svn",
|
|
454
|
+
":(top,glob,exclude)**/.svn/**",
|
|
455
|
+
]
|
|
450
456
|
tracked_ok = _update_digest_field_from_git(
|
|
451
457
|
digest,
|
|
452
458
|
b"tracked-diff",
|
|
453
459
|
repository,
|
|
460
|
+
"--no-literal-pathspecs",
|
|
454
461
|
"diff",
|
|
455
462
|
"--binary",
|
|
456
463
|
"--full-index",
|
|
@@ -459,18 +466,19 @@ def worktree_content_digest_for_context(
|
|
|
459
466
|
"--ignore-submodules=none",
|
|
460
467
|
"HEAD",
|
|
461
468
|
"--",
|
|
462
|
-
|
|
469
|
+
*source_pathspecs,
|
|
463
470
|
git_dir=git_dir,
|
|
464
471
|
work_tree=work_tree,
|
|
465
472
|
)
|
|
466
473
|
untracked = git_bytes(
|
|
467
474
|
repository,
|
|
475
|
+
"--no-literal-pathspecs",
|
|
468
476
|
"ls-files",
|
|
469
477
|
"--others",
|
|
470
478
|
"--exclude-standard",
|
|
471
479
|
"-z",
|
|
472
480
|
"--",
|
|
473
|
-
|
|
481
|
+
*source_pathspecs,
|
|
474
482
|
git_dir=git_dir,
|
|
475
483
|
work_tree=work_tree,
|
|
476
484
|
)
|
|
@@ -673,6 +681,8 @@ def git_directory_snapshot_paths(target: Path) -> list[Path] | None:
|
|
|
673
681
|
nested_worktrees: set[tuple[int, int]] = set()
|
|
674
682
|
for entry in (entry for entry in listed.split(b"\0") if entry):
|
|
675
683
|
relative = Path(os.fsdecode(entry[2:]))
|
|
684
|
+
if not SOURCE_METADATA_DIRECTORIES.isdisjoint(relative.parts):
|
|
685
|
+
continue
|
|
676
686
|
if scope_depth:
|
|
677
687
|
if len(relative.parts) <= scope_depth:
|
|
678
688
|
continue
|
|
@@ -744,6 +754,8 @@ def git_directory_snapshot_paths(target: Path) -> list[Path] | None:
|
|
|
744
754
|
while pending:
|
|
745
755
|
children: list[Path] = []
|
|
746
756
|
for path in pending:
|
|
757
|
+
if not SOURCE_METADATA_DIRECTORIES.isdisjoint(path.relative_to(target).parts):
|
|
758
|
+
continue
|
|
747
759
|
try:
|
|
748
760
|
path = _directory_link_boundary(target, path, linked_prefixes)
|
|
749
761
|
metadata = path.lstat()
|
|
@@ -764,7 +776,7 @@ def git_directory_snapshot_paths(target: Path) -> list[Path] | None:
|
|
|
764
776
|
continue
|
|
765
777
|
candidates: dict[bytes, Path] = {}
|
|
766
778
|
for path in children:
|
|
767
|
-
if os.path.normcase(path.name)
|
|
779
|
+
if os.path.normcase(path.name) in SOURCE_METADATA_DIRECTORIES:
|
|
768
780
|
continue
|
|
769
781
|
try:
|
|
770
782
|
metadata = path.lstat()
|
|
@@ -812,7 +824,7 @@ def source_directory_snapshot_paths(
|
|
|
812
824
|
parent = Path(directory)
|
|
813
825
|
for name in directories[:]:
|
|
814
826
|
path = parent / name
|
|
815
|
-
if name
|
|
827
|
+
if name in SOURCE_METADATA_DIRECTORIES or path in excluded:
|
|
816
828
|
directories.remove(name)
|
|
817
829
|
continue
|
|
818
830
|
paths.append(path)
|
|
@@ -820,7 +832,9 @@ def source_directory_snapshot_paths(
|
|
|
820
832
|
if getattr(path.lstat(), "st_reparse_tag", 0) & 0x20000000:
|
|
821
833
|
directories.remove(name)
|
|
822
834
|
paths.extend(
|
|
823
|
-
parent / name
|
|
835
|
+
parent / name
|
|
836
|
+
for name in files
|
|
837
|
+
if name not in SOURCE_METADATA_DIRECTORIES and parent / name not in excluded
|
|
824
838
|
)
|
|
825
839
|
return sorted(paths)
|
|
826
840
|
|
|
@@ -843,7 +857,7 @@ def directory_content_digest(
|
|
|
843
857
|
else git_directory_snapshot_paths(target)
|
|
844
858
|
)
|
|
845
859
|
if paths is None:
|
|
846
|
-
paths = source_directory_snapshot_paths(target)
|
|
860
|
+
paths = source_directory_snapshot_paths(target, excluded)
|
|
847
861
|
digest = hashlib.sha256()
|
|
848
862
|
update_digest_field(digest, b"format", b"codex-security-directory/v1")
|
|
849
863
|
for path in paths:
|
|
@@ -1058,7 +1072,7 @@ def git_target_metadata(target: Path) -> dict[str, Any]:
|
|
|
1058
1072
|
branch = git_output(target, "symbolic-ref", "--quiet", "--short", "HEAD")
|
|
1059
1073
|
metadata.update({"branch": branch, "detachedHead": revision is not None and branch is None})
|
|
1060
1074
|
if revision is not None:
|
|
1061
|
-
subject = git_bytes(target, "show", "-s", "--format=%s", "HEAD")
|
|
1075
|
+
subject = git_bytes(target, "show", "-s", "--no-show-signature", "--format=%s", "HEAD")
|
|
1062
1076
|
metadata.update(
|
|
1063
1077
|
{
|
|
1064
1078
|
"commitSubject": (subject or b"").decode("utf-8", errors="replace").strip() or None,
|
|
@@ -69,16 +69,19 @@ SCAN_USAGE_TOKEN_KEYS = tuple(TOKEN_FIELDS.values())
|
|
|
69
69
|
|
|
70
70
|
def _valid_legacy_scan_cost(cost: object) -> bool:
|
|
71
71
|
token_keys = ("inputTokens", "cachedInputTokens", "cacheWriteInputTokens", "outputTokens")
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
72
|
+
try:
|
|
73
|
+
return (
|
|
74
|
+
isinstance(cost, dict)
|
|
75
|
+
and isinstance(cost.get("model"), str)
|
|
76
|
+
and bool(cost["model"])
|
|
77
|
+
and all(type(cost.get(key)) is int and cost[key] >= 0 for key in token_keys)
|
|
78
|
+
and cost["cachedInputTokens"] + cost["cacheWriteInputTokens"] <= cost["inputTokens"]
|
|
79
|
+
and type(cost.get("estimatedUsd")) in (int, float)
|
|
80
|
+
and math.isfinite(cost["estimatedUsd"])
|
|
81
|
+
and cost["estimatedUsd"] >= 0
|
|
82
|
+
)
|
|
83
|
+
except OverflowError:
|
|
84
|
+
return False
|
|
82
85
|
|
|
83
86
|
|
|
84
87
|
def _valid_measured_scan_usage(usage: object) -> bool:
|
|
@@ -87,7 +90,7 @@ def _valid_measured_scan_usage(usage: object) -> bool:
|
|
|
87
90
|
coverage = usage.get("coverage")
|
|
88
91
|
thread_count = usage.get("threadCount")
|
|
89
92
|
if (
|
|
90
|
-
coverage not in
|
|
93
|
+
coverage not in ("complete", "partial", "unavailable")
|
|
91
94
|
or usage.get("source") != "codex_rollout"
|
|
92
95
|
or type(thread_count) is not int
|
|
93
96
|
or thread_count < 0
|
|
@@ -117,9 +120,15 @@ def _valid_measured_scan_usage(usage: object) -> bool:
|
|
|
117
120
|
or len(set(warnings)) != len(warnings)
|
|
118
121
|
):
|
|
119
122
|
return False
|
|
123
|
+
if "accountRateLimits" in usage:
|
|
124
|
+
limits = usage["accountRateLimits"]
|
|
125
|
+
if not isinstance(limits, list) or not all(
|
|
126
|
+
valid_account_rate_limit(limit) for limit in limits
|
|
127
|
+
):
|
|
128
|
+
return False
|
|
120
129
|
if coverage == "unavailable":
|
|
121
130
|
return thread_count == 0 and set(usage).issubset(
|
|
122
|
-
{"coverage", "source", "threadCount", "warnings", "completion"}
|
|
131
|
+
{"coverage", "source", "threadCount", "warnings", "completion", "accountRateLimits"}
|
|
123
132
|
)
|
|
124
133
|
|
|
125
134
|
allowed_keys = {
|
|
@@ -174,12 +183,6 @@ def _valid_measured_scan_usage(usage: object) -> bool:
|
|
|
174
183
|
return False
|
|
175
184
|
if any(sum(role[key] for role in roles.values()) != usage[key] for key in keys):
|
|
176
185
|
return False
|
|
177
|
-
if "accountRateLimits" in usage:
|
|
178
|
-
limits = usage["accountRateLimits"]
|
|
179
|
-
if not isinstance(limits, list) or not all(
|
|
180
|
-
valid_account_rate_limit(limit) for limit in limits
|
|
181
|
-
):
|
|
182
|
-
return False
|
|
183
186
|
return True
|
|
184
187
|
|
|
185
188
|
|
|
@@ -415,5 +415,15 @@
|
|
|
415
415
|
"version": 50,
|
|
416
416
|
"name": "persist authorized source excerpt scopes",
|
|
417
417
|
"statements": ["ALTER TABLE scans ADD COLUMN source_scopes_json TEXT;"]
|
|
418
|
+
},
|
|
419
|
+
{
|
|
420
|
+
"version": 51,
|
|
421
|
+
"name": "preserve deep scan worker thread history",
|
|
422
|
+
"statements": [
|
|
423
|
+
"CREATE TABLE deep_scan_worker_threads (\n scan_id TEXT NOT NULL REFERENCES scans(id) ON DELETE CASCADE,\n worker_id TEXT NOT NULL,\n sdk_thread_id TEXT NOT NULL,\n PRIMARY KEY (scan_id, worker_id, sdk_thread_id)\n);",
|
|
424
|
+
"INSERT INTO deep_scan_worker_threads (scan_id, worker_id, sdk_thread_id)\nSELECT scan_id, id, sdk_thread_id FROM deep_scan_workers\nWHERE sdk_thread_id IS NOT NULL;",
|
|
425
|
+
"CREATE TRIGGER record_deep_scan_worker_thread_insert\nAFTER INSERT ON deep_scan_workers\nWHEN NEW.sdk_thread_id IS NOT NULL\nBEGIN\n INSERT OR IGNORE INTO deep_scan_worker_threads (scan_id, worker_id, sdk_thread_id)\n VALUES (NEW.scan_id, NEW.id, NEW.sdk_thread_id);\nEND;",
|
|
426
|
+
"CREATE TRIGGER record_deep_scan_worker_thread_update\nAFTER UPDATE OF sdk_thread_id ON deep_scan_workers\nWHEN NEW.sdk_thread_id IS NOT NULL\nBEGIN\n INSERT OR IGNORE INTO deep_scan_worker_threads (scan_id, worker_id, sdk_thread_id)\n VALUES (NEW.scan_id, NEW.id, NEW.sdk_thread_id);\nEND;"
|
|
427
|
+
]
|
|
418
428
|
}
|
|
419
429
|
]
|
package/dist/api.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { CodexLoginHandle, type AccountStatus } from "./auth.js";
|
|
|
4
4
|
import { type CodexSecurityConfig, type JsonObject, type ScanModelConfiguration } from "./config.js";
|
|
5
5
|
import { type ScanCost, type ScanSessionEvent, type ScanWorkerEvent } from "./cost.js";
|
|
6
6
|
import type { ScanTokenUsage } from "./cost-model.js";
|
|
7
|
-
import { type DeepScanProgress } from "./
|
|
7
|
+
import { type DeepScanProgress } from "./scan-progress.js";
|
|
8
8
|
import { type DeepScanSources } from "./deep-config.js";
|
|
9
9
|
import { type DeepScanOptions, type ScanAuthMode, type ScanSettings } from "./scan-settings.js";
|
|
10
10
|
export { SCAN_AUTH_MODES } from "./scan-settings.js";
|
package/dist/api.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":";AA2CA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,OAAO,EAKL,gBAAgB,EAIhB,KAAK,aAAa,EACnB,MAAM,WAAW,CAAC;AAMnB,OAAO,EAcL,KAAK,mBAAmB,EACxB,KAAK,UAAU,EACf,KAAK,sBAAsB,EAE5B,MAAM,aAAa,CAAC;AACrB,OAAO,EAGL,KAAK,QAAQ,EACb,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACrB,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,
|
|
1
|
+
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"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"}
|