OpenAI's Codex Security CLI and TypeScript SDK for finding, validating, and fixing security vulnerabilities. npm: https://www.npmjs.com/package/@openai/codex-security
TypeScript ai-securityapplication-securityclicode-scanningcodexcodex-securitycybersecuritydevsecopsnodejsnpmopenaisdksecuritytypescriptvulnerability-scanning
fix(telemetry): preserve controls and share request attribution (#1691)
Michael D'Angelo2c6028b23bb7
diff --git a/github-action/README.md b/github-action/README.mdindex aa35b1c9a..113ab613b 100644--- a/github-action/README.md+++ b/github-action/README.md@@ -424,6 +424,21 @@ The Action uses the CLI’s validated JSON result for findings and scan status.If the CLI exits without a usable result, the Action reports failure and leavesreport paths empty; it does not recover unvalidated files from disk.+### Request attribution++The Action adds `codex_security_integration=github_action` and+`codex_security_provider` (the configured provider family) through the CLI's existing+`responses_api_metadata` setting. These accompany the CLI's request attribution+on model requests supported by the provider. This attribution contains no+repository, workflow, run, actor, credential, or finding data.+Native managed configuration may override the provider selection before inference.++The Action continues to set `analytics.enabled=false`. Request metadata is+separate from native analytics and does not create an additional telemetry+request or publish scan results to Codex Security Cloud. Requests sent to other+providers do not establish OpenAI-side usage reporting. Summaries, annotations,+and artifact uploads retain their existing controls.+## Troubleshooting- **Checkout or history errors:** use the triggering revision, `fetch-depth: 0`diff --git a/github-action/dist/index.cjs b/github-action/dist/index.cjsindex 7ed87dc7d..c64705a23 100644--- a/github-action/dist/index.cjs+++ b/github-action/dist/index.cjs@@ -55632,7 +55632,14 @@ function scanArguments(inputs, target, resultsDirectory) {"--format","json"];- args.push("--codex", "analytics.enabled=false");+ args.push(+ "--codex",+ "analytics.enabled=false",+ "--codex",+ 'responses_api_metadata.codex_security_integration="github_action"',+ "--codex",+ `responses_api_metadata.codex_security_provider=${JSON.stringify(inputs.provider)}`+ );for (const path6 of inputs.paths) args.push(`--path=./${path6}`);const options = [["--cyber-access-program", inputs.cyberAccessProgram],diff --git a/github-action/src/inputs.ts b/github-action/src/inputs.tsindex 8ee16014b..4f4c0e466 100644--- a/github-action/src/inputs.ts+++ b/github-action/src/inputs.ts@@ -71,7 +71,9 @@ export function scanArguments(inputs: Inputs, target: {repository: string; diffB'--output-dir', resultsDirectory, '--format', 'json'];// Preserve the pinned CLI's sandbox and automatic approval-review defaults.// Forcing approval_policy="never" prevents recovery from hosted Linux sandbox errors.- args.push('--codex', 'analytics.enabled=false');+ args.push('--codex', 'analytics.enabled=false',+ '--codex', 'responses_api_metadata.codex_security_integration="github_action"',+ '--codex', `responses_api_metadata.codex_security_provider=${JSON.stringify(inputs.provider)}`);// Bind the option value and keep it explicitly relative so the CLI treats// leading '-' and '~' as literal repository filenames.for (const path of inputs.paths) args.push(`--path=./${path}`);diff --git a/github-action/tests/main.test.ts b/github-action/tests/main.test.tsindex 904c8e7db..dcd74df3f 100644--- a/github-action/tests/main.test.ts+++ b/github-action/tests/main.test.ts@@ -16,6 +16,14 @@ import { copyCompletedScan } from './fixtures.js';type Scenario = 'schedule' | 'pr' | 'policy-pr';const inputKey = (name: string): string => `INPUT_${name.toUpperCase()}`;+function assertAttribution(args: readonly string[], provider: string): void {+ assert.deepEqual(args.flatMap((arg, index) => arg === '--codex' ? [args[index + 1]] : []), [+ 'analytics.enabled=false',+ 'responses_api_metadata.codex_security_integration="github_action"',+ `responses_api_metadata.codex_security_provider="${provider}"`,+ ]);+}+function outputValues(text: string): Record<string, string> {const values: Record<string, string> = {};const lines = text.split(/\r?\n/u);@@ -187,6 +195,7 @@ test('PR severity failure retains SARIF outputs despite unrelated scope notes',test('scheduled complete report-only scan succeeds', async (t) => {const app = await harness(t); const result = await app.run();+ assertAttribution(result.args, 'openai');assert.equal(result.exitCode, 0); assert.equal(result.outputs['scan-status'], 'completed');assert.equal(result.outputs['policy-status'], 'passed'); assert.equal(result.outputs['sarif-upload-ready'], 'true');assert.equal(result.outputs['analysis-ref'], 'refs/heads/main');@@ -239,6 +248,7 @@ test('Deep scans forward their budget and publish completed reports with cleanupconst app = await harness(t);app.setInput('mode', 'deep'); app.setInput('max-time-hours', '1.5');const result = await app.run();+ assertAttribution(result.args, 'openai');assert.equal(result.args[result.args.indexOf('--mode') + 1], 'deep');assert.equal(result.args[result.args.indexOf('--max-time-hours') + 1], '1.5');assert.equal(result.exitCode, 0); assert.equal(result.cleanups, 1);@@ -281,6 +291,7 @@ for (const mode of ['standard', 'deep']) {assert.equal(result.exitCode, 0); assert.equal(result.outputs['scan-status'], 'completed');assert.equal(result.outputs['sarif-upload-ready'], 'true');assert.equal(result.args[result.args.indexOf('--provider') + 1], 'amazon-bedrock');+ assertAttribution(result.args, 'amazon-bedrock');assert.equal(result.args[result.args.indexOf('--auth') + 1], 'auto');assert.equal(result.environment.AWS_ACCESS_KEY_ID, 'synthetic-access-key');assert.equal(result.environment.AWS_SECRET_ACCESS_KEY, 'synthetic-secret-key');@@ -301,6 +312,7 @@ for (const [provider, key] of [['openrouter', 'OPENROUTER_API_KEY'], ['fireworksconst result = await app.run();assert.equal(result.exitCode, 0); assert.equal(result.outputs['scan-status'], 'completed');assert.equal(result.args[result.args.indexOf('--provider') + 1], provider);+ assertAttribution(result.args, provider);assert.equal(result.args[result.args.indexOf('--auth') + 1], 'api-key');assert.equal(result.environment[key], expectedKey);for (const other of ['OPENAI_API_KEY', 'CODEX_API_KEY', 'OPENROUTER_API_KEY', 'FIREWORKS_API_KEY', 'AWS_SESSION_TOKEN', 'GITHUB_TOKEN'])diff --git a/plugins/codex-security/mcp-app/src/deep-scan/executor.ts b/plugins/codex-security/mcp-app/src/deep-scan/executor.tsindex f1aedfa7c..1d50c995c 100644--- a/plugins/codex-security/mcp-app/src/deep-scan/executor.ts+++ b/plugins/codex-security/mcp-app/src/deep-scan/executor.ts@@ -129,6 +129,17 @@ export class CodexSdkWorkerExecutor implements CodexWorkerExecutor {// Worker-owned tool and permission settings take precedence over inheritance.const configOverrides = profileConfigOverrides({...runtimeSettings.config,+ responses_api_metadata: {+ codex_security_surface: "plugin",+ codex_security_command: "scan",+ codex_security_scan_mode: "deep",+ // Keep the host's integration/provider context as this coordinator+ // launches or resumes workers with a different role.+ ...(isRecord(runtimeSettings.config.responses_api_metadata)+ ? runtimeSettings.config.responses_api_metadata+ : {}),+ codex_security_worker_role: request.kind,+ },...(this.modelSettings.reasoningEffort? { model_reasoning_effort: this.modelSettings.reasoningEffort }: {}),@@ -544,6 +555,27 @@ function isRecord(value: unknown): value is Record<string, unknown> {return typeof value === "object" && value !== null;}+function mergeConfigTables(+ base: Record<string, unknown>,+ override: Record<string, unknown>,+): Record<string, unknown> {+ return Object.fromEntries([+ ...Object.entries(base),+ ...Object.entries(override).map(([key, value]) => {+ const inherited = base[key];+ return [+ key,+ isRecord(inherited) &&+ !Array.isArray(inherited) &&+ isRecord(value) &&+ !Array.isArray(value)+ ? mergeConfigTables(inherited, value)+ : value,+ ];+ }),+ ]);+}+async function workerRuntimeSettings(environment: Record<string, string>,): Promise<CodexSdkWorkerRuntimeSettings> {@@ -559,10 +591,18 @@ async function workerRuntimeSettings(typeof config.profile === "string" && isRecord(profiles)? profiles[config.profile]: undefined;- const selected = { ...config, ...(isRecord(profile) ? profile : {}) };- for (const key of ["analytics", "responses_api_metadata", "features"]) {+ const selected: Record<string, unknown> = {+ ...config,+ ...(isRecord(profile) ? profile : {}),+ };+ for (const key of [+ "analytics",+ "otel",+ "responses_api_metadata",+ "features",+ ]) {if (isRecord(config[key]) && isRecord(profile) && isRecord(profile[key])) {- selected[key] = { ...config[key], ...profile[key] };+ selected[key] = mergeConfigTables(config[key], profile[key]);}}const settings: CodexSdkWorkerRuntimeSettings = { config: selected };diff --git a/plugins/codex-security/mcp-app/tests/deep_scan_worker_telemetry_fixture.ts b/plugins/codex-security/mcp-app/tests/deep_scan_worker_telemetry_fixture.tsnew file mode 100644index 000000000..be07b5a81--- /dev/null+++ b/plugins/codex-security/mcp-app/tests/deep_scan_worker_telemetry_fixture.ts@@ -0,0 +1,81 @@+/** Root, selected-profile, and SDK snapshot telemetry used by launch tests. */+export function workerTelemetryFixture(+ index: number,+ hasConfiguration: boolean,+) {+ // Cover missing settings, native config inheritance, and snapshot overrides.+ const mergeProfileTelemetry = index === 0 && hasConfiguration;+ const telemetry =+ index === 0 && !hasConfiguration+ ? {}+ : {+ analytics: { enabled: index % 2 === 0 },+ otel: {+ environment: `synthetic-scan-${index}`,+ exporter: {+ "otlp-http": {+ endpoint: `http://localhost:${4318 + index}/v1/logs`,+ headers: { "X-Scan": `synthetic-scan-${index}` },+ },+ },+ log_user_prompt: false,+ },+ responses_api_metadata: {+ codex_security_surface: index % 2 === 0 ? "cli" : "sdk",+ codex_security_command: "scan",+ codex_security_package_version: `0.2.${index}`,+ codex_security_plugin_version: `0.1.${index}`,+ codex_security_integration: "github_action",+ codex_security_provider:+ index % 2 === 0 ? "openai" : "amazon-bedrock",+ custom_tag: `synthetic-scan-${index}`,+ "team.tag": `literal-key-${index}`,+ ...(mergeProfileTelemetry+ ? {+ root_only: "native-root",+ profile_only: "selected-profile",+ }+ : {}),+ },+ };+ const overrideTelemetry = index === 1 || index === 2;+ const inheritedTelemetry =+ overrideTelemetry || index === 4+ ? {+ analytics: { enabled: index % 2 !== 0 },+ otel: { environment: "preflight-default", exporter: "none" },+ responses_api_metadata: { custom_tag: "preflight-default" },+ }+ : mergeProfileTelemetry+ ? {+ analytics: { enabled: true },+ otel: {+ environment: "native-root",+ exporter: {+ "otlp-http": {+ endpoint: "http://localhost:4317/v1/logs",+ headers: { "X-Scan": "synthetic-scan-0" },+ },+ },+ log_user_prompt: false,+ },+ responses_api_metadata: {+ codex_security_surface: "cli",+ codex_security_command: "scan",+ codex_security_package_version: "0.2.0",+ codex_security_plugin_version: "0.1.0",+ codex_security_integration: "github_action",+ codex_security_provider: "openai",+ custom_tag: "preflight-default",+ "team.tag": "literal-key-0",+ root_only: "native-root",+ },+ }+ : telemetry;+ return {+ mergeProfileTelemetry,+ telemetry,+ inheritedTelemetry,+ workerTelemetry: overrideTelemetry ? telemetry : {},+ };+}diff --git a/plugins/codex-security/mcp-app/tests/test_deep_scan_executor.ts b/plugins/codex-security/mcp-app/tests/test_deep_scan_executor.tsindex 3233fbc3c..b35a539d1 100644--- a/plugins/codex-security/mcp-app/tests/test_deep_scan_executor.ts+++ b/plugins/codex-security/mcp-app/tests/test_deep_scan_executor.ts@@ -44,6 +44,7 @@ import type {} from "../src/deep-scan/types.js";import { testConcurrentWorkerExecutableAliases } from "./deep_scan_executable_alias_cases.ts";import { testDeepScanContextSnapshots } from "./deep_scan_context_snapshot_cases.ts";+import { workerTelemetryFixture } from "./deep_scan_worker_telemetry_fixture.ts";import { testWorkerCyberAccessSettings } from "./deep_scan_worker_settings_cases.ts";const executorSource = new URL("../src/deep-scan/executor.ts", import.meta.url);@@ -1516,46 +1517,12 @@ env_key = "SYNTHETIC_GATEWAY_KEY"`,},],};- const mergeProfileTelemetry = index === 0 && configuration !== "";- const telemetry =- index === 0 && configuration === ""- ? {}- : {- analytics: { enabled: index % 2 === 0 },- responses_api_metadata: {- codex_security_surface: index % 2 === 0 ? "cli" : "sdk",- codex_security_command: "scan",- codex_security_package_version: `0.2.${index}`,- codex_security_plugin_version: `0.1.${index}`,- custom_tag: `synthetic-scan-${index}`,- ...(mergeProfileTelemetry- ? {- root_only: "native-root",- profile_only: "selected-profile",- }- : {}),- },- };- const overrideTelemetry = index === 1 || index === 2;- const inheritedTelemetry =- overrideTelemetry || index === 4- ? {- analytics: { enabled: index % 2 !== 0 },- responses_api_metadata: { custom_tag: "preflight-default" },- }- : mergeProfileTelemetry- ? {- analytics: { enabled: true },- responses_api_metadata: {- codex_security_surface: "cli",- codex_security_command: "scan",- codex_security_package_version: "0.2.0",- codex_security_plugin_version: "0.1.0",- custom_tag: "preflight-default",- root_only: "native-root",- },- }- : telemetry;+ const {+ mergeProfileTelemetry,+ telemetry,+ inheritedTelemetry,+ workerTelemetry,+ } = workerTelemetryFixture(index, configuration !== "");const features =index === 0? undefined@@ -1682,7 +1649,7 @@ env_key = "SYNTHETIC_GATEWAY_KEY"`,skills,features,telemetry,- workerTelemetry: overrideTelemetry ? telemetry : {},+ workerTelemetry,configuration: {...parsedConfiguration,...inheritedTelemetry,@@ -1734,6 +1701,14 @@ env_key = "SYNTHETIC_GATEWAY_KEY"`,...(mergeProfileTelemetry? {analytics: {},+ otel: {+ environment: "synthetic-scan-0",+ exporter: {+ "otlp-http": {+ endpoint: "http://localhost:4318/v1/logs",+ },+ },+ },responses_api_metadata: {custom_tag: "synthetic-scan-0",profile_only: "selected-profile",@@ -2086,7 +2061,7 @@ env_key = "SYNTHETIC_GATEWAY_KEY"`,parseToml(nativeConfigOverrides(invocation.argv).filter((override) =>- /^(analytics|responses_api_metadata)[.=]/.test(+ /^(analytics|otel|responses_api_metadata)[.=]/.test(override,),)@@ -2094,7 +2069,17 @@ env_key = "SYNTHETIC_GATEWAY_KEY"`,),),),- workerConfigurations[index].telemetry,+ {+ ...workerConfigurations[index].telemetry,+ responses_api_metadata: {+ codex_security_surface: "plugin",+ codex_security_command: "scan",+ codex_security_scan_mode: "deep",+ ...workerConfigurations[index].telemetry+ .responses_api_metadata,+ codex_security_worker_role: kind,+ },+ },);assert.equal(invocation.cacheDirectory,diff --git a/plugins/codex-security/mcp-app/tests/test_deep_scan_store_integration.ts b/plugins/codex-security/mcp-app/tests/test_deep_scan_store_integration.tsindex 9ab0a7eff..44f10a6fb 100644--- a/plugins/codex-security/mcp-app/tests/test_deep_scan_store_integration.ts+++ b/plugins/codex-security/mcp-app/tests/test_deep_scan_store_integration.ts@@ -39,6 +39,7 @@ export { recordCodexSecurityScanDraftViaWorkbench, saveScanDraftCheckpoint } froawait testCanonicalParentCheckpointsSurviveSuccessiveWrites();await testFreeformFailureMessagesAgainstRealWorkbench();+await testWorkerRetryThreadsRemainInScanUsage();await testReducerCommitAndFinishAgainstRealWorkbench();await testReducerCommitAndFinishAgainstRealWorkbench(true);await testExpiredDeadlineWithoutCompletedDiscoveryAgainstRealWorkbench();@@ -228,6 +229,58 @@ function createWorkbenchRunner(environment: NodeJS.ProcessEnv, bounded = true) {};}+async function testWorkerRetryThreadsRemainInScanUsage() {+ const { fixtureRoot, targetPath, environment } = await createWorkbenchFixture(+ "deep-scan-retry-usage-",+ );+ const runWorkbench = createWorkbenchRunner(environment);+ const store = new WorkbenchDeepScanStore(runWorkbench);+ try {+ const threadId = "retry-owner";+ const run = await store.begin({+ targetPath,+ threadId,+ scanRoot: path.join(fixtureRoot, "scans"),+ });+ await store.claimCoordinator({ scanId: run.scanId, threadId });+ const worker = await createWorkerFixture(run, "retry", "discovery");+ await store.updateWorker({ ...worker, status: "queued" });+ await store.updateWorker({+ ...worker,+ status: "running",+ threadId: "first-attempt",+ });+ const retried = {+ ...worker,+ attempt: 2,+ status: "running" as const,+ threadId: "retry-attempt",+ };+ await store.updateWorker(retried);+ await store.updateWorker(retried);++ const resumed = await new WorkbenchDeepScanStore(runWorkbench).get(+ run.scanId,+ threadId,+ );+ assert.equal(resumed.persistedWorkers.length, 1);+ assert.equal(resumed.persistedWorkers[0].threadId, "retry-attempt");+ assert.equal(resumed.persistedWorkers[0].attempt, 2);+ const { scan } = await runWorkbench(["get-scan", "--scan-id", run.scanId]);+ assert.deepEqual(scan.executionThreadIds, [+ "first-attempt",+ "retry-attempt",+ ]);+ assert.deepEqual(scan.threadIds, [+ threadId,+ "first-attempt",+ "retry-attempt",+ ]);+ } finally {+ await rm(fixtureRoot, { recursive: true, force: true });+ }+}+async function testFreeformFailureMessagesAgainstRealWorkbench() {const { fixtureRoot, targetPath, environment } = await createWorkbenchFixture("deep-scan-error-transport-",diff --git a/plugins/codex-security/mcp-app/tests/test_workbench_database.ts b/plugins/codex-security/mcp-app/tests/test_workbench_database.tsindex 258bd727d..976974ed0 100644--- a/plugins/codex-security/mcp-app/tests/test_workbench_database.ts+++ b/plugins/codex-security/mcp-app/tests/test_workbench_database.ts@@ -168,6 +168,43 @@ test("every released schema upgrades to the same current schema and remains idem}});+test("worker thread history survives retry, replay, and worker retirement", (t) => {+ const database = memory(t, 49);+ insertScan(database);+ database.exec(`+ INSERT INTO deep_scan_runs (+ scan_id, schema_version, workflow_version, status, phase, workers,+ subagents, stop_after_no_new, max_discovery_runs, created_at, updated_at+ ) VALUES ('scan', 1, 'fixture', 'running', 'discovery', 1, 0, 3, 10, 'created', 'updated');+ INSERT INTO deep_scan_workers (+ id, scan_id, kind, status, prompt_path, artifact_dir, attempt,+ sdk_thread_id, created_at, updated_at+ ) VALUES ('worker', 'scan', 'discovery', 'running', '/synthetic/prompt.md',+ '/synthetic/output', 1, 'first-thread', 'created', 'updated');+ `);+ applyMigrations(database);+ database.exec(`+ UPDATE deep_scan_workers SET sdk_thread_id = 'retry-thread', attempt = 2;+ UPDATE deep_scan_workers SET sdk_thread_id = 'retry-thread', attempt = 2;+ DELETE FROM deep_scan_workers;+ `);+ applyMigrations(database);+ assert.deepEqual(+ database+ .prepare(+ "SELECT sdk_thread_id FROM deep_scan_worker_threads ORDER BY sdk_thread_id",+ )+ .all()+ .map((row) => row.sdk_thread_id),+ ["first-thread", "retry-thread"],+ );+ database.exec("DELETE FROM scans");+ assert.deepEqual(+ database.prepare("SELECT * FROM deep_scan_worker_threads").all(),+ [],+ );+});+test("configured state paths use native parent traversal semantics", async () => {const directory = await temporary.create("workbench-symlink-");const actual = join(directory, "actual");@@ -363,7 +400,7 @@ test("database-info retains scan names from installed migration 42", async () =>await databaseInfo(directory);const upgraded = new DatabaseSync(databasePath);try {- assertMigrationNames(upgraded, 42, 43, 44, 45, 46, 47, 48, 49, 50);+ assertMigrationNames(upgraded, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51);assert.equal(upgraded.prepare("SELECT name FROM scans").get()?.name,"Original scan",diff --git a/plugins/codex-security/scripts/workbench_db.py b/plugins/codex-security/scripts/workbench_db.pyindex cb41ba860..a80f4c763 100644--- a/plugins/codex-security/scripts/workbench_db.py+++ b/plugins/codex-security/scripts/workbench_db.py@@ -1186,12 +1186,18 @@ def finalize_scan_usage(connection: sqlite3.Connection, args: argparse.Namespacecompleted_turn_id=args.turn_id,)if usage["coverage"] == "unavailable":- return scan_context(connection, scan_id)- if args.turn_status != "completed":- if usage["coverage"] == "complete":- usage["coverage"] = "partial"- usage["warnings"] = [*usage.get("warnings", []), f"scan_turn_{args.turn_status}"]- usage["completion"] = {**completion, "finalized": True}+ if not usage.get("accountRateLimits"):+ return scan_context(connection, scan_id)+ usage = {**stored["usage"], "accountRateLimits": usage["accountRateLimits"]}+ else:+ if args.turn_status != "completed":+ if usage["coverage"] == "complete":+ usage["coverage"] = "partial"+ usage["warnings"] = [+ *usage.get("warnings", []),+ f"scan_turn_{args.turn_status}",+ ]+ usage["completion"] = {**completion, "finalized": True}cost_json = parse_scan_cost(json.dumps({**stored, "usage": usage}))with connection:connection.execute(diff --git a/plugins/codex-security/scripts/workbench_scan_usage.py b/plugins/codex-security/scripts/workbench_scan_usage.pyindex bec4a8572..35a40a9cf 100644--- a/plugins/codex-security/scripts/workbench_scan_usage.py+++ b/plugins/codex-security/scripts/workbench_scan_usage.py@@ -127,6 +127,7 @@ def collect_scan_usage(rate_limits: dict[str, dict[str, Any]] = {}tokens_updated_at = Noneaccepted_thread_ids: set[str] = set()+ measured_thread_ids: set[str] = set()excluded_thread_ids: set[str] = set()for session in sessions:if session.parent_thread_id in excluded_thread_ids:@@ -145,6 +146,10 @@ def collect_scan_usage(started_at=started_at,completed_at=stopped_at,completed_turn_id=completed_turn_id if session.thread_id == thread_id else None,+ is_scan_owner=(+ scan["mode"] == "deep"+ and session.thread_id == scan["deep_scan_owner_thread_id"]+ ),)except (OSError, UnicodeError, ValueError):missing_thread_ids.add(session.thread_id)@@ -160,6 +165,13 @@ def collect_scan_usage(missing_thread_ids.add(session.thread_id)continueaccepted_thread_ids.add(session.thread_id)+ for key, snapshot in usage.rate_limits.items():+ if key not in rate_limits or snapshot["observedAt"] > rate_limits[key]["observedAt"]:+ rate_limits[key] = snapshot+ if "token_usage_unavailable" in usage.warnings:+ missing_thread_ids.add(session.thread_id)+ continue+ measured_thread_ids.add(session.thread_id)role = by_role["parent" if session.thread_id in parent_ids else "workers"]_add_token_usage(role, usage.tokens)role["threadCount"] += 1@@ -167,19 +179,22 @@ def collect_scan_usage(tokens_updated_at = max(tokens_updated_at or usage.tokens_updated_at, usage.tokens_updated_at)- for key, snapshot in usage.rate_limits.items():- if key not in rate_limits or snapshot["observedAt"] > rate_limits[key]["observedAt"]:- rate_limits[key] = snapshotif not accepted_thread_ids:return _unavailable_usage("scan_thread_unavailable", warnings=warnings)+ if not measured_thread_ids:+ return _unavailable_usage(+ "token_usage_unavailable", warnings=warnings, rate_limits=rate_limits+ )if any(usage["cachedInputTokens"] + usage["cacheWriteInputTokens"] > usage["inputTokens"]or usage["totalTokens"] != usage["inputTokens"] + usage["outputTokens"]for usage in by_role.values()):- return _unavailable_usage("token_breakdown_unavailable", warnings=warnings)+ return _unavailable_usage(+ "token_breakdown_unavailable", warnings=warnings, rate_limits=rate_limits+ )if completed_turn_id is not None and tokens_updated_at is not None:stopped_at = max(stopped_at, tokens_updated_at)@@ -187,7 +202,7 @@ def collect_scan_usage("coverage": "partial" if missing_thread_ids or warnings else "complete","source": "codex_rollout",**{key: sum(role[key] for role in by_role.values()) for key in TOKEN_FIELDS.values()},- "threadCount": len(accepted_thread_ids),+ "threadCount": len(measured_thread_ids),"byRole": by_role,"window": {"startedAt": started_at.isoformat(), "endedAt": stopped_at.isoformat()},"observedAt": observed_at.isoformat(),@@ -228,8 +243,8 @@ def _scan_root_thread_ids(for row in connection.execute("""SELECT DISTINCT sdk_thread_id- FROM deep_scan_workers- WHERE scan_id = ? AND sdk_thread_id IS NOT NULL+ FROM deep_scan_worker_threads+ WHERE scan_id = ?ORDER BY sdk_thread_id""",(scan["id"],),@@ -472,6 +487,7 @@ def _read_rollout_usage(started_at: datetime,completed_at: datetime | None,completed_turn_id: str | None = None,+ is_scan_owner: bool = False,) -> RolloutUsage:result = RolloutUsage(_empty_token_usage(), set(), None, {})total = result.tokens@@ -484,6 +500,7 @@ def _read_rollout_usage(response_ids: set[str] = set()current_turn_id: str | None = Nonecompleted_turn_measured = False+ direct_control_session = Falsestarted_turns: set[str] = set()open_turns: set[str] = set()closed_turns: set[str] = set()@@ -525,6 +542,13 @@ def _read_rollout_usage(and not recorded_parentand not payload.get("forked_from_id"))+ # prepareCliDeepScanSession creates this owner through app-server+ # without a model turn, so its initial token usage is known zero.+ direct_control_session = (+ boundary_reached+ and is_scan_owner+ and payload.get("originator") == "codex_security_deep_scan"+ )continueif not isinstance(payload, dict):@@ -550,6 +574,19 @@ def _read_rollout_usage(if not boundary_reached:continueif event.get("type") == "event_msg" and payload.get("type") == "task_started":+ # The same owner can resume as a model-backed coordinator. Only+ # a provably post-scan turn leaves the original control zero intact.+ task_started_at = _timestamp(event.get("timestamp"))+ if (+ completed_at is None+ or task_started_at is None+ or task_started_at <= completed_at+ or (+ completed_turn_id is not None+ and payload.get("turn_id") == completed_turn_id+ )+ ):+ direct_control_session = Falseif (completed_turn_id is not Noneand current_turn_id == completed_turn_id@@ -722,11 +759,13 @@ def _read_rollout_usage(_add_token_usage(total, response_usage if response_usage is not None else legacy_usage)if not boundary_reached:warnings.add("thread_ownership_unavailable")+ elif result.tokens_updated_at is None and not direct_control_session:+ warnings.add("token_usage_unavailable")if completed_turn_id is not None:open_turns.discard(completed_turn_id)if open_turns:warnings.add("turn_in_progress")- if boundary_reached and result.tokens_updated_at is None:+ if boundary_reached and result.tokens_updated_at is None and not direct_control_session:warnings.add("token_record_missing")if closed_turns - measured_turns:warnings.add("token_record_missing")@@ -895,13 +934,21 @@ def _timestamp(value: object) -> datetime | None:return parsed.astimezone(timezone.utc) if parsed.tzinfo is not None else None-def _unavailable_usage(reason: str, *, warnings: set[str] | None = None) -> dict[str, Any]:- return {+def _unavailable_usage(+ reason: str,+ *,+ warnings: set[str] | None = None,+ rate_limits: dict[str, dict[str, Any]] | None = None,+) -> dict[str, Any]:+ result: dict[str, Any] = {"coverage": "unavailable","source": "codex_rollout","threadCount": 0,"warnings": sorted({reason, *(warnings or set())}),}+ if rate_limits:+ result["accountRateLimits"] = [rate_limits[key] for key in sorted(rate_limits)]+ return resultdef _reject_nonstandard_json_number(value: str) -> None:diff --git a/plugins/codex-security/scripts/workbench_validation.py b/plugins/codex-security/scripts/workbench_validation.pyindex e210a58a5..0e38cfe54 100644--- a/plugins/codex-security/scripts/workbench_validation.py+++ b/plugins/codex-security/scripts/workbench_validation.py@@ -117,9 +117,15 @@ def _valid_measured_scan_usage(usage: object) -> bool:or len(set(warnings)) != len(warnings)):return False+ if "accountRateLimits" in usage:+ limits = usage["accountRateLimits"]+ if not isinstance(limits, list) or not all(+ valid_account_rate_limit(limit) for limit in limits+ ):+ return Falseif coverage == "unavailable":return thread_count == 0 and set(usage).issubset(- {"coverage", "source", "threadCount", "warnings", "completion"}+ {"coverage", "source", "threadCount", "warnings", "completion", "accountRateLimits"})allowed_keys = {@@ -174,12 +180,6 @@ def _valid_measured_scan_usage(usage: object) -> bool:return Falseif any(sum(role[key] for role in roles.values()) != usage[key] for key in keys):return False- if "accountRateLimits" in usage:- limits = usage["accountRateLimits"]- if not isinstance(limits, list) or not all(- valid_account_rate_limit(limit) for limit in limits- ):- return Falsereturn Truediff --git a/plugins/codex-security/shared/workbench-migrations.json b/plugins/codex-security/shared/workbench-migrations.jsonindex 29fe39e5c..0a18f1649 100644--- a/plugins/codex-security/shared/workbench-migrations.json+++ b/plugins/codex-security/shared/workbench-migrations.json@@ -415,5 +415,15 @@"version": 50,"name": "persist authorized source excerpt scopes","statements": ["ALTER TABLE scans ADD COLUMN source_scopes_json TEXT;"]+ },+ {+ "version": 51,+ "name": "preserve deep scan worker thread history",+ "statements": [+ "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);",+ "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;",+ "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;",+ "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;"+ ]}]diff --git a/plugins/codex-security/tests/test_workbench_db.py b/plugins/codex-security/tests/test_workbench_db.pyindex 268a49a74..9381029f2 100644--- a/plugins/codex-security/tests/test_workbench_db.py+++ b/plugins/codex-security/tests/test_workbench_db.py@@ -70,6 +70,7 @@ BUDGET_WARNING = "Scan stopped: estimated cost $0.00625 exceeded the $0.005 costEXPECTED_TABLES = {"deep_scan_dedup_inputs","deep_scan_runs",+ "deep_scan_worker_threads","deep_scan_workers","finding_decisions","finding_dedupe_group_members",diff --git a/plugins/codex-security/tests/test_workbench_scan_usage.py b/plugins/codex-security/tests/test_workbench_scan_usage.pyindex 26e133918..55288ae7c 100644--- a/plugins/codex-security/tests/test_workbench_scan_usage.py+++ b/plugins/codex-security/tests/test_workbench_scan_usage.py@@ -170,6 +170,7 @@ def _rollout(task_started_at: datetime | None = None,session_started_at: datetime | None = None,copied_events: list[dict[str, Any]] | None = None,+ originator: str | None = None,) -> Path:directory = root / "rollouts"directory.mkdir(exist_ok=True)@@ -184,6 +185,8 @@ def _rollout(},*(copied_events or []),]+ if originator is not None:+ records[0]["payload"]["originator"] = originatorif session_started_at is not None:records[0]["payload"]["timestamp"] = session_started_at.isoformat().replace("+00:00", "Z")if parent_thread_id is not None and include_task_start:@@ -214,6 +217,26 @@ def _rollout(return rollout.resolve()+def _allowance_event(timestamp: datetime, percent: int, limit: str = "codex") -> dict[str, Any]:+ return _event(+ timestamp,+ "event_msg",+ {+ "type": "token_count",+ "info": None,+ "rate_limits": {+ "limit_id": limit,+ "primary": {+ "used_percent": percent,+ "window_minutes": 10080,+ "resets_at": 1800000000,+ },+ "secondary": None,+ },+ },+ )++def _response_event(timestamp: datetime,thread_id: str,@@ -975,6 +998,85 @@ def test_completion_reports_unavailable_without_fabricating_zero(tmp_path: Path)assert "totalTokens" not in usage[email protected]("observation", ["missing", "null", "before", "legacy_zero", "native_zero"])+def test_completion_distinguishes_missing_usage_from_observed_zero(+ tmp_path: Path, observation: str+) -> None:+ fixture = _start_scan(tmp_path)+ counted = fixture.started_at + timedelta(microseconds=1)+ events = []+ if observation == "null":+ events = [_event(counted, "event_msg", {"type": "token_count", "info": None})]+ elif observation == "before":+ events = [_token_event(fixture.started_at - timedelta(seconds=1), 10, 1)]+ elif observation == "legacy_zero":+ events = [_token_event(counted, 0, 0)]+ elif observation == "native_zero":+ events = [+ _response_event(counted, "scan-parent", "zero-response", 0, 0),+ _event(counted, "event_msg", {"type": "task_complete", "turn_id": "turn-scan-parent"}),+ ]+ _state_graph(+ fixture.environment,+ {"scan-parent": _rollout(tmp_path, "scan-parent", events)},+ [],+ )++ usage = _complete_scan(fixture)["scan"]["usage"]++ if observation.endswith("_zero"):+ expected = {+ "coverage": "complete",+ "source": "codex_rollout",+ **_counts(0, 0, 0),+ "threadCount": 1,+ }+ assert usage.items() >= expected.items()+ else:+ assert usage == {+ "coverage": "unavailable",+ "source": "codex_rollout",+ "threadCount": 0,+ "warnings": ["token_record_missing", "token_usage_unavailable"],+ }++[email protected]("missing_thread", ["scan-parent", "scan-worker"])+def test_missing_usage_preserves_measured_parent_or_descendant(+ tmp_path: Path, missing_thread: str+) -> None:+ fixture = _start_scan(tmp_path)+ counted = fixture.started_at + timedelta(microseconds=1)+ _state_graph(+ fixture.environment,+ {+ thread: _rollout(+ tmp_path,+ thread,+ [] if thread == missing_thread else [_token_event(counted, 10, 2)],+ parent_thread_id="scan-parent" if thread == "scan-worker" else None,+ task_started_at=counted,+ )+ for thread in ["scan-parent", "scan-worker"]+ },+ [("scan-parent", "scan-worker")],+ )++ expected = {+ "coverage": "partial",+ "source": "codex_rollout",+ **_counts(10, 0, 2),+ "threadCount": 1,+ "missingThreadCount": 1,+ "warnings": [+ "token_record_missing",+ "token_usage_unavailable",+ *(["turn_in_progress"] if missing_thread == "scan-worker" else []),+ ],+ }+ assert _complete_scan(fixture)["scan"]["usage"].items() >= expected.items()++@pytest.mark.skipif(sys.platform != "darwin", reason="macOS system path aliases")@pytest.mark.parametrize("temporary_root", [tempfile.gettempdir(), "/tmp"], ids=["var", "tmp"])def test_completion_accepts_macos_system_rollout_alias(@@ -1013,25 +1115,29 @@ def test_completion_rejects_non_system_rollout_symlink(tmp_path: Path) -> None:)-def test_completion_counts_deep_sdk_workers_and_descendants(tmp_path: Path) -> None:+def test_completion_counts_deep_worker_retries_and_descendants(tmp_path: Path) -> None:fixture = _start_scan(tmp_path, mode="deep")counted = fixture.started_at + timedelta(microseconds=1)artifact = fixture.scan_dir / "artifacts" / "usage-worker"artifact.mkdir(parents=True)prompt = artifact / "prompt.md"prompt.write_text("Review the fixture target.\n", encoding="utf-8")- upsert_deep_worker(- fixture.state_dir,- fixture.scan_id,- str(uuid.uuid4()),- "discovery",- "running",- str(prompt),- str(artifact),- "--sdk-thread-id",- "sdk-worker",- environment=fixture.environment,- )+ worker_id = str(uuid.uuid4())+ for attempt, thread in [(1, "sdk-worker"), (2, "sdk-retry"), (2, "sdk-retry")]:+ upsert_deep_worker(+ fixture.state_dir,+ fixture.scan_id,+ worker_id,+ "discovery",+ "running",+ str(prompt),+ str(artifact),+ "--attempt",+ str(attempt),+ "--sdk-thread-id",+ thread,+ environment=fixture.environment,+ )_state_graph(fixture.environment,{@@ -1043,6 +1149,7 @@ def test_completion_counts_deep_sdk_workers_and_descendants(tmp_path: Path) -> N[_token_event(counted, 7, 2)],parent_thread_id="sdk-worker",),+ "sdk-retry": _rollout(tmp_path, "sdk-retry", [_token_event(counted, 30, 3)]),},[("sdk-worker", "sdk-child")],)@@ -1052,8 +1159,8 @@ def test_completion_counts_deep_sdk_workers_and_descendants(tmp_path: Path) -> N>= {"coverage": "complete","source": "codex_rollout",- **_counts(37, 0, 10),- "threadCount": 3,+ **_counts(67, 0, 13),+ "threadCount": 4,}.items())@@ -1138,6 +1245,7 @@ def test_completion_preserves_explicit_legacy_cost(_token_event(counted, 115, 6, cached_input_tokens=100 if delayed_cache_counts else 0),+ _allowance_event(counted, 6),],)},@@ -1163,6 +1271,7 @@ def test_completion_preserves_explicit_legacy_cost(environment=fixture.environment,)["scan"]assert completed["cost"] == cost+ assert completed["usage"]["accountRateLimits"][0]["primary"]["usedPercent"] == 6if delayed_cache_counts:assert completed["usage"]["coverage"] == "unavailable"assert completed["usage"]["warnings"] == ["token_breakdown_unavailable"]@@ -1171,6 +1280,160 @@ def test_completion_preserves_explicit_legacy_cost(assert completed["usage"]["totalTokens"] == 21+ "worker_state",+ ["absent", "measured", "missing_graph_child", "missing_registered_worker", "unmeasured"],+)+def test_completion_persists_direct_control_zero_without_hiding_missing_workers(+ tmp_path: Path, worker_state: str+) -> None:+ fixture = _start_scan(tmp_path, mode="deep")+ counted = fixture.started_at + timedelta(microseconds=1)+ threads = {+ # The app-server client persists this originator while injecting context,+ # without starting a model turn or producing a native token receipt.+ "scan-parent": _rollout(+ tmp_path,+ "scan-parent",+ [+ _event(counted, "turn_context", {}),+ _event(counted, "response_item", {"type": "message"}),+ ],+ originator="codex_security_deep_scan",+ ),+ }+ edges = []+ measured_worker = worker_state not in {"absent", "unmeasured"}+ if worker_state != "absent":+ threads["scan-worker"] = _rollout(+ tmp_path,+ "scan-worker",+ [_token_event(counted, 100, 10)] if measured_worker else [],+ parent_thread_id="scan-parent",+ task_started_at=counted,+ originator="codex_security_deep_scan",+ )+ edges.append(("scan-parent", "scan-worker"))+ if worker_state == "missing_graph_child":+ threads["missing-worker"] = tmp_path / "missing-worker.jsonl"+ edges.append(("scan-parent", "missing-worker"))+ elif worker_state == "missing_registered_worker":+ with sqlite3.connect(fixture.state_dir / "workbench.sqlite3") as connection:+ connection.execute(+ "INSERT INTO deep_scan_worker_threads (scan_id, worker_id, sdk_thread_id) "+ "VALUES (?, ?, ?)",+ (fixture.scan_id, "earlier-attempt", "missing-worker"),+ )+ _state_graph(fixture.environment, threads, edges)+ missing_warnings = {+ "missing_graph_child": ["rollout_unavailable"],+ "missing_registered_worker": ["scan_root_unavailable"],+ "unmeasured": ["token_record_missing", "token_usage_unavailable", "turn_in_progress"],+ }.get(worker_state, [])+ usage = {+ "coverage": "partial" if missing_warnings else "complete",+ "source": "codex_rollout",+ **_counts(100 if measured_worker else 0, 0, 10 if measured_worker else 0),+ "threadCount": 2 if measured_worker else 1,+ **({"missingThreadCount": 1, "warnings": missing_warnings} if missing_warnings else {}),+ }++ completed = _complete_scan(fixture)["scan"]++ assert completed["usage"].items() >= usage.items()+ usage = completed["usage"]+ assert usage["byRole"]["parent"] == {**_counts(0, 0, 0), "threadCount": 1}+ assert usage["byRole"]["workers"] == {+ **_counts(100 if measured_worker else 0, 0, 10 if measured_worker else 0),+ "threadCount": 1 if measured_worker else 0,+ }+ assert "cost" not in completed+ repeated = scan_command(+ fixture.state_dir, "complete-scan", fixture.scan_id, environment=fixture.environment+ )["scan"]+ assert repeated["usage"] == usage+ assert "cost" not in repeated+ with sqlite3.connect(fixture.state_dir / "workbench.sqlite3") as connection:+ stored = connection.execute(+ "SELECT cost_json FROM scans WHERE id = ?", (fixture.scan_id,)+ ).fetchone()[0]+ assert json.loads(stored) == {"usage": usage}++[email protected]("turn_start", ["before_scan", "during_scan", "untimestamped", "post_scan"])+def test_direct_control_resumed_model_turn_requires_a_usage_receipt(+ tmp_path: Path, turn_start: str+) -> None:+ fixture = _start_scan(tmp_path, mode="deep")+ counted = fixture.started_at + timedelta(microseconds=1)+ timestamp = (+ fixture.started_at - timedelta(seconds=1)+ if turn_start == "before_scan"+ else counted + timedelta(days=1)+ if turn_start == "post_scan"+ else counted+ )+ event = _event(timestamp, "event_msg", {"type": "task_started", "turn_id": "resumed-turn"})+ if turn_start == "untimestamped":+ del event["timestamp"]+ _state_graph(+ fixture.environment,+ {+ "scan-parent": _rollout(+ tmp_path, "scan-parent", [event], originator="codex_security_deep_scan"+ ),+ "scan-worker": _rollout(+ tmp_path,+ "scan-worker",+ [_token_event(counted, 100, 10)],+ parent_thread_id="scan-parent",+ ),+ },+ [("scan-parent", "scan-worker")],+ )++ usage = _complete_scan(fixture)["scan"]["usage"]++ expected = {+ "coverage": "complete" if turn_start == "post_scan" else "partial",+ "source": "codex_rollout",+ **_counts(100, 0, 10),+ "threadCount": 2 if turn_start == "post_scan" else 1,+ **(+ {}+ if turn_start == "post_scan"+ else {+ "missingThreadCount": 1,+ "warnings": [+ "token_record_missing",+ "token_usage_unavailable",+ "turn_record_invalid" if turn_start == "untimestamped" else "turn_in_progress",+ ],+ }+ ),+ }+ assert usage.items() >= expected.items()++[email protected]("originator", ["codex_sdk_ts", "synthetic_override", None])+def test_metadata_only_deep_owner_requires_direct_control_originator(+ tmp_path: Path, originator: str | None+) -> None:+ fixture = _start_scan(tmp_path, mode="deep")+ _state_graph(+ fixture.environment,+ {"scan-parent": _rollout(tmp_path, "scan-parent", [], originator=originator)},+ [],+ )++ assert _complete_scan(fixture)["scan"]["usage"] == {+ "coverage": "unavailable",+ "source": "codex_rollout",+ "threadCount": 0,+ "warnings": ["token_record_missing", "token_usage_unavailable"],+ }++def test_usage_is_returned_by_completion_without_an_extra_command(tmp_path: Path) -> None:fixture = _start_scan(tmp_path)counted = fixture.started_at + timedelta(microseconds=1)@@ -1704,51 +1967,36 @@ def test_worker_discovery_matches_platform_path_spelling(assert warnings == set()-def test_completion_uses_latest_account_snapshot_across_owned_sessions(tmp_path: Path) -> None:[email protected]("parent_measured", [False, True])[email protected]("worker_measured", [False, True])+def test_completion_uses_latest_account_snapshot_across_owned_sessions(+ tmp_path: Path, parent_measured: bool, worker_measured: bool+) -> None:fixture = _start_scan(tmp_path)first = fixture.started_at + timedelta(microseconds=1)latest = first + timedelta(microseconds=1)- def allowance(timestamp: datetime, percent: int, limit: str = "codex") -> dict[str, Any]:- return _event(- timestamp,- "event_msg",- {- "type": "token_count",- "info": None,- "rate_limits": {- "limit_id": limit,- "primary": {- "used_percent": percent,- "window_minutes": 10080,- "resets_at": 1800000000,- },- "secondary": None,- },- },- )-parent = _rollout(tmp_path,"scan-parent",[- _token_event(first, 10, 3),- allowance(first, 6),- allowance(first, 2, "another-limit"),- allowance(first + timedelta(days=1), 99),+ *([_token_event(first, 10, 3)] if parent_measured else []),+ _allowance_event(first, 6),+ _allowance_event(first, 2, "another-limit"),+ _allowance_event(first + timedelta(days=1), 99),],)worker = _rollout(tmp_path,"worker",[- _token_event(first, 20, 5),- allowance(latest, 69),- allowance(first, 6),+ *([_token_event(first, 20, 5)] if worker_measured else []),+ _allowance_event(latest, 69),+ _allowance_event(first, 6),],parent_thread_id="scan-parent",)- unrelated = _rollout(tmp_path, "unrelated", [allowance(latest, 100)])+ unrelated = _rollout(tmp_path, "unrelated", [_allowance_event(latest, 100)])_state_graph(fixture.environment,{@@ -1761,9 +2009,24 @@ def test_completion_uses_latest_account_snapshot_across_owned_sessions(tmp_path:completed = _complete_scan(fixture)usage = completed["scan"]["usage"]- assert usage["coverage"] == "complete"- assert usage["totalTokens"] == 38- assert datetime.fromisoformat(usage["tokensUpdatedAt"]) == first+ measured = int(parent_measured) + int(worker_measured)+ assert usage["coverage"] == (+ "complete" if measured == 2 else "partial" if measured else "unavailable"+ )+ assert usage["threadCount"] == measured+ if measured:+ assert usage["totalTokens"] == 13 * parent_measured + 25 * worker_measured+ assert usage["byRole"]["parent"]["threadCount"] == int(parent_measured)+ assert usage["byRole"]["workers"]["threadCount"] == int(worker_measured)+ assert datetime.fromisoformat(usage["tokensUpdatedAt"]) == first+ if measured == 1:+ assert usage["missingThreadCount"] == 1+ else:+ assert not set(_counts(0, 0, 0)).intersection(usage)+ assert "byRole" not in usage+ assert "tokensUpdatedAt" not in usage+ if measured < 2:+ assert usage["warnings"] == ["token_record_missing", "token_usage_unavailable"]limits = {item["limitId"]: item for item in usage["accountRateLimits"]}assert limits["codex"] == {"limitId": "codex",@@ -1772,6 +2035,80 @@ def test_completion_uses_latest_account_snapshot_across_owned_sessions(tmp_path:"secondary": None,}assert limits["another-limit"]["primary"]["usedPercent"] == 2+ assert (+ scan_command(+ fixture.state_dir, "get-scan", fixture.scan_id, environment=fixture.environment+ )["scan"]["usage"]+ == usage+ )+++def test_host_final_usage_saves_allowances_before_token_receipts(tmp_path: Path) -> None:+ fixture = _start_scan(tmp_path)+ arguments = ("--thread-id", "scan-parent", "--turn-id", "turn-scan-parent")+ initial = _complete_scan(fixture, *arguments)["scan"]["usage"]+ parent = _rollout(+ tmp_path,+ "scan-parent",+ [_allowance_event(fixture.started_at, 6)],+ )+ _state_graph(fixture.environment, {"scan-parent": parent}, [])++ pending = scan_command(+ fixture.state_dir,+ "finalize-scan-usage",+ fixture.scan_id,+ *arguments,+ environment=fixture.environment,+ )["scan"]["usage"]+ assert pending["coverage"] == "unavailable"+ assert pending["completion"] == initial["completion"]+ assert not set(_counts(0, 0, 0)).intersection(pending)+ assert pending["accountRateLimits"][0]["primary"]["usedPercent"] == 6+ assert (+ scan_command(+ fixture.state_dir, "get-scan", fixture.scan_id, environment=fixture.environment+ )["scan"]["usage"]+ == pending+ )++ with parent.open("a", encoding="utf-8") as output:+ receipt = _response_event(fixture.started_at, "scan-parent", "final-response", 10, 2)+ output.write(f"{json.dumps(receipt)}\n")+ finalized = scan_command(+ fixture.state_dir,+ "finalize-scan-usage",+ fixture.scan_id,+ *arguments,+ environment=fixture.environment,+ )["scan"]["usage"]+ assert finalized["totalTokens"] == 12+ assert finalized["completion"]["finalized"] is True+ assert finalized["accountRateLimits"] == pending["accountRateLimits"]++[email protected]("limits", [{"limitId": "codex"}, [{"limitId": "codex"}]])+def test_completion_validates_account_snapshots_without_token_usage(+ tmp_path: Path, limits: object+) -> None:+ fixture = _start_scan(tmp_path)+ usage = {+ "coverage": "unavailable",+ "source": "codex_rollout",+ "threadCount": 0,+ "accountRateLimits": limits,+ }+ rejected = scan_command(+ fixture.state_dir,+ "complete-scan",+ fixture.scan_id,+ "--cost-json",+ json.dumps({"usage": usage}),+ environment=fixture.environment,+ check=False,+ )+ assert rejected["returncode"] != 0+ assert "invalid measured token usage" in rejected["stderr"]@pytest.mark.parametrize("terminal", [None, "task_complete", "turn_aborted"])@@ -1795,15 +2132,16 @@ def test_completion_marks_worker_without_token_receipt_partial(usage = _complete_scan(fixture)["scan"]["usage"]assert usage["coverage"] == "partial"- expected_warnings = {"token_record_missing"}+ expected_warnings = {"token_record_missing", "token_usage_unavailable"}if terminal is None:expected_warnings.add("turn_in_progress")elif terminal == "turn_aborted":expected_warnings.add("turn_interrupted")assert set(usage["warnings"]) == expected_warningsassert usage["totalTokens"] == 15- assert usage["threadCount"] == 2- assert usage["byRole"]["workers"] == {**_counts(0, 0, 0), "threadCount": 1}+ assert usage["threadCount"] == 1+ assert usage["missingThreadCount"] == 1+ assert usage["byRole"]["workers"] == {**_counts(0, 0, 0), "threadCount": 0}assert usage["accountRateLimits"] == []diff --git a/plugins/codex-security/tests/test_workbench_setup_and_migrations.py b/plugins/codex-security/tests/test_workbench_setup_and_migrations.pyindex edd2ebd3b..59b149f4d 100644--- a/plugins/codex-security/tests/test_workbench_setup_and_migrations.py+++ b/plugins/codex-security/tests/test_workbench_setup_and_migrations.py@@ -92,6 +92,7 @@ EXPECTED_MIGRATIONS = [(48, "share finding issue receipts across trackers"),(49, "index finding issue receipt ownership"),(50, "persist authorized source excerpt scopes"),+ (51, "preserve deep scan worker thread history"),]diff --git a/sdk/typescript/docs/cli.md b/sdk/typescript/docs/cli.mdindex eca87ee42..6c467292d 100644--- a/sdk/typescript/docs/cli.md+++ b/sdk/typescript/docs/cli.md@@ -822,14 +822,28 @@ that command. Model, effort, and provider choices carry into patch-risk assessmeModel requests include Codex Security attribution in `responses_api_metadata`:`codex_security_surface` (`cli` or `sdk`), `codex_security_command`,`codex_security_package_version`, and `codex_security_plugin_version` when the-selected plugin declares a version. These fields identify the workflow and-versions producing a model request; they do not record command starts,-completions, or failures.+selected plugin declares a version. The shared context adds+`codex_security_provider` for the configured provider family when the wrapper+selects a provider, and+`codex_security_scan_mode` for scans. Custom provider names use `custom`.+Provider attribution reflects the wrapper's selected profile or default;+native managed configuration may select a different provider before inference.+The GitHub Action supplies `codex_security_integration=github_action`;+Deep Scan workers retain the context and add `codex_security_worker_role`.+Caller metadata, including literal dotted keys, is preserved. Connected-app+publication uses the same request attribution; embedding requests identify+the package and version in their `User-Agent`.++These fields provide request attribution for supported inference providers, including+Bedrock. They do not create a separate telemetry collector, record command+starts or outcomes, or make another provider's traffic visible to OpenAI.Disable Codex usage analytics and built-in metrics with`--codex 'analytics.enabled=false'`. The setting carries into `scan --patch`,patch-risk assessment, and Deep Scan discovery and reducer workers, including-resumed workers. Deep Scan workers also preserve the scan's request metadata.+resumed workers. Selected-profile settings take precedence over root settings.+Explicit OpenTelemetry settings also carry into scan patches and Deep Scan+workers, including exporter choices and prompt-logging controls.Model-request attribution metadata remains attached when analytics are disabled.The setting does not control configured OpenTelemetry exporters, integrations,authentication, or CLI update checks. Validation uses isolated configuration;diff --git a/sdk/typescript/src/api.ts b/sdk/typescript/src/api.tsindex 7f2e8029d..f0f9c9ce0 100644--- a/sdk/typescript/src/api.ts+++ b/sdk/typescript/src/api.ts@@ -97,7 +97,7 @@ import {import type { ScanTokenUsage } from "./cost-model.js";import { ScanProgressTracker, type DeepScanProgress } from "./scan-progress.js";import { findScanSession } from "./scan-logs.js";-import { runDeepScan } from "./deep-scan.js";+import { DIRECT_DEEP_SCAN_CONTROL_USAGE, runDeepScan } from "./deep-scan.js";import {deepScanOptions,resolveDeepScanConfig,@@ -198,7 +198,7 @@ import {type ScanWorkerStatus,} from "./worker-progress.js";import { CODEX_SECURITY_THREAD_SOURCES } from "./thread-source.js";-import { codexSecurityRequestMetadata } from "./request-metadata.js";+import { codexSecurityRequestContext } from "./request-metadata.js";import { CODEX_EXECUTABLE_VERSION, CODEX_SDK_VERSION } from "./version.js";import { bundledCodexSdkEnvironment } from "./codex-sdk-environment.js";import {@@ -892,7 +892,7 @@ export class CodexSecurity {session.sessionConfig["approval_policy"] = "never";const { codex } = await this.#createSessionCodex(session,- "validate",+ { command: "validate" },{CODEX_SECURITY_REPOSITORY: inputs.repository,CODEX_SECURITY_PLUGIN_ROOT: runtime.plugin.pluginRoot,@@ -1003,7 +1003,7 @@ export class CodexSecurity {};const { codex } = await this.#createSessionCodex(session,- "patch",+ { command: "patch" },{CODEX_SECURITY_REPOSITORY: repository,CODEX_SECURITY_PLUGIN_ROOT: session.runtime.plugin.pluginRoot,@@ -1033,7 +1033,9 @@ export class CodexSecurity {onCost:options.onCost === undefined? undefined- : notifyObserver(options, "onCost"),+ : (cost, complete) => {+ if (complete) notifyObserver(options, "onCost")(cost);+ },onError: reportTrackingError,});const thread = codex.startThread({@@ -1407,7 +1409,7 @@ export class CodexSecurity {);const { codex } = await this.#createSessionCodex(session,- "policy",+ { command: "policy" },{CODEX_SECURITY_REPOSITORY: target.repository,CODEX_SECURITY_PLUGIN_ROOT: runtime.plugin.pluginRoot,@@ -1425,9 +1427,12 @@ export class CodexSecurity {`permissions.${POLICY_PERMISSION_PROFILE}.filesystem=${inlineToml(policyFilesystem)}`,],);- const reportCost = (current: Readonly<ScanCost>): void => {+ const reportCost = (+ current: Readonly<ScanCost>,+ complete = true,+ ): void => {const total = addScanCosts(accumulatedCost, current);- if (completeCost) notifyObserver(options, "onCost")(total);+ if (completeCost && complete) notifyObserver(options, "onCost")(total);if (options.maxCostUsd !== undefined &&total.estimatedUsd > options.maxCostUsd@@ -1599,6 +1604,7 @@ export class CodexSecurity {]);let maxCostUsd = options.maxCostUsd;let latestCost: Readonly<ScanCost> | null = null;+ let latestCostComplete = false;let notifiedLimit: number | undefined;let scanDir = "";let targetPathsFile: string | null = null;@@ -1845,16 +1851,12 @@ export class CodexSecurity {: {};const workerSnapshot: JsonObject = {...workerRuntimeConfig,- responses_api_metadata: {- ...(isRecord(workerRuntimeConfig["responses_api_metadata"])- ? workerRuntimeConfig["responses_api_metadata"]- : {}),- ...codexSecurityRequestMetadata(- this.#surface,- "scan",- runtime.plugin.version,- ),- },+ responses_api_metadata: codexSecurityRequestContext(effectiveConfig, {+ surface: this.#surface,+ command: "scan",+ pluginVersion: runtime.plugin.version,+ mode,+ }).metadata,...(workerEnvironment === undefined? {}: { environment: workerEnvironment }),@@ -2042,9 +2044,11 @@ export class CodexSecurity {onCost:options.onCost === undefined && options.maxCostUsd === undefined? undefined- : (cost) => {+ : (cost, complete) => {latestCost = cost;- notifyObserver(options, "onCost")(cost, maxCostUsd);+ latestCostComplete = complete;+ if (complete)+ notifyObserver(options, "onCost")(cost, maxCostUsd);if (maxCostUsd !== undefined &&cost.estimatedUsd > maxCostUsd@@ -2096,7 +2100,11 @@ export class CodexSecurity {);if (budgetSignal.aborted) return;maxCostUsd = next;- notifyObserver(options, "onCost")(latestCost!, maxCostUsd);+ if (latestCostComplete)+ notifyObserver(options, "onCost")(+ latestCost!,+ maxCostUsd,+ );}).catch((error: unknown) => {if (!budgetSignal.aborted) {@@ -2486,7 +2494,7 @@ export class CodexSecurity {const { codex, environment, codexOptions } =await this.#createSessionCodex(session,- "scan",+ { command: "scan", mode },runtimePaths,options.auth,git,@@ -2599,6 +2607,8 @@ export class CodexSecurity {return;}if (budgetRecovery !== null) budgetRecovery.threadId = threadId;+ if (directDeepScan)+ tracker.recordUsage(DIRECT_DEEP_SCAN_CONTROL_USAGE, threadId);tracker.start(threadId);try {await workbench(@@ -2893,7 +2903,10 @@ export class CodexSecurity {"all",);if (previousFindings !== undefined) {- const matchingRuntimeConfig = structuredClone(workerRuntimeConfig);+ const matchingRuntimeConfig: JsonObject = {+ ...structuredClone(workerRuntimeConfig),+ responses_api_metadata: workerSnapshot["responses_api_metadata"]!,+ };const matchingFeatures = matchingRuntimeConfig["features"];if (isRecord(matchingFeatures)) delete matchingFeatures["plugins"];await matchCompletedScan({@@ -3339,7 +3352,7 @@ export class CodexSecurity {async #createSessionCodex(session: PreparedSession,- command: string,+ { command, mode }: { command: string; mode?: ScanMode },runtimePaths: Record<string, string>,auth: ScanAuthMode = "auto",git?: InspectedExecutable,@@ -3488,11 +3501,16 @@ export class CodexSecurity {...configOverrides,];}- const configuredResponsesMetadata = isRecord(- sdkCodexConfig["responses_api_metadata"],- )- ? sdkCodexConfig["responses_api_metadata"]- : {};+ const requestContext = codexSecurityRequestContext(+ config ?? sessionConfig,+ {+ surface: this.#surface,+ command,+ pluginVersion: runtime.plugin.version,+ mode,+ },+ );+ delete sdkCodexConfig["responses_api_metadata"];const configuredCodexPath = environmentValue(this.#dependencies.environment,"CODEX_CLI_PATH",@@ -3521,23 +3539,9 @@ export class CodexSecurity {...(runtime.providerProfile === undefined? {}: { nativeProfile: runtime.providerProfile.name }),- ...(configOverrides.length > 0- ? {- configOverrides,- }- : {}),+ configOverrides: [...configOverrides, requestContext.configOverride],env: sdkEnvironment,- config: {- ...(sdkCodexConfig as NonNullable<CodexOptions["config"]>),- responses_api_metadata: {- ...configuredResponsesMetadata,- ...codexSecurityRequestMetadata(- this.#surface,- command,- runtime.plugin.version,- ),- },- },+ config: sdkCodexConfig as NonNullable<CodexOptions["config"]>,};const codex = await this.#dependencies.createCodex(codexOptions);return { codex, environment, codexOptions };@@ -4596,7 +4600,8 @@ export async function runScanEvents(}// Managed scans reconcile saved checkpoints before admitting canonical artifacts.if (options.workbenchValidated && options.onFinalize !== undefined) {- usage = (await options.onFinalize(usage)) ?? usage;+ const finalizedUsage = await options.onFinalize(usage);+ if (finalizedUsage !== undefined) usage = finalizedUsage;}options.signal.throwIfAborted();await requireScanArtifacts(@@ -4632,7 +4637,8 @@ export async function runScanEvents();}if (!options.workbenchValidated && options.onFinalize !== undefined) {- usage = (await options.onFinalize(usage)) ?? usage;+ const finalizedUsage = await options.onFinalize(usage);+ if (finalizedUsage !== undefined) usage = finalizedUsage;}const result = await collectResult({diff --git a/sdk/typescript/src/cli.ts b/sdk/typescript/src/cli.tsindex 4017ce8d4..cbcb1ed61 100644--- a/sdk/typescript/src/cli.ts+++ b/sdk/typescript/src/cli.ts@@ -212,6 +212,7 @@ import {checkScanPublication,forceTerminatePublicationProcesses as terminatePublishers,publishScan,+ publishScanInternal,type CheckScanPublicationOptions,type PublishScanProgress,type PublishScanResult,@@ -249,7 +250,7 @@ import {type ScanMatchingBatch,} from "./scan-comparison.js";import { scanActivitiesFromEvent } from "./scan-activity.js";-import { codexSecurityRequestMetadata } from "./request-metadata.js";+import { codexSecurityRequestContext } from "./request-metadata.js";import {CODEX_SECURITY_THREAD_SOURCES,type CodexSecurityThreadSource,@@ -1103,6 +1104,8 @@ interface SkillRunOptions {provider?: string;providerConfiguration?: JsonObject;environment?: NodeJS.ProcessEnv;+ requestMetadata?: JsonObject;+ otel?: JsonObject;patchArtifact?: {path: string;repository: string;@@ -3328,27 +3331,28 @@ export async function main(}let result;try {- result = await (dependencies.publishScan ?? publishScan)(- resolveCliPath(currentDirectory, scanDir),- {- ...destination!,- ...(options.findingId.length === 0- ? {}- : { findingIds: options.findingId }),- ...(selectedScans[0]?.scanId === undefined- ? {}- : { expectedScanId: selectedScans[0].scanId }),- dryRun: options.dryRun,- signal: controller.signal,- ...(options.skipExisting ? { skipExisting: true } : {}),- ...(options.dryRun- ? {}- : {- onProgress: (event: PublishScanProgress) =>- progress.observe(event),- }),- },- );+ result = await (+ dependencies.publishScan ??+ ((directory, options) =>+ publishScanInternal(directory, options, { surface: "cli" }))+ )(resolveCliPath(currentDirectory, scanDir), {+ ...destination!,+ ...(options.findingId.length === 0+ ? {}+ : { findingIds: options.findingId }),+ ...(selectedScans[0]?.scanId === undefined+ ? {}+ : { expectedScanId: selectedScans[0].scanId }),+ dryRun: options.dryRun,+ signal: controller.signal,+ ...(options.skipExisting ? { skipExisting: true } : {}),+ ...(options.dryRun+ ? {}+ : {+ onProgress: (event: PublishScanProgress) =>+ progress.observe(event),+ }),+ });} finally {progress.stop();}@@ -7953,6 +7957,26 @@ async function runSkill(const threadSource = patch? CODEX_SECURITY_THREAD_SOURCES.remediation: CODEX_SECURITY_THREAD_SOURCES.validation;+ const requestContext = codexSecurityRequestContext(+ {+ ...effectiveOverrides,+ ...(options.requestMetadata === undefined+ ? {}+ : { responses_api_metadata: options.requestMetadata }),+ },+ {+ surface: "cli",+ command: assess+ ? "assess-patch-risk"+ : verify+ ? "verify-fix"+ : patch+ ? "patch"+ : "validate",+ pluginVersion,+ providerResolved: provider !== undefined || validate,+ },+ );return dependencies.runCodex([...(appServer@@ -7980,6 +8004,9 @@ async function runSkill(value.startsWith("analytics.") || value.startsWith("analytics="),).flatMap((value) => ["--config", value]),+ ...(options.otel === undefined+ ? []+ : ["--config", `otel=${inlineToml(options.otel)}`]),...(provider === undefined? []: ["--config", `model_provider=${JSON.stringify(provider)}`]),@@ -7994,22 +8021,8 @@ async function runSkill(...(verify || assess? ["--config", 'approvals_reviewer="auto_review"']: []),- ...Object.entries(- codexSecurityRequestMetadata(- "cli",- assess- ? "assess-patch-risk"- : verify- ? "verify-fix"- : patch- ? "patch"- : "validate",- pluginVersion,- ),- ).flatMap(([key, value]) => [- "--config",- `responses_api_metadata.${key}=${JSON.stringify(value)}`,- ]),+ "--config",+ requestContext.configOverride,...(options.safetyIdentifier === undefined? []: [@@ -8682,6 +8695,8 @@ async function executeScan(let auth: ScanAuthMode | undefined = arguments_.auth;let patchAnalyticsOverride: string | undefined;let patchServiceTier: JsonValue | undefined;+ let patchRequestMetadata: JsonObject | undefined;+ let patchOtel: JsonObject | undefined;let patchDaybreak: JsonValue = false;let patchDaybreakFeatures: JsonObject = {};let selectedAuthentication: ScanAuthentication | null = null;@@ -8725,10 +8740,19 @@ async function executeScan(]),);const provider = scanModelProvider(effectiveConfiguration);- const analytics = effectiveConfiguration["analytics"];+ const analytics = resolvedConfiguration["analytics"];if (isJsonObject(analytics) && analytics["enabled"] !== undefined) {patchAnalyticsOverride = `analytics.enabled=${JSON.stringify(analytics["enabled"])}`;}+ patchRequestMetadata = {+ ...codexSecurityRequestContext(resolvedConfiguration, {+ surface: "cli",+ command: "scan",+ mode: arguments_.mode,+ }).metadata,+ };+ const otel = resolvedConfiguration["otel"];+ if (isJsonObject(otel)) patchOtel = otel;auth =!arguments_.dryRun && !arguments_.mock && interactive? await chooseInteractiveAuthentication(@@ -9478,6 +9502,8 @@ async function executeScan({...providerOptions,serviceTier: patchServiceTier,+ requestMetadata: patchRequestMetadata,+ otel: patchOtel,daybreakFeatures: patchDaybreakFeatures,cyberAccessProgram: arguments_.cyberAccessProgram,safetyIdentifier: arguments_.safetyIdentifier,diff --git a/sdk/typescript/src/cost.ts b/sdk/typescript/src/cost.tsindex a485b0e7b..5faa6723b 100644--- a/sdk/typescript/src/cost.ts+++ b/sdk/typescript/src/cost.ts@@ -58,7 +58,8 @@ interface ScanCostTrackerOptions {scanDirectory?: string;maxCostUsd?: number;expectedFilesTotal?: number;- onCost?: (cost: Readonly<ScanCost>) => void;+ /** Incomplete costs are measured subtotals, usable for spending limits only. */+ onCost?: (cost: Readonly<ScanCost>, complete: boolean) => void;onUsage?: (usage: Readonly<ScanTokenUsage>) => void;onActivity?: (activity: ScanActivity) => void;onProgress?: (progress: ScanProgress) => void;@@ -311,6 +312,9 @@ export class ScanCostTracker {this.#reportWorkerProgress(session);}const receipt = usages.get(threadId);+ // A discovered thread without a receipt has unknown usage, not zero.+ // Retain it so a parent-only subtotal cannot appear to be complete.+ if (receipt === undefined) usages.set(threadId, null);if (session.usage !== null &&(session.usage.total_tokens > (receipt?.total_tokens ?? -1) ||@@ -322,18 +326,22 @@ export class ScanCostTracker {}}let usage: ScanTokenUsage | null = null;+ let complete = true;for (const value of usages.values()) {if (value === null) {- this.#snapshot = { usage: null, cost: null };- return;+ complete = false;+ continue;}usage = addTokenUsage(usage, value);}+ if (!complete) this.#snapshot = { usage: null, cost: null };if (usage === null) return;const cost = estimateScanCost(this.#options.model, usage);- this.#snapshot = { usage, cost };- this.#reportUsage(usage);- this.#reportCost(cost);+ if (complete) {+ this.#snapshot = { usage, cost };+ this.#reportUsage(usage);+ }+ this.#reportCost(cost, complete);}#reportWorkerProgress(session: SessionUsage): void {@@ -375,12 +383,12 @@ export class ScanCostTracker {}}- #reportCost(cost: ScanCost | null): void {+ #reportCost(cost: ScanCost | null, complete = true): void {if (cost === null) return;- const signature = JSON.stringify(cost);+ const signature = JSON.stringify([cost, complete]);if (signature === this.#lastCost) return;this.#lastCost = signature;- this.#options.onCost?.(cost);+ this.#options.onCost?.(cost, complete);}#reportUsage(usage: ScanTokenUsage | null): void {diff --git a/sdk/typescript/src/deduplication/codex-review.ts b/sdk/typescript/src/deduplication/codex-review.tsindex 857d029e3..5508c842c 100644--- a/sdk/typescript/src/deduplication/codex-review.ts+++ b/sdk/typescript/src/deduplication/codex-review.ts@@ -22,7 +22,7 @@ import {import { CODEX_SECURITY_THREAD_SOURCES } from "../thread-source.js";import { VERSION } from "../version.js";import type { CodexSecuritySurface } from "../api.js";-import { codexSecurityRequestMetadata } from "../request-metadata.js";+import { codexSecurityRequestContext } from "../request-metadata.js";import {DeduplicationReviewError,type DeduplicationReviewFailureCategory,@@ -388,11 +388,14 @@ export class CodexReviewRunner {update_plan: { enabled: false },experimental_request_user_input: { enabled: false },},- responses_api_metadata: {- ...(executionConfig["responses_api_metadata"] as- Record<string, string> | undefined),- ...codexSecurityRequestMetadata(this.surface, "dedupe"),- },+ responses_api_metadata: codexSecurityRequestContext(+ executionConfig,+ {+ surface: this.surface,+ command: "dedupe",+ providerResolved: false,+ },+ ).metadata,features: {code_mode: {direct_only_tool_namespaces: ["review_validator"],diff --git a/sdk/typescript/src/deep-scan.ts b/sdk/typescript/src/deep-scan.tsindex 17ba6bb8c..e81f1079a 100644--- a/sdk/typescript/src/deep-scan.ts+++ b/sdk/typescript/src/deep-scan.ts@@ -19,6 +19,14 @@ export interface DirectDeepScanOptions {signal: AbortSignal;}+// The direct coordinator records context but never calls a model itself.+export const DIRECT_DEEP_SCAN_CONTROL_USAGE = {+ input_tokens: 0,+ cached_input_tokens: 0,+ cache_write_input_tokens: 0,+ output_tokens: 0,+} as const;+/** Run the same coordinator as the plugin, without a parent model turn. */export async function* runDeepScan(options: DirectDeepScanOptions,@@ -95,12 +103,7 @@ export async function* runDeepScan(// existing scan tracker from the native sessions below this scan directory.yield {type: "turn.completed",- usage: {- input_tokens: 0,- cached_input_tokens: 0,- cache_write_input_tokens: 0,- output_tokens: 0,- },+ usage: { ...DIRECT_DEEP_SCAN_CONTROL_USAGE },};}diff --git a/sdk/typescript/src/publish.ts b/sdk/typescript/src/publish.tsindex d7f263cb5..2a5d75b43 100644--- a/sdk/typescript/src/publish.ts+++ b/sdk/typescript/src/publish.ts@@ -1,4 +1,6 @@import { findingEntry, notify } from "./value.js";+import type { CodexSecuritySurface } from "./api.js";+import { codexSecurityRequestContext } from "./request-metadata.js";import {spawn,spawnSync,@@ -174,6 +176,7 @@ export interface PublicationCodexResult {}export interface PublishScanDependencies {+ surface?: CodexSecuritySurface;environment?: NodeJS.ProcessEnv;linearClient?: LinearClientFactory<"users" | "createIssue">;prepare?: typeof prepareScanPublication;@@ -332,6 +335,15 @@ export async function publishScanInternal(options.signal,);} else {+ const requestContext = codexSecurityRequestContext(+ {},+ {+ surface: dependencies.surface ?? "sdk",+ command: "publish",+ // Native Codex resolves provider and metadata from all its config layers.+ providerResolved: false,+ },+ );invocation = await (dependencies.runCodex ?? runPublicationCodex)(command!,[@@ -340,6 +352,8 @@ export async function publishScanInternal("gpt-5.6-luna","-c",'model_reasoning_effort="low"',+ "-c",+ requestContext.configOverride,"--ephemeral","--json","--sandbox",diff --git a/sdk/typescript/src/request-metadata.ts b/sdk/typescript/src/request-metadata.tsindex 0460d51ef..6d9c3bd97 100644--- a/sdk/typescript/src/request-metadata.ts+++ b/sdk/typescript/src/request-metadata.ts@@ -1,18 +1,63 @@import type { CodexSecuritySurface } from "./api.js";+import { inlineToml, resolveCodexProfile, type JsonObject } from "./config.js";+import { isRecord } from "./record.js";+import type { ScanMode } from "./scan-modes.js";import { VERSION } from "./version.js";-/** Attribution for model requests, independent of native analytics events. */-export function codexSecurityRequestMetadata(- surface: CodexSecuritySurface,- command: string,- pluginVersion?: string,+interface RequestContextOptions {+ surface: CodexSecuritySurface;+ command: string;+ pluginVersion?: string;+ mode?: ScanMode;+ /** False when this caller leaves provider selection to native config layers. */+ providerResolved?: boolean;+}++/** Per-operation attribution, independent of native analytics and OTel settings.+ * Provider family reflects wrapper configuration; native managed settings can override it. */+export function codexSecurityRequestContext(+ config: Readonly<JsonObject>,+ context: RequestContextOptions,) {- return {- codex_security_surface: surface,- codex_security_command: command,+ const resolved = resolveCodexProfile(config);+ const configured = resolved["responses_api_metadata"];+ const metadata = Object.freeze({+ ...(isRecord(configured) ? configured : {}),+ codex_security_surface: context.surface,+ codex_security_command: context.command,codex_security_package_version: VERSION,- ...(pluginVersion === undefined+ ...(context.pluginVersion === undefined+ ? {}+ : { codex_security_plugin_version: context.pluginVersion }),+ ...(context.providerResolved === false? {}- : { codex_security_plugin_version: pluginVersion }),- };+ : {+ codex_security_provider: providerFamily(resolved["model_provider"]),+ }),+ ...(context.mode === undefined+ ? {}+ : { codex_security_scan_mode: context.mode }),+ }) as Readonly<Record<string, string>>;+ return Object.freeze({+ metadata,+ // The SDK's structured config flattens literal dotted keys into nested tables.+ configOverride: `responses_api_metadata=${inlineToml(metadata)}`,+ });+}++function providerFamily(provider: unknown): string {+ if (typeof provider !== "string")+ return provider === undefined ? "openai" : "custom";+ switch (provider) {+ case "openai":+ case "amazon-bedrock":+ case "cheaperinference":+ case "openrouter":+ case "fireworks":+ case "ollama":+ case "lmstudio":+ return provider;+ default:+ return "custom";+ }}diff --git a/sdk/typescript/src/scan-comparison.ts b/sdk/typescript/src/scan-comparison.tsindex 8609f62ab..acd1901cb 100644--- a/sdk/typescript/src/scan-comparison.ts+++ b/sdk/typescript/src/scan-comparison.ts@@ -25,7 +25,6 @@ import {DEFAULT_CODEX_CONFIG,deepMerge,hasCommandAuth,- inlineToml,mergedCodexConfig,normalizeLegacyWindowsSandboxOverride,resolveCodexProfile,@@ -38,7 +37,7 @@ import {type JsonObject,} from "./config.js";import { CodexSecurityError, ConfigurationError } from "./errors.js";-import { codexSecurityRequestMetadata } from "./request-metadata.js";+import { codexSecurityRequestContext } from "./request-metadata.js";import {createProfileCodex,createProviderProfile,@@ -570,15 +569,21 @@ async function startReadOnlyCodexThread();}const sdkConfig = structuredCodexConfig(config);- const requestMetadata = {- ...(homeExecutionConfig["responses_api_metadata"] as- JsonObject | undefined),- ...(sdkConfig["responses_api_metadata"] as JsonObject | undefined),- ...codexSecurityRequestMetadata(- runtimeOptions.surface,- runtimeOptions.command,- ),- };+ const requestContext = codexSecurityRequestContext(+ {+ ...sdkConfig,+ responses_api_metadata: {+ ...(homeExecutionConfig["responses_api_metadata"] as+ JsonObject | undefined),+ ...(sdkConfig["responses_api_metadata"] as JsonObject | undefined),+ },+ },+ {+ surface: runtimeOptions.surface,+ command: runtimeOptions.command,+ providerResolved: sdkConfig["model_provider"] !== undefined,+ },+ );delete sdkConfig["responses_api_metadata"];delete sdkConfig["default_permissions"];const providerSettings = commandAuth ? providerConfig : (config ?? {});@@ -594,8 +599,7 @@ async function startReadOnlyCodexThread();const command = resolveCodexCommand(environment);const codexOptions: CodexOptions = {- // A single table preserves literal keys that the SDK would split on dots.- configOverrides: [`responses_api_metadata=${inlineToml(requestMetadata)}`],+ configOverrides: [requestContext.configOverride],codexPathOverride: executablePathForSpawn(command.command),env: environment,// The SDK forwards its apiKey option as CODEX_API_KEY for Codex exec.diff --git a/sdk/typescript/src/server/embeddings.ts b/sdk/typescript/src/server/embeddings.tsindex 4f68a9ef4..b06ff843b 100644--- a/sdk/typescript/src/server/embeddings.ts+++ b/sdk/typescript/src/server/embeddings.ts@@ -2,6 +2,7 @@ import { Tiktoken } from "js-tiktoken/lite";import cl100kBase from "js-tiktoken/ranks/cl100k_base";import { errorMessage } from "../errors.js";import type { Finding } from "../models.js";+import { VERSION } from "../version.js";import { FindingsError } from "./errors.js";import type { FindingEmbedding } from "./storage.js";@@ -93,6 +94,7 @@ export class OpenAiFindingEmbedder implements FindingEmbedder {headers: {Authorization: `Bearer ${apiKey}`,"Content-Type": "application/json",+ "User-Agent": `codex-security/${VERSION}`,},body: JSON.stringify({model: EMBEDDING_MODEL,diff --git a/sdk/typescript/tests-ts/api-attribution-concurrency.test.ts b/sdk/typescript/tests-ts/api-attribution-concurrency.test.tsindex 1f02e0072..d32313749 100644--- a/sdk/typescript/tests-ts/api-attribution-concurrency.test.ts+++ b/sdk/typescript/tests-ts/api-attribution-concurrency.test.ts@@ -11,6 +11,7 @@ import { PLUGIN_ROOT } from "./plugin-root.js";import { createApiTestFixtures } from "./support/temporary-directories.js";import { InternalSecurity } from "./support/internal-security.js";import { VERSION } from "../src/version.js";+import { requestMetadata } from "./support/request-metadata.js";const fixtures = createApiTestFixtures();@@ -104,8 +105,11 @@ describe("delegated scan attribution", () => {: daybreak,}),analytics: { enabled: surface === "sdk" },+ otel: { environment: `synthetic-${surface}` },responses_api_metadata: {custom_attribution: surface,+ "team.tag": `synthetic-${surface}`,+ codex_security_integration: "github_action",codex_security_surface: "spoofed",codex_security_command: "spoofed",codex_security_package_version: "spoofed",@@ -219,12 +223,22 @@ describe("delegated scan attribution", () => {features,...(model === undefined ? {} : { model }),analytics: { enabled: surface === "sdk" },- responses_api_metadata: {- custom_attribution: surface,- codex_security_surface: surface,- codex_security_command: "scan",- codex_security_package_version: VERSION,- },+ otel: { environment: `synthetic-${surface}` },+ });+ expect(options.config).not.toHaveProperty(+ "responses_api_metadata",+ );+ expect(+ requestMetadata(options.configOverrides),+ ).toMatchObject({+ custom_attribution: surface,+ "team.tag": `synthetic-${surface}`,+ codex_security_integration: "github_action",+ codex_security_surface: surface,+ codex_security_command: "scan",+ codex_security_package_version: VERSION,+ codex_security_provider: "openai",+ codex_security_scan_mode: mode,});const deepConfigPath =options.env?.["CODEX_SECURITY_DEEP_SCAN_CONFIG_PATH"];@@ -237,8 +251,10 @@ describe("delegated scan attribution", () => {parseToml(deepConfig)["worker_runtime"],).toMatchObject({analytics: { enabled: surface === "sdk" },- responses_api_metadata:- options.config?.["responses_api_metadata"],+ otel: { environment: `synthetic-${surface}` },+ responses_api_metadata: requestMetadata(+ options.configOverrides,+ ),});}expect(threadOptions.threadSource).toBe("security_scan");@@ -304,6 +320,7 @@ describe("delegated scan attribution", () => {expect(sharedConfig).not.toHaveProperty("responses_api_metadata",);+ expect(sharedConfig).not.toHaveProperty("otel");expect(sharedConfig).not.toHaveProperty("model");expect(sharedConfig).not.toHaveProperty("codex_security");expect(sharedConfig).not.toHaveProperty("analytics");diff --git a/sdk/typescript/tests-ts/api-credentials.test.ts b/sdk/typescript/tests-ts/api-credentials.test.tsindex ee91b4dc1..21f3ebf31 100644--- a/sdk/typescript/tests-ts/api-credentials.test.ts+++ b/sdk/typescript/tests-ts/api-credentials.test.ts@@ -1,3 +1,4 @@+import { requestMetadata } from "./support/request-metadata.js";import { nodeCommand } from "./support/shell.js";import { existsSync } from "node:fs";import { chmod, mkdir, readFile, stat, writeFile } from "node:fs/promises";@@ -342,10 +343,10 @@ describe("CodexSecurity orchestration", () => {shell_environment_policy: {set: { PRIVATE_TOKEN: "RUNTIME_SHELL_SECRET" },},- responses_api_metadata: {- request_trace: "preserve-configured-metadata",- codex_security_surface: "sdk",- },+ });+ expect(requestMetadata(options.configOverrides)).toMatchObject({+ request_trace: "preserve-configured-metadata",+ codex_security_surface: "sdk",});if (process.platform !== "win32") {expect((await stat(configPath!)).mode & 0o777).toBe(0o600);diff --git a/sdk/typescript/tests-ts/api-direct-deep-scan.test.ts b/sdk/typescript/tests-ts/api-direct-deep-scan.test.tsindex caf3da15f..5076368d2 100644--- a/sdk/typescript/tests-ts/api-direct-deep-scan.test.ts+++ b/sdk/typescript/tests-ts/api-direct-deep-scan.test.ts@@ -14,12 +14,13 @@ import {} from "./support/api-events.js";import { createApiTestFixtures } from "./support/temporary-directories.js";import { runTestInSubprocess } from "./support/test-subprocess.js";+import { writeSession } from "./support/usage-rollout.js";const { temporaryDirectory, cleanup } = createApiTestFixtures();afterEach(cleanup);test.each([undefined, "Summarize the completed scan."])(- "Deep Scan uses the finalized report with post-scan prompt %p",+ "Deep Scan preserves worker usage and the finalized report with post-scan prompt %p",async (postScanPrompt) => {const root = await temporaryDirectory();const repository = join(root, "repository");@@ -31,6 +32,9 @@ test.each([undefined, "Summarize the completed scan."])(const finalReport ="# Final scan report\n\nFinalized synthetic findings.\n";const commands: string[] = [];+ let completionReceipt: string | undefined;+ const { promise: runningCost, resolve: recordCost } =+ Promise.withResolvers<number>();const parentTurn = mock(async () => {throw new Error("A parent model turn must not execute the Deep Scan.");});@@ -42,70 +46,108 @@ test.each([undefined, "Summarize the completed scan."])(runStreamed: postScanTurn,}));const started = mock();- const client = TestClient.withDependencies({- ...scanRuntimeDependencies(codexHome, scanDir),- canRunDirectDeepScan: () => true,- environment: {- CODEX_SECURITY_STATE_DIR: join(root, "state"),- CODEX_API_KEY: "synthetic-direct-scan-key",- },- createCodex: () => ({- startThread: () => ({ id: null, runStreamed: parentTurn }),- resumeThread,- }),- runDeepScan: async function* (options) {- expect(options.scanId).toBe("scan_example_001");- expect(options.codexOptions.env).toMatchObject({- CODEX_SECURITY_SCAN_ID: options.scanId,- CODEX_SECURITY_SCAN_DIR: scanDir,- CODEX_SECURITY_REPOSITORY: repository,- });- await copyCompletedScan(root);- const coveragePath = join(scanDir, "coverage.json");- const coverage = JSON.parse(await readFile(coveragePath, "utf8"));- coverage.mode = "deep_repository";- const coverageBytes = JSON.stringify(coverage);- await writeFile(coveragePath, coverageBytes);- const manifestPath = join(scanDir, "scan-manifest.json");- const manifest = JSON.parse(await readFile(manifestPath, "utf8"));- const artifact = manifest.scan.artifacts.find(- (entry: { path: string }) => entry.path === "coverage.json",- );- artifact.sha256 = hash("sha256", coverageBytes);- await writeFile(manifestPath, JSON.stringify(manifest));- yield { type: "thread.started", thread_id: "engine-session" };- yield {- type: "turn.completed",- usage: {- input_tokens: 0,- cached_input_tokens: 0,- cache_write_input_tokens: 0,- output_tokens: 0,- },- };- },- runWorkbench: async (_options, args, input) => {- commands.push(args[0]!);- if (args[0] === "prepare-scan-completion") {- await writeFile(- join(scanDir, "report.md"),- "# Prepared scan report\n",+ const client = new TestClient(+ { codexOverrides: { model: "gpt-5.6-sol" } },+ {+ ...scanRuntimeDependencies(codexHome, scanDir),+ canRunDirectDeepScan: () => true,+ environment: {+ CODEX_SECURITY_STATE_DIR: join(root, "state"),+ CODEX_API_KEY: "synthetic-direct-scan-key",+ },+ createCodex: () => ({+ startThread: () => ({ id: null, runStreamed: parentTurn }),+ resumeThread,+ }),+ runDeepScan: async function* (options) {+ expect(options.scanId).toBe("scan_example_001");+ expect(options.codexOptions.env).toMatchObject({+ CODEX_SECURITY_SCAN_ID: options.scanId,+ CODEX_SECURITY_SCAN_DIR: scanDir,+ CODEX_SECURITY_REPOSITORY: repository,+ });+ await copyCompletedScan(root);+ const coveragePath = join(scanDir, "coverage.json");+ const coverage = JSON.parse(await readFile(coveragePath, "utf8"));+ coverage.mode = "deep_repository";+ const coverageBytes = JSON.stringify(coverage);+ await writeFile(coveragePath, coverageBytes);+ const manifestPath = join(scanDir, "scan-manifest.json");+ const manifest = JSON.parse(await readFile(manifestPath, "utf8"));+ const artifact = manifest.scan.artifacts.find(+ (entry: { path: string }) => entry.path === "coverage.json",);- } else if (args[0] === "complete-scan") {- await writeFile(join(scanDir, "report.md"), finalReport);- }- return mockWorkbench(args, input);+ artifact.sha256 = hash("sha256", coverageBytes);+ await writeFile(manifestPath, JSON.stringify(manifest));+ await writeSession(+ codexHome,+ "engine-session",+ {},+ {+ cwd: scanDir,+ timestamp: "2026-07-26T12:00:00Z",+ },+ );+ await writeSession(+ codexHome,+ "discovery-session",+ { input_tokens: 100, output_tokens: 10 },+ {+ cwd: join(+ scanDir,+ "artifacts",+ "deep_discovery",+ "workers",+ "one",+ "output",+ ),+ timestamp: "2026-07-26T12:00:01Z",+ },+ );+ yield { type: "thread.started", thread_id: "engine-session" };+ // The host must count workers while the no-inference coordinator runs.+ expect(await runningCost).toBe(100);+ yield {+ type: "turn.completed",+ usage: {+ input_tokens: 0,+ cached_input_tokens: 0,+ cache_write_input_tokens: 0,+ output_tokens: 0,+ },+ };+ },+ runWorkbench: async (_options, args, input) => {+ commands.push(args[0]!);+ if (args[0] === "prepare-scan-completion") {+ await writeFile(+ join(scanDir, "report.md"),+ "# Prepared scan report\n",+ );+ } else if (args[0] === "complete-scan") {+ const receiptIndex = args.indexOf("--cost-json");+ completionReceipt =+ receiptIndex < 0 ? undefined : args[receiptIndex + 1];+ await writeFile(join(scanDir, "report.md"), finalReport);+ }+ return mockWorkbench(args, input);+ },},- });+ );try {const result = await client.run(repository, {mode: "deep",postScanPrompt,onScanStarted: started,+ onCost: (cost) => recordCost(cost.inputTokens),});expect(result.threadId).toBe("engine-session");expect(result.reportPath).toBe(join(scanDir, "report.md"));expect(result.turnResult.finalResponse).toBe(finalReport);+ expect(result.cost?.inputTokens).toBe(100);+ expect(JSON.parse(completionReceipt!)).toMatchObject({+ inputTokens: 100,+ });expect(result.toJSON()["turn"]).toMatchObject({finalResponse: finalReport,});diff --git a/sdk/typescript/tests-ts/api-patch.test.ts b/sdk/typescript/tests-ts/api-patch.test.tsindex 775c36817..64b7ba713 100644--- a/sdk/typescript/tests-ts/api-patch.test.ts+++ b/sdk/typescript/tests-ts/api-patch.test.ts@@ -1,3 +1,4 @@+import { requestMetadata } from "./support/request-metadata.js";import { mkdir, readFile, realpath, writeFile } from "node:fs/promises";import { join } from "node:path";import type {@@ -300,9 +301,11 @@ describe("CodexSecurity headless patching", () => {model_reasoning_effort: "medium",features: { plugins: false },default_permissions: "codex_security_scan",- responses_api_metadata: { codex_security_surface: "sdk" },},});+ expect(requestMetadata(captured.codex?.configOverrides)).toMatchObject({+ codex_security_surface: "sdk",+ });expect(captured.thread).not.toHaveProperty("sandboxMode");expect(captured.thread).not.toHaveProperty("networkAccessEnabled");expect(captured.codex?.env?.["OPENAI_API_KEY"]).toBeUndefined();@@ -360,7 +363,9 @@ describe("CodexSecurity headless patching", () => {const { client, options, captured, codexHome } = await patchClient();await using security = client;await security.patch(options);- expect(parseToml(captured.codex!.configOverrides!.join("\n"))).toEqual({+ expect(+ parseToml(captured.codex!.configOverrides!.join("\n")),+ ).toMatchObject({permissions: {codex_security_scan: {filesystem: {@@ -417,7 +422,9 @@ describe("CodexSecurity headless patching", () => {).toEqual({model_providers: { "synthetic.provider": provider },});- expect(parseToml(captured.codex!.configOverrides!.join("\n"))).toEqual({+ expect(+ parseToml(captured.codex!.configOverrides!.join("\n")),+ ).toMatchObject({permissions: {codex_security_scan: {filesystem: {diff --git a/sdk/typescript/tests-ts/api-policy.test.ts b/sdk/typescript/tests-ts/api-policy.test.tsindex c5a28b3e3..5b6f30489 100644--- a/sdk/typescript/tests-ts/api-policy.test.ts+++ b/sdk/typescript/tests-ts/api-policy.test.ts@@ -1,4 +1,6 @@+import { requestMetadata } from "./support/request-metadata.js";import { execFileSync } from "node:child_process";+import { once } from "node:events";import {chmod,link,@@ -44,6 +46,7 @@ import {stageResult,} from "./support/security-policy.js";import { rejecting, throwing } from "./support/errors.js";+import { writeSession } from "./support/usage-rollout.js";const { fixture, cleanup } = createPolicyTestFixtures();afterEach(cleanup);@@ -281,29 +284,27 @@ describe("CodexSecurity policy API", () => {expect(f.configuration()!.config!["default_permissions"]).toBe("codex_security_policy",);- expect(parseToml(overrides.join("\n"))).toEqual({- permissions: {- codex_security_scan: {- filesystem: {- ":root": "read",- ":workspace_roots": "write",- [await realpath(f.runtime.codexHome)]: { ".": "deny" },- [f.runtime.deepScanConfigPath!]: { ".": "deny" },- },+ expect(parseToml(overrides.join("\n"))["permissions"]).toEqual({+ codex_security_scan: {+ filesystem: {+ ":root": "read",+ ":workspace_roots": "write",+ [await realpath(f.runtime.codexHome)]: { ".": "deny" },+ [f.runtime.deepScanConfigPath!]: { ".": "deny" },},- codex_security_policy: {- filesystem: {- [process.platform === "win32" ? ":root" : ":minimal"]: "read",- ":workspace_roots": "read",- ...Object.fromEntries(- readPaths.map((path) => [path, { ".": "read" }]),- ),- [await realpath(f.runtime.codexHome)]: { ".": "deny" },- ...(process.platform === "win32"- ? { [f.ambientCredentialsGlob]: "deny" }- : {}),- [f.runtime.deepScanConfigPath!]: { ".": "deny" },- },+ },+ codex_security_policy: {+ filesystem: {+ [process.platform === "win32" ? ":root" : ":minimal"]: "read",+ ":workspace_roots": "read",+ ...Object.fromEntries(+ readPaths.map((path) => [path, { ".": "read" }]),+ ),+ [await realpath(f.runtime.codexHome)]: { ".": "deny" },+ ...(process.platform === "win32"+ ? { [f.ambientCredentialsGlob]: "deny" }+ : {}),+ [f.runtime.deepScanConfigPath!]: { ".": "deny" },},},});@@ -1482,9 +1483,10 @@ describe("CodexSecurity policy API", () => {web_search: "disabled",sandbox_workspace_write: { network_access: false },});- expect(f.configuration()?.config?.["responses_api_metadata"]).toMatchObject(- { codex_security_surface: "cli", codex_security_command: "policy" },- );+ expect(requestMetadata(f.configuration()?.configOverrides)).toMatchObject({+ codex_security_surface: "cli",+ codex_security_command: "policy",+ });expect(f.configuration()?.env?.["CODEX_SECURITY_REPOSITORY"]).toBe(f.repository,);@@ -1820,6 +1822,55 @@ describe("CodexSecurity policy API", () => {await f.security.close();});+ test("stops a policy stage at its measured budget while worker usage is missing", async () => {+ let interruptedStage: SecurityPolicyStage | undefined;+ const f = await setup({+ stream: async function* (stage, signal) {+ yield { type: "thread.started", thread_id: `policy-${stage}` };+ yield { type: "turn.started" };+ if (!signal.aborted) await once(signal, "abort");+ interruptedStage = stage;+ throw signal.reason;+ },+ });+ await writeSession(f.runtime.codexHome, "policy-architecture", {+ input_tokens: 3_000,+ output_tokens: 0,+ });+ await writeSession(+ f.runtime.codexHome,+ "policy-worker",+ {},+ { parent: "policy-architecture" },+ );+ const costs = mock();+ const cancellation = new AbortController();+ const timeout = setTimeout(+ () => cancellation.abort(new Error("Policy budget was not enforced.")),+ 5_000,+ );+ try {+ await expect(+ f.security.generatePolicy(f.repository, {+ outputDir: f.outputDir,+ maxCostUsd: 0.004,+ signal: cancellation.signal,+ onCost: costs,+ }),+ ).rejects.toThrow("exceeded its $0.004 cost limit");+ expect(interruptedStage).toBe("architecture");+ expect(f.threads).toHaveLength(1);+ expect(costs).not.toHaveBeenCalled();+ await expect(+ readFile(join(f.outputDir, "project-spec.md")),+ ).rejects.toMatchObject({ code: "ENOENT" });+ expect(await readdir(f.repository)).toEqual([]);+ } finally {+ clearTimeout(timeout);+ await f.security.close();+ }+ });+test("optional observer failures do not stop policy generation", async () => {const f = await setup();const errors: string[] = [];diff --git a/sdk/typescript/tests-ts/api-usage.test.ts b/sdk/typescript/tests-ts/api-usage.test.tsnew file mode 100644index 000000000..f2c5f15e5--- /dev/null+++ b/sdk/typescript/tests-ts/api-usage.test.ts@@ -0,0 +1,154 @@+import { afterEach, expect, mock, test } from "bun:test";+import { once } from "node:events";+import { appendFile, mkdir } from "node:fs/promises";+import { join } from "node:path";+import { setImmediate } from "node:timers/promises";+import type { ThreadEvent } from "@openai/codex-sdk";+import { ScanCostTracker } from "../src/cost.js";+import { ScanCostLimitExceededError } from "../src/errors.js";+import { copyCompletedScan } from "./plugin-root.js";+import {+ completedEvents,+ runEvents,+ scanRuntimeDependencies,+} from "./support/api-events.js";+import { mockWorkbench, TestClient } from "./support/api-client.js";+import { createApiTestFixtures } from "./support/temporary-directories.js";+import { writeSession } from "./support/usage-rollout.js";++const { temporaryDirectory, cleanup } = createApiTestFixtures();+afterEach(cleanup);++test.each([+ [false, null],+ [true, null],+ [false, undefined],+ [true, undefined],+] as const)(+ "preserves finalizer results (workbenchValidated=%p, result=%p)",+ async (workbenchValidated, finalizedUsage) => {+ const scanDir = await copyCompletedScan(await temporaryDirectory());+ const codexHome = await temporaryDirectory();+ await writeSession(+ codexHome,+ "worker-thread",+ {},+ {+ parent: "thread-1",+ },+ );+ const tracker = new ScanCostTracker({+ codexHome,+ model: "gpt-5.6-sol",+ });+ const result = await runEvents(scanDir, completedEvents(), {+ workbenchValidated,+ onThreadStarted: (threadId) => tracker.start(threadId),+ onFinalize: async (usage) => {+ const snapshot = await tracker.stop(usage);+ return finalizedUsage === null ? snapshot.usage : undefined;+ },+ });++ expect(result.toJSON()).toMatchObject({+ cost:+ finalizedUsage === null ? null : { inputTokens: 10, outputTokens: 3 },+ turn: {+ usage:+ finalizedUsage === null+ ? null+ : { input_tokens: 10, output_tokens: 3 },+ status: "completed",+ },+ });+ },+);++test.each([false, true])(+ "enforces measured spending with a missing worker after raising the limit: %p",+ async (raiseLimit) => {+ const root = await temporaryDirectory();+ const repository = join(root, "repository");+ const codexHome = join(root, "codex-home");+ const scanDir = join(root, "scan");+ await mkdir(repository);+ await mkdir(scanDir, { mode: 0o700 });+ await writeSession(+ codexHome,+ "pending-worker",+ {},+ {+ parent: "scan-thread",+ },+ );+ const parent = await writeSession(codexHome, "scan-thread", {+ input_tokens: raiseLimit ? 900 : 3_000,+ output_tokens: 0,+ });+ const limitSaved = Promise.withResolvers<void>();+ const costs = mock();+ const usages = mock();+ const approaching = mock(() => 0.008);+ const client = TestClient.withDependencies({+ ...scanRuntimeDependencies(codexHome, scanDir),+ runWorkbench: async (_options, args, input) => {+ if (args[0] === "set-scan-cost-limit") limitSaved.resolve();+ return mockWorkbench(args, input);+ },+ createCodex: () => ({+ startThread: () => ({+ id: null,+ runStreamed: async (_input, { signal }) => ({+ events: (async function* (): AsyncGenerator<ThreadEvent> {+ yield { type: "thread.started", thread_id: "scan-thread" };+ if (raiseLimit) {+ await limitSaved.promise;+ // Resume after the caller adopts the saved limit.+ await setImmediate();+ await appendFile(+ parent,+ JSON.stringify({+ type: "event_msg",+ payload: {+ type: "token_count",+ info: {+ total_token_usage: {+ input_tokens: 3_000,+ output_tokens: 0,+ },+ },+ },+ }) + "\n",+ );+ }+ if (!signal?.aborted) await once(signal!, "abort");+ throw new DOMException("aborted", "AbortError");+ })(),+ }),+ }),+ }),+ });+ const keepAlive = setTimeout(() => {}, 10_000);+ try {+ await expect(+ client.run(repository, {+ maxCostUsd: 0.004,+ signal: AbortSignal.timeout(5_000),+ onCost: costs,+ onUsage: usages,+ ...(raiseLimit ? { onBudgetApproaching: approaching } : {}),+ }),+ ).rejects.toMatchObject({+ name: ScanCostLimitExceededError.name,+ maxCostUsd: raiseLimit ? 0.008 : 0.004,+ cost: { inputTokens: 3_000, estimatedUsd: 0.012 },+ });+ expect(costs).not.toHaveBeenCalled();+ expect(usages).not.toHaveBeenCalled();+ expect(approaching).toHaveBeenCalledTimes(raiseLimit ? 1 : 0);+ } finally {+ clearTimeout(keepAlive);+ await client.close();+ }+ },+);diff --git a/sdk/typescript/tests-ts/api.test.ts b/sdk/typescript/tests-ts/api.test.tsindex 49af49435..2e475f177 100644--- a/sdk/typescript/tests-ts/api.test.ts+++ b/sdk/typescript/tests-ts/api.test.ts@@ -1,3 +1,4 @@+import { requestMetadata } from "./support/request-metadata.js";import { once } from "node:events";import { createServer, type Socket } from "node:net";import {@@ -569,22 +570,26 @@ describe("CodexSecurity finding validation", () => {web_search: "disabled",approval_policy: "never",analytics: { enabled: false },- responses_api_metadata: {- codex_security_surface: "sdk",- codex_security_command: "validate",- codex_security_package_version: VERSION,- codex_security_plugin_version:- preparedRuntime("unused").plugin.version,- },},});+ expect(requestMetadata(captured.codex?.configOverrides)).toMatchObject({+ codex_security_surface: "sdk",+ codex_security_command: "validate",+ codex_security_package_version: VERSION,+ codex_security_plugin_version: preparedRuntime("unused").plugin.version,+ codex_security_provider: "openai",+ });const credentialHome = captured.codex!.env!["CODEX_HOME"]!;const credentialDenies = {[credentialHome]: { ".": "deny" },[join(credentialHome, "deep-scan.toml")]: { ".": "deny" },};expect(- captured.codex?.configOverrides?.map((override) => parseToml(override)),+ captured.codex?.configOverrides+ ?.filter(+ (override) => !override.startsWith("responses_api_metadata="),+ )+ .map((override) => parseToml(override)),).toEqual([{permissions: {@@ -641,6 +646,12 @@ describe("CodexSecurity finding validation", () => {review: {web_search: "cached",approval_policy: "on-request",+ analytics: { enabled: false },+ otel: { exporter: "none" },+ responses_api_metadata: {+ "team.tag": "synthetic-validation",+ codex_security_integration: "github_action",+ },},},},@@ -675,8 +686,19 @@ describe("CodexSecurity finding validation", () => {expect(config).toMatchObject({web_search: "disabled",approval_policy: "never",+ analytics: { enabled: false },+ otel: { exporter: "none" },default_permissions: "codex_security_validation",+ responses_api_metadata: {+ "team.tag": "synthetic-validation",+ codex_security_integration: "github_action",+ codex_security_command: "validate",+ codex_security_provider: "openai",+ },});+ expect(+ overrides.filter((value) => value.startsWith("responses_api_metadata")),+ ).toHaveLength(1);expect(config).not.toHaveProperty("profile");expect(config).not.toHaveProperty("profiles");});@@ -1994,13 +2016,18 @@ describe("CodexSecurity orchestration", () => {{profile: "cloud",analytics: { enabled: true },+ otel: { environment: "synthetic-root" },responses_api_metadata: { custom_attribution: "root" },model_context_window: 64_000,model_auto_compact_token_limit: 48_000,profiles: {cloud: {analytics: { enabled: false },- responses_api_metadata: { custom_attribution: "selected" },+ otel: { environment: "synthetic-selected" },+ responses_api_metadata: {+ custom_attribution: "selected",+ codex_security_integration: "github_action",+ },model_reasoning_summary: "concise",service_tier: "fast",model_context_window: 96_000,@@ -2124,12 +2151,15 @@ describe("CodexSecurity orchestration", () => {expect(workerConfig["analytics"]).toEqual(selected["analytics"],);+ expect(workerConfig["otel"]).toEqual(selected["otel"]);expect(workerConfig["responses_api_metadata"]).toMatchObject({...(selected["responses_api_metadata"] asJsonObject | undefined),codex_security_surface: "sdk",codex_security_command: "scan",codex_security_package_version: VERSION,+ codex_security_provider: "amazon-bedrock",+ codex_security_scan_mode: "deep",});const windows = (resolveCodexProfile(overrides)["windows"] ??DEFAULT_CODEX_CONFIG["windows"]) as { sandbox: string };@@ -4961,6 +4991,12 @@ describe("CodexSecurity orchestration", () => {{codexOverrides: {...providerConfig,+ analytics: { enabled: false },+ otel: { environment: "synthetic-matching" },+ responses_api_metadata: {+ "team.tag": "synthetic-matching",+ codex_security_integration: "github_action",+ },...(failure === "budget-context"? {model: "gpt-6.1-sol",@@ -5043,6 +5079,17 @@ describe("CodexSecurity orchestration", () => {},async matchFindings(input, options, runtimeOptions) {expect(options?.cyberAccessProgram).toBe("daybreak_blue");+ expect(options?.config?.codexOverrides).toMatchObject({+ analytics: { enabled: false },+ otel: { environment: "synthetic-matching" },+ responses_api_metadata: {+ "team.tag": "synthetic-matching",+ codex_security_integration: "github_action",+ codex_security_command: "scan",+ codex_security_scan_mode: "standard",+ codex_security_provider: "custom",+ },+ });if (failure !== "managed")expect(options?.config?.codexOverrides).toMatchObject({...providerConfig,diff --git a/sdk/typescript/tests-ts/cli-patch.test.ts b/sdk/typescript/tests-ts/cli-patch.test.tsindex 3c1a0548a..20b9f2954 100644--- a/sdk/typescript/tests-ts/cli-patch.test.ts+++ b/sdk/typescript/tests-ts/cli-patch.test.ts@@ -1,3 +1,4 @@+import { requestMetadata } from "./support/request-metadata.js";import { gitText } from "./support/shell.js";import { emptyPage } from "./support/linear-pagination.js";import { resolving } from "./support/promises.js";@@ -1123,6 +1124,69 @@ describe("scan and patch workflow", () => {},);+ test.each([+ [undefined, false],+ [true, false],+ [false, true],+ ] as const)(+ "passes selected-profile telemetry to scan patches (root=%p, profile=%p)",+ async (rootAnalytics, profileAnalytics) => {+ const result = resultWithFindings(["high"]);+ let childArgs: readonly string[] = [];+ const outcome = await runWorkflow(+ [+ "scan",+ "--patch",+ "--mode",+ "standard",+ "--json",+ ...(rootAnalytics === undefined+ ? []+ : ["--codex", `analytics.enabled=${rootAnalytics}`]),+ "--codex",+ 'profile="quiet"',+ "--codex",+ `profiles.quiet.analytics.enabled=${profileAnalytics}`,+ "--codex",+ 'profiles.quiet.model_provider="amazon-bedrock"',+ "--codex",+ 'responses_api_metadata={ "team.tag"="root", caller="preserved" }',+ "--codex",+ 'profiles.quiet.responses_api_metadata={ "team.tag"="selected", codex_security_integration="github_action" }',+ "--codex",+ "otel.log_user_prompt=false",+ "--codex",+ 'profiles.quiet.otel.metrics_exporter="none"',+ ],+ {+ result,+ onCodex: (args, output) => {+ childArgs = args;+ completePatches(args, output);+ return 0;+ },+ },+ );++ expect(outcome.exitCode, outcome.stderr).toBe(0);+ expect(childArgs).toContain(`analytics.enabled=${profileAnalytics}`);+ expect(requestMetadata(childArgs)).toMatchObject({+ "team.tag": "selected",+ caller: "preserved",+ codex_security_surface: "cli",+ codex_security_command: "patch",+ codex_security_integration: "github_action",+ codex_security_provider: "amazon-bedrock",+ codex_security_scan_mode: "standard",+ });+ expect(+ parseToml(childArgs.find((value) => value.startsWith("otel="))!)[+ "otel"+ ],+ ).toEqual({ log_user_prompt: false, metrics_exporter: "none" });+ },+ );+test("continues with separate patch tasks when one finding fails", async () => {const result = resultWithFindings(["critical", "high", "medium"]);const tasks: string[] = [];@@ -1371,9 +1435,9 @@ describe("scan and patch workflow", () => {) {expect(output.command).toBe("patch");expect(output.appServer?.sandbox).toBe("read-only");- expect(args).toContain(- 'responses_api_metadata.codex_security_command="assess-patch-risk"',- );+ expect(requestMetadata(args)).toMatchObject({+ codex_security_command: "assess-patch-risk",+ });expect(output.appServer?.prompt).toContain("<!-- codex-security:patch-risk-summary:start -->",);diff --git a/sdk/typescript/tests-ts/cli-project-config.test.ts b/sdk/typescript/tests-ts/cli-project-config.test.tsindex 5f2f0089c..47014d749 100644--- a/sdk/typescript/tests-ts/cli-project-config.test.ts+++ b/sdk/typescript/tests-ts/cli-project-config.test.ts@@ -1355,7 +1355,9 @@ test.each([codexHome: input.root,model,onUsage: options?.onUsage,- onCost: options?.onCost,+ onCost: (cost, complete) => {+ if (complete) options?.onCost?.(cost);+ },});tracker.start("synthetic-scan-thread");await tracker.stop(usage);diff --git a/sdk/typescript/tests-ts/cli-skills.test.ts b/sdk/typescript/tests-ts/cli-skills.test.tsindex 157567aa2..d679bc63a 100644--- a/sdk/typescript/tests-ts/cli-skills.test.ts+++ b/sdk/typescript/tests-ts/cli-skills.test.ts@@ -1,3 +1,4 @@+import { requestMetadata } from "./support/request-metadata.js";import { execFileSync, spawn } from "node:child_process";import { mkdir, rm, symlink, writeFile } from "node:fs/promises";import * as filesystem from "node:fs/promises";@@ -292,13 +293,7 @@ describe("CLI skill commands", () => {"--config",'approval_policy="never"',"--config",- 'responses_api_metadata.codex_security_surface="cli"',- "--config",- `responses_api_metadata.codex_security_command=${JSON.stringify(command)}`,- "--config",- `responses_api_metadata.codex_security_package_version=${JSON.stringify(VERSION)}`,- "--config",- `responses_api_metadata.codex_security_plugin_version=${JSON.stringify((await pluginMetadata(PLUGIN_ROOT)).version)}`,+ expect.stringMatching(/^responses_api_metadata=\{/u),...(command === "patch"? []: [@@ -312,6 +307,16 @@ describe("CLI skill commands", () => {"-",]),]);+ expect(requestMetadata(invocation!)).toEqual({+ codex_security_surface: "cli",+ codex_security_command: command,+ codex_security_package_version: VERSION,+ codex_security_plugin_version: (await pluginMetadata(PLUGIN_ROOT))+ .version,+ ...(command === "validate"+ ? { codex_security_provider: "openai" }+ : {}),+ });if (command === "validate") {expect(prompt).toContain(await filesystem.readFile(diff --git a/sdk/typescript/tests-ts/cli-verify-fix.test.ts b/sdk/typescript/tests-ts/cli-verify-fix.test.tsindex ce6fb763d..ac6e8915b 100644--- a/sdk/typescript/tests-ts/cli-verify-fix.test.ts+++ b/sdk/typescript/tests-ts/cli-verify-fix.test.ts@@ -1,3 +1,4 @@+import { requestMetadata } from "./support/request-metadata.js";import { describe, expect, test, mock } from "bun:test";import { readFile } from "node:fs/promises";import { join } from "node:path";@@ -49,12 +50,10 @@ describe("read-only finding verification", () => {},linearClient,onCodex: (args, output, processEnvironment, input) => {- expect(args).toContain(- 'responses_api_metadata.codex_security_command="verify-fix"',- );- expect(args).toContain(- `responses_api_metadata.codex_security_package_version=${JSON.stringify(VERSION)}`,- );+ expect(requestMetadata(args)).toMatchObject({+ codex_security_command: "verify-fix",+ codex_security_package_version: VERSION,+ });expect(args[0]).toBe("app-server");expect(input).toBeUndefined();expect(args).toContain('approval_policy="on-request"');diff --git a/sdk/typescript/tests-ts/cost.test.ts b/sdk/typescript/tests-ts/cost.test.tsindex 1e64b998c..f69281ba0 100644--- a/sdk/typescript/tests-ts/cost.test.ts+++ b/sdk/typescript/tests-ts/cost.test.ts@@ -2617,6 +2617,99 @@ describe("live scan cost tracking", () => {});});+ test("reports budget subtotals until missing worker usage becomes measured", async () => {+ const home = await codexHome();+ const parentUsage = { input_tokens: 1_000_000, output_tokens: 100_000 };+ await writeSession(home, "scan-thread", parentUsage);+ const costs: Array<[number, boolean]> = [];+ const usages: unknown[] = [];+ const tracker = costTracker(home, {+ onCost: (cost, complete) => costs.push([cost.estimatedUsd, complete]),+ onUsage: (usage) => usages.push(usage),+ });+ tracker.start("scan-thread");+ expect((await tracker.refresh()).cost?.estimatedUsd).toBe(6);++ const worker = await writeSession(+ home,+ "worker-thread",+ {},+ {+ parent: "scan-thread",+ },+ );+ expect(await tracker.refresh()).toEqual({ usage: null, cost: null });+ expect(costs.at(-1)).toEqual([6, false]);+ expect(usages).toHaveLength(1);++ await appendFile(+ worker,+ jsonLines([legacyUsageRecord({ input_tokens: 0, output_tokens: 0 })]) ++ "\n",+ );+ expect((await tracker.refresh()).usage).toMatchObject({+ ...parentUsage,+ total_tokens: 1_100_000,+ });+ expect(costs.at(-1)).toEqual([6, true]);+ expect(usages).toHaveLength(1);++ await appendFile(+ worker,+ jsonLines([+ legacyUsageRecord({ input_tokens: 500_000, output_tokens: 50_000 }),+ ]) + "\n",+ );+ expect((await tracker.stop(parentUsage)).usage).toMatchObject({+ input_tokens: 1_500_000,+ output_tokens: 150_000,+ total_tokens: 1_650_000,+ });+ expect(costs).toEqual([+ [6, true],+ [6, false],+ [6, true],+ [9, true],+ ]);+ expect(usages).toHaveLength(2);+ });++ test("keeps independent Deep worker usage unknown until a receipt supplies it", async () => {+ const home = await codexHome();+ const scanDirectory = join(home, "scans", "current");+ const parentUsage = { input_tokens: 100, output_tokens: 10 };+ await writeSession(home, "scan-thread", parentUsage, {+ cwd: scanDirectory,+ timestamp: "2026-07-26T12:00:00Z",+ });+ await writeSession(+ home,+ "deep-worker",+ {},+ {+ cwd: join(+ scanDirectory,+ "artifacts",+ "deep_discovery",+ "workers",+ "one",+ "output",+ ),+ timestamp: "2026-07-26T12:01:00Z",+ },+ );+ const tracker = costTracker(home, { scanDirectory });+ tracker.start("scan-thread");+ expect(await tracker.refresh()).toEqual({ usage: null, cost: null });++ tracker.recordUsage({ input_tokens: 50, output_tokens: 5 }, "deep-worker");+ expect((await tracker.stop(parentUsage)).usage).toMatchObject({+ input_tokens: 150,+ output_tokens: 15,+ total_tokens: 165,+ });+ });+test.each(["receipt", "receipt-and-log", "unknown"] as const)("accounts for a separate validation turn with %s usage",async (source) => {diff --git a/sdk/typescript/tests-ts/direct-deep-scan.test.ts b/sdk/typescript/tests-ts/direct-deep-scan.test.tsindex 919f438cc..25437155a 100644--- a/sdk/typescript/tests-ts/direct-deep-scan.test.ts+++ b/sdk/typescript/tests-ts/direct-deep-scan.test.ts@@ -9,7 +9,10 @@ import {import { join } from "node:path";import { afterEach, test } from "node:test";import { setTimeout } from "node:timers/promises";-import { runDeepScan } from "../src/deep-scan.js";+import {+ DIRECT_DEEP_SCAN_CONTROL_USAGE,+ runDeepScan,+} from "../src/deep-scan.js";import { ScanCostTracker } from "../src/cost.js";import { PLUGIN_ROOT } from "./plugin-root.js";import { createApiTestFixtures } from "./support/temporary-directories.js";@@ -150,6 +153,11 @@ test("isolates direct engine credentials and runtime snapshots across concurrentrun.map((event) => event.type),["thread.started", "turn.completed"],);+ const firstUsage = events[0]![1]!["usage"] as Record<string, number>;+ const secondUsage = events[1]![1]!["usage"] as Record<string, number>;+ firstUsage["input_tokens"] = 100;+ assert.equal(secondUsage["input_tokens"], 0);+ assert.equal(DIRECT_DEEP_SCAN_CONTROL_USAGE.input_tokens, 0);});test("preserves complete worker usage and cost after direct engine completion", async () => {@@ -230,8 +238,27 @@ test("preserves complete worker usage and cost after direct engine completion",scanDirectory: scanDir,model: "gpt-6.1-sol",});+ tracker.recordUsage(DIRECT_DEEP_SCAN_CONTROL_USAGE, "engine-session");tracker.start("engine-session");const running = await tracker.refresh();+ await writeSession(+ codexHome,+ "waiting-session",+ {},+ {+ parent: "engine-session",+ },+ );+ assert.deepEqual(await tracker.refresh(), { usage: null, cost: null });+ tracker.recordUsage(+ {+ input_tokens: 0,+ cached_input_tokens: 0,+ cache_write_input_tokens: 0,+ output_tokens: 0,+ },+ "waiting-session",+ );const completed = (await events.next()).value;assert.equal(completed?.type, "turn.completed");const final = await tracker.stop(completed?.["usage"]);diff --git a/sdk/typescript/tests-ts/finding-embeddings.test.ts b/sdk/typescript/tests-ts/finding-embeddings.test.tsindex acfef9fb1..b9bebc196 100644--- a/sdk/typescript/tests-ts/finding-embeddings.test.ts+++ b/sdk/typescript/tests-ts/finding-embeddings.test.ts@@ -11,6 +11,7 @@ import {OpenAiFindingEmbedder,} from "../src/server/embeddings.js";import { PLUGIN_ROOT } from "./plugin-root.js";+import { VERSION } from "../src/version.js";const example = (await readJson<FindingsDocument>(@@ -63,6 +64,7 @@ test("uses the configured embedding model and preserves response indexes", asyncexpect(url).toBe("https://api.openai.com/v1/embeddings");expect(init.headers).toMatchObject({Authorization: "Bearer synthetic-key",+ "User-Agent": `codex-security/${VERSION}`,});const request = JSON.parse(String(init.body));expect(request).toMatchObject({diff --git a/sdk/typescript/tests-ts/publish.test.ts b/sdk/typescript/tests-ts/publish.test.tsindex 15314adea..622e14ffc 100644--- a/sdk/typescript/tests-ts/publish.test.ts+++ b/sdk/typescript/tests-ts/publish.test.ts@@ -24,6 +24,8 @@ import {UnknownLinearError,} from "@linear/sdk";import { afterEach, describe, expect, spyOn, test, mock } from "bun:test";+import { requestMetadata } from "./support/request-metadata.js";+import { VERSION } from "../src/version.js";import {forceTerminatePublicationProcesses,publishScanInternal,@@ -1418,7 +1420,7 @@ describe("connected Linear publication", () => {expect(result.counts).toEqual({ findings: 2, created: 2, failed: 0 });});- test("reuses ambient Codex configuration and loads exact issue data from a private file", async () => {+ test("attributes publication while preserving ambient Codex configuration and private issue data", async () => {const publication = preparedPublication();const stateDirectory = await temporaryDirectory();const environment = {@@ -1469,6 +1471,8 @@ describe("connected Linear publication", () => {"gpt-5.6-luna","-c",'model_reasoning_effort="low"',+ "-c",+ expect.stringMatching(/^responses_api_metadata=\{/u),"--ephemeral","--json","--sandbox",@@ -1480,6 +1484,11 @@ describe("connected Linear publication", () => {]);expect(args).not.toContain("--ignore-user-config");expect(args).not.toContain("--disable");+ expect(requestMetadata(args)).toEqual({+ codex_security_surface: "sdk",+ codex_security_command: "publish",+ codex_security_package_version: VERSION,+ });expect(inheritedEnvironment).toBe(environment);expect(input).toContain("already-connected hosted Linear application");expect(input).toContain("untrusted inert data");diff --git a/sdk/typescript/tests-ts/request-metadata.test.ts b/sdk/typescript/tests-ts/request-metadata.test.tsnew file mode 100644index 000000000..4e834bbc1--- /dev/null+++ b/sdk/typescript/tests-ts/request-metadata.test.ts@@ -0,0 +1,132 @@+import { writeFile } from "node:fs/promises";+import { join } from "node:path";+import { pathToFileURL } from "node:url";+import { afterEach, expect, test } from "bun:test";+import { parse } from "smol-toml";+import { codexSecurityRequestContext } from "../src/request-metadata.js";+import { VERSION } from "../src/version.js";+import { resolveCodexCommand } from "../src/runtime.js";+import { PLUGIN_ROOT } from "./plugin-root.js";+import { createApiTestFixtures } from "./support/temporary-directories.js";++const { temporaryDirectory, cleanup } = createApiTestFixtures(+ "codex-security-request-metadata-",+);+afterEach(cleanup);++test.each([+ [undefined, "openai"],+ ["openai", "openai"],+ ["amazon-bedrock", "amazon-bedrock"],+ ["cheaperinference", "cheaperinference"],+ ["openrouter", "openrouter"],+ ["fireworks", "fireworks"],+ ["ollama", "ollama"],+ ["lmstudio", "lmstudio"],+ ["synthetic.private-provider", "custom"],+] as const)("attributes provider %p as %s", (provider, expected) => {+ const context = codexSecurityRequestContext(+ provider === undefined ? {} : { model_provider: provider },+ { surface: "sdk", command: "scan" },+ );+ expect(context.metadata["codex_security_provider"]).toBe(expected);+});++test("selected profile metadata and provider win without changing telemetry settings", () => {+ const config = {+ model_provider: "openai",+ analytics: { enabled: true },+ otel: { exporter: "none" },+ responses_api_metadata: { "root.tag": "retained", "team.tag": "root" },+ profile: "selected.profile",+ profiles: {+ "selected.profile": {+ model_provider: "amazon-bedrock",+ analytics: { enabled: false },+ otel: {+ exporter: { "otlp-http": { endpoint: "http://localhost:4318" } },+ },+ responses_api_metadata: {+ "team.tag": "selected",+ codex_security_integration: "github_action",+ codex_security_surface: "spoofed",+ codex_security_command: "spoofed",+ codex_security_package_version: "spoofed",+ codex_security_plugin_version: "spoofed",+ codex_security_provider: "spoofed",+ codex_security_scan_mode: "spoofed",+ },+ },+ unused: { model_provider: "ollama" },+ },+ };+ const original = structuredClone(config);+ const context = codexSecurityRequestContext(config, {+ surface: "cli",+ command: "scan",+ pluginVersion: "1.2.3",+ mode: "deep",+ });+ expect(context.metadata).toEqual({+ "root.tag": "retained",+ "team.tag": "selected",+ codex_security_integration: "github_action",+ codex_security_surface: "cli",+ codex_security_command: "scan",+ codex_security_package_version: VERSION,+ codex_security_plugin_version: "1.2.3",+ codex_security_provider: "amazon-bedrock",+ codex_security_scan_mode: "deep",+ });+ expect(parse(context.configOverride)).toEqual({+ responses_api_metadata: context.metadata,+ });+ expect(config).toEqual(original);+});++test("leaves provider attribution to native configuration when unresolved", () => {+ const context = codexSecurityRequestContext(+ {},+ { surface: "cli", command: "patch", providerResolved: false },+ );+ expect(context.metadata).not.toHaveProperty("codex_security_provider");+ expect(context.metadata).not.toHaveProperty("codex_security_scan_mode");+ const inherited = codexSecurityRequestContext(+ { responses_api_metadata: { codex_security_provider: "amazon-bedrock" } },+ { surface: "cli", command: "patch", providerResolved: false },+ );+ expect(inherited.metadata["codex_security_provider"]).toBe("amazon-bedrock");+});++test("native table overrides preserve inherited literal metadata and opt-outs", async () => {+ const home = await temporaryDirectory();+ await writeFile(+ join(home, "config.toml"),+ '[analytics]\nenabled=false\n[responses_api_metadata]\n"home.tag"="preserved"\ncodex_security_integration="github_action"\n',+ );+ const context = codexSecurityRequestContext(+ { responses_api_metadata: { "caller.tag": "synthetic" } },+ { surface: "cli", command: "publish", providerResolved: false },+ );+ const { readDeepScanRuntimeConfig } = await import(+ pathToFileURL(join(PLUGIN_ROOT, "mcp", "permission-profile-preflight.mjs"))+ .href+ );+ const config = await readDeepScanRuntimeConfig({+ codexPath: resolveCodexCommand({}).command,+ cwd: home,+ configOverrides: [context.configOverride],+ env: {+ PATH: process.env["PATH"],+ SystemRoot: process.env["SystemRoot"],+ CODEX_HOME: home,+ },+ signal: new AbortController().signal,+ });+ expect(config.responses_api_metadata).toEqual({+ "home.tag": "preserved",+ codex_security_integration: "github_action",+ ...context.metadata,+ });+ expect(config.analytics).toEqual({ enabled: false });+});diff --git a/sdk/typescript/tests-ts/scan-comparison.test.ts b/sdk/typescript/tests-ts/scan-comparison.test.tsindex fe3ca535c..5d492ba0f 100644--- a/sdk/typescript/tests-ts/scan-comparison.test.ts+++ b/sdk/typescript/tests-ts/scan-comparison.test.ts@@ -306,6 +306,7 @@ describe("semantic scan comparison", () => {codex_security_surface: "sdk",codex_security_command: "compare",codex_security_package_version: VERSION,+ ...(withProfile ? { codex_security_provider: "custom" } : {}),},});const parsed = await runCodexCommand(@@ -470,6 +471,11 @@ describe("semantic scan comparison", () => {codex_security_surface: "sdk",codex_security_command: "compare",codex_security_package_version: VERSION,+ codex_security_provider: ["fireworks", "amazon-bedrock"].includes(+ selection,+ )+ ? selection+ : "custom",},default_permissions: "codex_security_deep_scan_worker",permissions: {@@ -1251,6 +1257,7 @@ describe("semantic scan comparison", () => {codex_security_surface: "sdk",codex_security_command: "compare",codex_security_package_version: VERSION,+ codex_security_provider: "openai",},});expect(profileClient.profiles).toHaveLength(0);diff --git a/sdk/typescript/tests-ts/support/request-metadata.ts b/sdk/typescript/tests-ts/support/request-metadata.tsnew file mode 100644index 000000000..31d3b50bc--- /dev/null+++ b/sdk/typescript/tests-ts/support/request-metadata.ts@@ -0,0 +1,10 @@+import { parse } from "smol-toml";++export function requestMetadata(args: readonly string[] | undefined) {+ const override = args?.find((value) =>+ value.startsWith("responses_api_metadata="),+ );+ return override === undefined+ ? undefined+ : parse(override)["responses_api_metadata"];+}