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(sdk): exclude inherited parent events from saved worker logs (#1060)
mldangelo-oai7347d18f5980
diff --git a/sdk/typescript/src/cost.ts b/sdk/typescript/src/cost.tsindex 7ce4a73b3..4aa0c12c3 100644--- a/sdk/typescript/src/cost.ts+++ b/sdk/typescript/src/cost.ts@@ -14,6 +14,7 @@ import {} from "./scan-activity.js";import {isScanArtifactDirectory,+ sessionOwnsTurn,sessionParentThreadId,sessionStartedAt,} from "./scan-sessions.js";@@ -508,20 +509,12 @@ function readSessionEvent(const usage = tokenUsage(payload["info"]["total_token_usage"]);if (usage !== null) session.inheritedUsage = usage;}- if (payload["type"] === "task_started") {- // Fresh Codex worker thread/turn IDs share a same-process monotonic UUIDv7 generator.- const threadOrder = uuid7Order(session.threadId);- const turnOrder = uuid7Order(payload["turn_id"]);- const owned =- threadOrder === null- ? typeof payload["started_at"] === "number" &&- session.startedAt !== null &&- payload["started_at"] >= Math.floor(session.startedAt / 1_000)- : turnOrder !== null && turnOrder >= threadOrder;- if (owned) {- session.replaying = false;- session.events?.push(event);- }+ if (+ payload["type"] === "task_started" &&+ sessionOwnsTurn(session, payload)+ ) {+ session.replaying = false;+ session.events?.push(event);}return;}@@ -661,18 +654,6 @@ function readSessionEvent(if (ownUsage !== null) session.usage = ownUsage;}-function uuid7Order(value: unknown): bigint | null {- if (- typeof value !== "string" ||- !/^[0-9a-f]{8}-[0-9a-f]{4}-7[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu.test(- value,- )- ) {- return null;- }- return BigInt(`0x${value.replaceAll("-", "")}`);-}-function readSessionReasoning(event: Readonly<Record<string, unknown>>,payload: Readonly<Record<string, unknown>>,diff --git a/sdk/typescript/src/scan-logs.ts b/sdk/typescript/src/scan-logs.tsindex efa6553b1..c3c805ceb 100644--- a/sdk/typescript/src/scan-logs.ts+++ b/sdk/typescript/src/scan-logs.ts@@ -8,6 +8,7 @@ import { CodexSecurityError } from "./errors.js";import type { JsonObject } from "./config.js";import {isScanArtifactDirectory,+ sessionOwnsTurn,sessionParentThreadId,sessionStartedAt,} from "./scan-sessions.js";@@ -177,9 +178,7 @@ export async function readScanLogs(options: ScanLogOptions) {event["type"] !== "event_msg" ||!isRecord(payload) ||payload["type"] !== "task_started" ||- typeof payload["started_at"] !== "number" ||- session.startedAt === null ||- payload["started_at"] < Math.floor(session.startedAt / 1_000)+ !sessionOwnsTurn(session, payload)) {continue;}diff --git a/sdk/typescript/src/scan-sessions.ts b/sdk/typescript/src/scan-sessions.tsindex f34d53270..b74dab0ea 100644--- a/sdk/typescript/src/scan-sessions.ts+++ b/sdk/typescript/src/scan-sessions.ts@@ -7,6 +7,32 @@ export function sessionStartedAt(timestamp: unknown): number | null {return Number.isFinite(startedAt) ? startedAt : null;}+export function sessionOwnsTurn(+ session: { threadId: string | null; startedAt: number | null },+ payload: Readonly<Record<string, unknown>>,+): boolean {+ // Fresh Codex worker thread/turn IDs share a same-process monotonic UUIDv7 generator.+ const threadOrder = uuid7Order(session.threadId);+ const turnOrder = uuid7Order(payload["turn_id"]);+ return threadOrder === null+ ? typeof payload["started_at"] === "number" &&+ session.startedAt !== null &&+ payload["started_at"] >= Math.floor(session.startedAt / 1_000)+ : turnOrder !== null && turnOrder >= threadOrder;+}++function uuid7Order(value: unknown): bigint | null {+ if (+ typeof value !== "string" ||+ !/^[0-9a-f]{8}-[0-9a-f]{4}-7[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu.test(+ value,+ )+ ) {+ return null;+ }+ return BigInt(`0x${value.replaceAll("-", "")}`);+}+export function sessionParentThreadId(metadata: Readonly<Record<string, unknown>>,): string | null {diff --git a/sdk/typescript/tests-ts/cost.test.ts b/sdk/typescript/tests-ts/cost.test.tsindex c35856f42..453fef682 100644--- a/sdk/typescript/tests-ts/cost.test.ts+++ b/sdk/typescript/tests-ts/cost.test.ts@@ -1298,6 +1298,10 @@ describe("live scan cost tracking", () => {);test.each([+ [+ "keeps an earlier-millisecond UUIDv7 turn in inherited history",+ ["019f9e4d-b3b9-7000-8000-000000000001"],+ ],["keeps a same-millisecond lower UUIDv7 turn in inherited history",[lowerUuid7Turn],@@ -1351,6 +1355,14 @@ describe("live scan cost tracking", () => {: [];});expect(forwardedTurnIds).toEqual([higherUuid7Turn]);+ const saved = await readScanLogs({+ scanId: "scan-example",+ threadId: childUuid7Thread,+ codexHome: home,+ });+ const ownedEvents = [rollout[0]!, ...rollout.slice(-2)];+ expect(forwardedEvents.map(({ event }) => event)).toEqual(ownedEvents);+ expect(saved.events.map(({ event }) => event)).toEqual(ownedEvents);});test("forwards actions from this scan's delegated workers only", async () => {