@openai/codex-security 0.1.24 → 0.1.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +177 -19
- package/_bundled_plugin/.codex-plugin/plugin.json +1 -1
- package/_bundled_plugin/mcp/server.mjs.br.part-000 +0 -0
- package/_bundled_plugin/mcp/server.mjs.br.part-001 +0 -0
- package/_bundled_plugin/scripts/rank_preview.py +11 -1
- package/_bundled_plugin/scripts/workbench_cli.py +8 -1
- package/_bundled_plugin/scripts/workbench_db.py +44 -2
- package/_bundled_plugin/scripts/workbench_scan_history.py +374 -66
- package/_bundled_plugin/scripts/workbench_schema.py +15 -0
- package/_bundled_plugin/scripts/workbench_target.py +86 -12
- package/dist/api.d.ts +15 -2
- package/dist/api.d.ts.map +1 -1
- package/dist/api.js +330 -28
- package/dist/api.js.map +1 -1
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +35 -3
- package/dist/auth.js.map +1 -1
- package/dist/cli.d.ts +2 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +86 -33
- package/dist/cli.js.map +1 -1
- package/dist/component-plan.d.ts.map +1 -1
- package/dist/component-plan.js +4 -2
- package/dist/component-plan.js.map +1 -1
- package/dist/component-scan.d.ts.map +1 -1
- package/dist/component-scan.js +21 -6
- package/dist/component-scan.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +46 -2
- package/dist/config.js.map +1 -1
- package/dist/cost.d.ts +1 -0
- package/dist/cost.d.ts.map +1 -1
- package/dist/cost.js +23 -11
- package/dist/cost.js.map +1 -1
- package/dist/deduplication/checkpointed-review.d.ts.map +1 -1
- package/dist/deduplication/checkpointed-review.js +2 -1
- package/dist/deduplication/checkpointed-review.js.map +1 -1
- package/dist/deduplication/codex-review.d.ts +3 -0
- package/dist/deduplication/codex-review.d.ts.map +1 -1
- package/dist/deduplication/codex-review.js +122 -36
- package/dist/deduplication/codex-review.js.map +1 -1
- package/dist/deduplication/deduplication-prompts.d.ts +4 -3
- package/dist/deduplication/deduplication-prompts.d.ts.map +1 -1
- package/dist/deduplication/deduplication-prompts.js +18 -9
- package/dist/deduplication/deduplication-prompts.js.map +1 -1
- package/dist/deduplication/deduplication-reviewer.d.ts +2 -7
- package/dist/deduplication/deduplication-reviewer.d.ts.map +1 -1
- package/dist/deduplication/deduplication-reviewer.js +46 -24
- package/dist/deduplication/deduplication-reviewer.js.map +1 -1
- package/dist/deduplication/deduplication.d.ts.map +1 -1
- package/dist/deduplication/deduplication.js +186 -23
- package/dist/deduplication/deduplication.js.map +1 -1
- package/dist/deduplication/scan.d.ts +9 -1
- package/dist/deduplication/scan.d.ts.map +1 -1
- package/dist/deduplication/scan.js +24 -7
- package/dist/deduplication/scan.js.map +1 -1
- package/dist/errors.d.ts +13 -0
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +7 -0
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +5 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/mock-scan.d.ts +4 -0
- package/dist/mock-scan.d.ts.map +1 -0
- package/dist/mock-scan.js +210 -0
- package/dist/mock-scan.js.map +1 -0
- package/dist/publish.d.ts.map +1 -1
- package/dist/publish.js +2 -2
- package/dist/publish.js.map +1 -1
- package/dist/runtime.d.ts +1 -0
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +49 -14
- package/dist/runtime.js.map +1 -1
- package/dist/scan-comparison.d.ts +11 -2
- package/dist/scan-comparison.d.ts.map +1 -1
- package/dist/scan-comparison.js +237 -39
- package/dist/scan-comparison.js.map +1 -1
- package/dist/scan-dashboard.d.ts +3 -1
- package/dist/scan-dashboard.d.ts.map +1 -1
- package/dist/scan-dashboard.js +70 -3
- package/dist/scan-dashboard.js.map +1 -1
- package/dist/scan-history-renderer.d.ts.map +1 -1
- package/dist/scan-history-renderer.js +21 -0
- package/dist/scan-history-renderer.js.map +1 -1
- package/dist/server/api.d.ts +6 -0
- package/dist/server/api.d.ts.map +1 -0
- package/dist/server/api.js +4 -0
- package/dist/server/api.js.map +1 -0
- package/dist/server/dashboard/app.css +1 -1
- package/dist/server/embeddings.d.ts +2 -1
- package/dist/server/embeddings.d.ts.map +1 -1
- package/dist/server/embeddings.js +8 -3
- package/dist/server/embeddings.js.map +1 -1
- package/dist/server/serve.d.ts.map +1 -1
- package/dist/server/serve.js +1 -1
- package/dist/server/serve.js.map +1 -1
- package/dist/targets.d.ts.map +1 -1
- package/dist/targets.js +3 -5
- package/dist/targets.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/dist/version.js.map +1 -1
- package/package.json +9 -4
package/dist/auth.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAQA,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACxB,MAAM,cAAc,CAAC;AAiDtB,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,gBAAgB;;gBAmBzB,OAAO,EAAE,YAAY,EACrB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,WAAW,EAAE,kBAAkB,EAC/B,SAAS,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDvC,IAAW,OAAO,IAAI,IAAI,CAEzB;IAED,IAAW,OAAO,IAAI,MAAM,GAAG,IAAI,CAElC;IAED,IAAW,eAAe,IAAI,MAAM,GAAG,IAAI,CAE1C;IAED,IAAW,QAAQ,IAAI,MAAM,GAAG,IAAI,CAEnC;IAEY,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC;IAI5B,mBAAmB,CAC9B,OAAO,GAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAA;KAAO,GACrC,OAAO,CAAC,IAAI,CAAC;IAKT,MAAM,IAAI,IAAI;CAyDtB;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,kBAAkB,EAC/B,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,WAAW,CAAC,CAWtB;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,kBAAkB,EAC/B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,aAAa,CAAC,CAgBxB;AAED,wBAAsB,MAAM,CAC1B,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,kBAAkB,EAC/B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CAaf"}
|
package/dist/auth.js
CHANGED
|
@@ -1,8 +1,40 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
2
|
import { isIP } from "node:net";
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
3
|
+
import { readFile } from "node:fs/promises";
|
|
4
|
+
import { homedir } from "node:os";
|
|
5
|
+
import { join, resolve } from "node:path";
|
|
6
|
+
import { parse } from "smol-toml";
|
|
7
|
+
import { CodexSecurityError, PluginBootstrapError } from "./errors.js";
|
|
8
|
+
import { executablePathForSpawn, expandHome, runCodexCommand, } from "./runtime.js";
|
|
5
9
|
const LOGIN_CHILD_TERMINATION_GRACE_MS = 1_000;
|
|
10
|
+
/** @internal */
|
|
11
|
+
export function environmentEntry(environment, requested) {
|
|
12
|
+
const exact = environment[requested];
|
|
13
|
+
if (exact !== undefined || process.platform !== "win32")
|
|
14
|
+
return exact;
|
|
15
|
+
const upper = requested.toUpperCase();
|
|
16
|
+
return Object.entries(environment).find(([name]) => name.toUpperCase() === upper)?.[1];
|
|
17
|
+
}
|
|
18
|
+
/** @internal */
|
|
19
|
+
export function configuredCodexHome(environment) {
|
|
20
|
+
return resolve(expandHome(environmentEntry(environment, "CODEX_HOME")?.trim() ||
|
|
21
|
+
join(homedir(), ".codex"), environment));
|
|
22
|
+
}
|
|
23
|
+
/** @internal */
|
|
24
|
+
export async function readCodexHomeConfig(environment, signal) {
|
|
25
|
+
try {
|
|
26
|
+
return parse(await readFile(join(configuredCodexHome(environment), "config.toml"), {
|
|
27
|
+
encoding: "utf8",
|
|
28
|
+
signal,
|
|
29
|
+
}));
|
|
30
|
+
}
|
|
31
|
+
catch (error) {
|
|
32
|
+
signal?.throwIfAborted();
|
|
33
|
+
if (error.code === "ENOENT")
|
|
34
|
+
return {};
|
|
35
|
+
throw new CodexSecurityError("Could not read the configured Codex provider.");
|
|
36
|
+
}
|
|
37
|
+
}
|
|
6
38
|
export class CodexLoginHandle {
|
|
7
39
|
#child;
|
|
8
40
|
#completion;
|
|
@@ -23,7 +55,7 @@ export class CodexLoginHandle {
|
|
|
23
55
|
constructor(command, args, environment, onSuccess) {
|
|
24
56
|
void this.#urlReady.promise.catch(() => undefined);
|
|
25
57
|
void this.#deviceReady.promise.catch(() => undefined);
|
|
26
|
-
this.#child = spawn(command.command, [...args], {
|
|
58
|
+
this.#child = spawn(executablePathForSpawn(command.command), [...args], {
|
|
27
59
|
env: environment,
|
|
28
60
|
stdio: ["pipe", "pipe", "pipe"],
|
|
29
61
|
windowsHide: true,
|
package/dist/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn, type ChildProcessWithoutNullStreams } from \"node:child_process\";\nimport { isIP } from \"node:net\";\nimport { PluginBootstrapError } from \"./errors.js\";\nimport {\n runCodexCommand,\n type CodexCommand,\n type ProcessEnvironment,\n} from \"./runtime.js\";\n\nconst LOGIN_CHILD_TERMINATION_GRACE_MS = 1_000;\n\nexport interface LoginResult {\n success: boolean;\n exitCode: number | null;\n stdout: string;\n stderr: string;\n}\n\nexport interface AccountStatus {\n authenticated: boolean;\n details: string;\n}\n\nexport class CodexLoginHandle {\n readonly #child: ChildProcessWithoutNullStreams;\n readonly #completion: Promise<LoginResult>;\n readonly #urlReady = Promise.withResolvers<void>();\n readonly #deviceReady = Promise.withResolvers<void>();\n #canceled = false;\n #forcedTermination: ReturnType<typeof setTimeout> | undefined;\n readonly #output = { stdout: \"\", stderr: \"\" };\n readonly #tails = { stdout: \"\", stderr: \"\" };\n readonly #urls: Record<\"stdout\" | \"stderr\", string | null> = {\n stdout: null,\n stderr: null,\n };\n readonly #codes: Record<\"stdout\" | \"stderr\", string | null> = {\n stdout: null,\n stderr: null,\n };\n\n public constructor(\n command: CodexCommand,\n args: readonly string[],\n environment: ProcessEnvironment,\n onSuccess: () => void | Promise<void>,\n ) {\n void this.#urlReady.promise.catch(() => undefined);\n void this.#deviceReady.promise.catch(() => undefined);\n this.#child = spawn(command.command, [...args], {\n env: environment,\n stdio: [\"pipe\", \"pipe\", \"pipe\"],\n windowsHide: true,\n });\n this.#child.stdin.end();\n this.#child.stdout.setEncoding(\"utf8\");\n this.#child.stderr.setEncoding(\"utf8\");\n this.#child.stdout.on(\"data\", (chunk: string) => {\n this.#recordOutput(\"stdout\", chunk);\n });\n this.#child.stderr.on(\"data\", (chunk: string) => {\n this.#recordOutput(\"stderr\", chunk);\n });\n this.#completion = new Promise((resolve, reject) => {\n this.#child.once(\"close\", (exitCode) => {\n clearTimeout(this.#forcedTermination);\n if (!this.#canceled) {\n this.#flushInstructionTails();\n }\n const result = {\n success: exitCode === 0 && !this.#canceled,\n exitCode,\n ...this.#output,\n };\n this.#settleInstructionWaiters(result);\n if (result.success) {\n Promise.resolve(onSuccess()).then(() => resolve(result), reject);\n } else {\n resolve(result);\n }\n });\n this.#child.once(\"error\", (error) => {\n clearTimeout(this.#forcedTermination);\n this.#settleInstructionWaiters({\n success: false,\n exitCode: null,\n stdout: this.#output.stdout,\n stderr: error.message,\n });\n reject(error);\n });\n });\n }\n\n public get loginId(): null {\n return null;\n }\n\n public get authUrl(): string | null {\n return this.#urls.stdout ?? this.#urls.stderr;\n }\n\n public get verificationUrl(): string | null {\n return this.authUrl;\n }\n\n public get userCode(): string | null {\n return this.#codes.stdout ?? this.#codes.stderr;\n }\n\n public async wait(): Promise<LoginResult> {\n return await this.#completion;\n }\n\n public async waitForInstructions(\n options: { deviceCode?: boolean } = {},\n ): Promise<void> {\n await (options.deviceCode === true ? this.#deviceReady : this.#urlReady)\n .promise;\n }\n\n public cancel(): void {\n this.#canceled = true;\n if (this.#child.exitCode !== null || this.#child.signalCode !== null)\n return;\n this.#child.kill(\"SIGTERM\");\n if (this.#forcedTermination !== undefined) return;\n this.#forcedTermination = setTimeout(() => {\n if (this.#child.exitCode === null && this.#child.signalCode === null) {\n this.#child.kill(\"SIGKILL\");\n }\n this.#child.stdin.destroy();\n this.#child.stdout.destroy();\n this.#child.stderr.destroy();\n }, LOGIN_CHILD_TERMINATION_GRACE_MS);\n }\n\n #recordOutput(stream: \"stdout\" | \"stderr\", chunk: string): void {\n this.#output[stream] += chunk;\n const output = `${this.#tails[stream]}${chunk.replaceAll(\"\\r\", \"\\n\")}`;\n const lastDelimiter = output.lastIndexOf(\"\\n\");\n const completed =\n lastDelimiter === -1 ? \"\" : output.slice(0, lastDelimiter + 1);\n this.#urls[stream] ??= preferredAuthUrl(completed);\n this.#codes[stream] ??= userCodeFromOutput(completed);\n this.#tails[stream] =\n lastDelimiter === -1 ? output : output.slice(lastDelimiter + 1);\n this.#notifyInstructions();\n }\n\n #flushInstructionTails(): void {\n for (const stream of [\"stdout\", \"stderr\"] as const) {\n this.#urls[stream] ??= preferredAuthUrl(this.#tails[stream]);\n this.#codes[stream] ??= userCodeFromOutput(this.#tails[stream]);\n }\n }\n\n #notifyInstructions(): void {\n if (this.authUrl !== null) this.#urlReady.resolve();\n if (this.verificationUrl !== null && this.userCode !== null)\n this.#deviceReady.resolve();\n }\n\n #settleInstructionWaiters(result: LoginResult): void {\n this.#notifyInstructions();\n if (result.success) {\n this.#urlReady.resolve();\n this.#deviceReady.resolve();\n return;\n }\n const error = new PluginBootstrapError(\n this.#canceled\n ? \"Codex login was canceled.\"\n : `Codex login exited before authentication instructions were available: ${result.stderr.trim() || result.stdout.trim() || result.exitCode || \"unknown error\"}`,\n );\n this.#urlReady.reject(error);\n this.#deviceReady.reject(error);\n }\n}\n\nexport async function loginApiKey(\n command: CodexCommand,\n environment: ProcessEnvironment,\n apiKey: string,\n signal?: AbortSignal,\n): Promise<LoginResult> {\n if (apiKey.trim().length === 0) {\n throw new PluginBootstrapError(\"The API key must be non-empty.\");\n }\n return await runCodexCommand(\n command,\n [\"login\", \"--with-api-key\"],\n environment,\n `${apiKey}\\n`,\n signal,\n );\n}\n\nexport async function accountStatus(\n command: CodexCommand,\n environment: ProcessEnvironment,\n signal?: AbortSignal,\n): Promise<AccountStatus> {\n const result = await runCodexCommand(\n command,\n [\"login\", \"status\"],\n environment,\n undefined,\n signal,\n );\n const details = [result.stdout.trim(), result.stderr.trim()]\n .filter(Boolean)\n .join(\"\\n\");\n return {\n authenticated:\n result.exitCode === 0 && !/not logged in|unauthenticated/i.test(details),\n details,\n };\n}\n\nexport async function logout(\n command: CodexCommand,\n environment: ProcessEnvironment,\n signal?: AbortSignal,\n): Promise<void> {\n const result = await runCodexCommand(\n command,\n [\"logout\"],\n environment,\n undefined,\n signal,\n );\n if (!result.success) {\n throw new PluginBootstrapError(\n `Codex logout failed: ${result.stderr.trim() || result.stdout.trim() || \"unknown error\"}`,\n );\n }\n}\n\nfunction preferredAuthUrl(value: string): string | null {\n for (const match of plainTerminalText(value).matchAll(\n /https?:\\/\\/[^\\s<>\"']+/g,\n )) {\n const url = match[0].replace(/[.,;:!?)\\]}]+$/, \"\");\n try {\n const hostname = new URL(url).hostname.toLowerCase().replace(/\\.$/, \"\");\n if (\n hostname !== \"localhost\" &&\n !hostname.endsWith(\".localhost\") &&\n !(isIP(hostname) === 4 && hostname.startsWith(\"127.\")) &&\n hostname !== \"0.0.0.0\" &&\n hostname !== \"[::1]\" &&\n hostname !== \"[::]\" &&\n hostname !== \"[::ffff:0:0]\" &&\n !hostname.startsWith(\"[::ffff:7f\") &&\n !hostname.startsWith(\"[::7f\")\n ) {\n return url;\n }\n } catch {\n continue;\n }\n }\n return null;\n}\n\nfunction userCodeFromOutput(value: string): string | null {\n const output = plainTerminalText(value);\n return (\n output.match(/(?:code|user code)\\s*[:=]\\s*([A-Z0-9-]{4,})/i)?.[1] ??\n output.match(/\\b[A-Z0-9]{4,}(?:-[A-Z0-9]{4,})+\\b/)?.[0] ??\n null\n );\n}\n\nfunction plainTerminalText(value: string): string {\n return value\n .replace(/\\u001b\\][^\\u0007]*(?:\\u0007|\\u001b\\\\)/g, \"\")\n .replace(/\\u001b\\[[0-?]*[ -/]*[@-~]/g, \"\")\n .replace(/\\r/g, \"\");\n}\n"]}
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAuC,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAElC,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EACL,sBAAsB,EACtB,UAAU,EACV,eAAe,GAGhB,MAAM,cAAc,CAAC;AAEtB,MAAM,gCAAgC,GAAG,KAAK,CAAC;AAE/C,gBAAgB;AAChB,MAAM,UAAU,gBAAgB,CAC9B,WAA+B,EAC/B,SAAiB;IAEjB,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,IAAI,KAAK,KAAK,SAAS,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IACtE,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;IACtC,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CACrC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,KAAK,CACzC,EAAE,CAAC,CAAC,CAAC,CAAC;AACT,CAAC;AAED,gBAAgB;AAChB,MAAM,UAAU,mBAAmB,CAAC,WAA+B;IACjE,OAAO,OAAO,CACZ,UAAU,CACR,gBAAgB,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,IAAI,EAAE;QACjD,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,CAAC,EAC3B,WAAW,CACZ,CACF,CAAC;AACJ,CAAC;AAED,gBAAgB;AAChB,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,WAA+B,EAC/B,MAAoB;IAEpB,IAAI,CAAC;QACH,OAAO,KAAK,CACV,MAAM,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE,aAAa,CAAC,EAAE;YACpE,QAAQ,EAAE,MAAM;YAChB,MAAM;SACP,CAAC,CACW,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,EAAE,cAAc,EAAE,CAAC;QACzB,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,EAAE,CAAC;QAClE,MAAM,IAAI,kBAAkB,CAC1B,+CAA+C,CAChD,CAAC;IACJ,CAAC;AACH,CAAC;AAcD,MAAM,OAAO,gBAAgB;IAClB,MAAM,CAAiC;IACvC,WAAW,CAAuB;IAClC,SAAS,GAAG,OAAO,CAAC,aAAa,EAAQ,CAAC;IAC1C,YAAY,GAAG,OAAO,CAAC,aAAa,EAAQ,CAAC;IACtD,SAAS,GAAG,KAAK,CAAC;IAClB,kBAAkB,CAA4C;IACrD,OAAO,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACrC,MAAM,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACpC,KAAK,GAA+C;QAC3D,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,IAAI;KACb,CAAC;IACO,MAAM,GAA+C;QAC5D,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,IAAI;KACb,CAAC;IAEF,YACE,OAAqB,EACrB,IAAuB,EACvB,WAA+B,EAC/B,SAAqC;QAErC,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACnD,KAAK,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,sBAAsB,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE;YACtE,GAAG,EAAE,WAAW;YAChB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;YAC/B,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YAC9C,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YAC9C,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACjD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACrC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;gBACtC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;oBACpB,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAChC,CAAC;gBACD,MAAM,MAAM,GAAG;oBACb,OAAO,EAAE,QAAQ,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS;oBAC1C,QAAQ;oBACR,GAAG,IAAI,CAAC,OAAO;iBAChB,CAAC;gBACF,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;gBACvC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;oBACnB,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;gBACnE,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,MAAM,CAAC,CAAC;gBAClB,CAAC;YACH,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBAClC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;gBACtC,IAAI,CAAC,yBAAyB,CAAC;oBAC7B,OAAO,EAAE,KAAK;oBACd,QAAQ,EAAE,IAAI;oBACd,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;oBAC3B,MAAM,EAAE,KAAK,CAAC,OAAO;iBACtB,CAAC,CAAC;gBACH,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAChD,CAAC;IAED,IAAW,eAAe;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IAAW,QAAQ;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC;IAChC,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAC9B,UAAoC,EAAE;QAEtC,MAAM,CAAC,OAAO,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;aACrE,OAAO,CAAC;IACb,CAAC;IAEM,MAAM;QACX,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI;YAClE,OAAO;QACT,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5B,IAAI,IAAI,CAAC,kBAAkB,KAAK,SAAS;YAAE,OAAO;QAClD,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC,GAAG,EAAE;YACxC,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;gBACrE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC9B,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAC/B,CAAC,EAAE,gCAAgC,CAAC,CAAC;IACvC,CAAC;IAED,aAAa,CAAC,MAA2B,EAAE,KAAa;QACtD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC;QAC9B,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;QACvE,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,SAAS,GACb,aAAa,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,GAAG,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACtD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;YACjB,aAAa,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC7B,CAAC;IAED,sBAAsB;QACpB,KAAK,MAAM,MAAM,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAU,EAAE,CAAC;YACnD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;YAC7D,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IAED,mBAAmB;QACjB,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI;YAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QACpD,IAAI,IAAI,CAAC,eAAe,KAAK,IAAI,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI;YACzD,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;IAChC,CAAC;IAED,yBAAyB,CAAC,MAAmB;QAC3C,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YACzB,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;YAC5B,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,oBAAoB,CACpC,IAAI,CAAC,SAAS;YACZ,CAAC,CAAC,2BAA2B;YAC7B,CAAC,CAAC,yEAAyE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,MAAM,CAAC,QAAQ,IAAI,eAAe,EAAE,CAClK,CAAC;QACF,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAClC,CAAC;CACF;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAAqB,EACrB,WAA+B,EAC/B,MAAc,EACd,MAAoB;IAEpB,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,oBAAoB,CAAC,gCAAgC,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,MAAM,eAAe,CAC1B,OAAO,EACP,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAC3B,WAAW,EACX,GAAG,MAAM,IAAI,EACb,MAAM,CACP,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAqB,EACrB,WAA+B,EAC/B,MAAoB;IAEpB,MAAM,MAAM,GAAG,MAAM,eAAe,CAClC,OAAO,EACP,CAAC,OAAO,EAAE,QAAQ,CAAC,EACnB,WAAW,EACX,SAAS,EACT,MAAM,CACP,CAAC;IACF,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;SACzD,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,OAAO;QACL,aAAa,EACX,MAAM,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,gCAAgC,CAAC,IAAI,CAAC,OAAO,CAAC;QAC1E,OAAO;KACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,OAAqB,EACrB,WAA+B,EAC/B,MAAoB;IAEpB,MAAM,MAAM,GAAG,MAAM,eAAe,CAClC,OAAO,EACP,CAAC,QAAQ,CAAC,EACV,WAAW,EACX,SAAS,EACT,MAAM,CACP,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,IAAI,oBAAoB,CAC5B,wBAAwB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,eAAe,EAAE,CAC1F,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAa;IACrC,KAAK,MAAM,KAAK,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC,QAAQ,CACnD,wBAAwB,CACzB,EAAE,CAAC;QACF,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACxE,IACE,QAAQ,KAAK,WAAW;gBACxB,CAAC,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC;gBAChC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBACtD,QAAQ,KAAK,SAAS;gBACtB,QAAQ,KAAK,OAAO;gBACpB,QAAQ,KAAK,MAAM;gBACnB,QAAQ,KAAK,cAAc;gBAC3B,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC;gBAClC,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,EAC7B,CAAC;gBACD,OAAO,GAAG,CAAC;YACb,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAa;IACvC,MAAM,MAAM,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACxC,OAAO,CACL,MAAM,CAAC,KAAK,CAAC,8CAA8C,CAAC,EAAE,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,EAAE,CAAC,CAAC,CAAC;QACvD,IAAI,CACL,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAa;IACtC,OAAO,KAAK;SACT,OAAO,CAAC,wCAAwC,EAAE,EAAE,CAAC;SACrD,OAAO,CAAC,4BAA4B,EAAE,EAAE,CAAC;SACzC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACxB,CAAC","sourcesContent":["import { spawn, type ChildProcessWithoutNullStreams } from \"node:child_process\";\nimport { isIP } from \"node:net\";\nimport { readFile } from \"node:fs/promises\";\nimport { homedir } from \"node:os\";\nimport { join, resolve } from \"node:path\";\nimport { parse } from \"smol-toml\";\nimport type { JsonObject } from \"./config.js\";\nimport { CodexSecurityError, PluginBootstrapError } from \"./errors.js\";\nimport {\n executablePathForSpawn,\n expandHome,\n runCodexCommand,\n type CodexCommand,\n type ProcessEnvironment,\n} from \"./runtime.js\";\n\nconst LOGIN_CHILD_TERMINATION_GRACE_MS = 1_000;\n\n/** @internal */\nexport function environmentEntry(\n environment: ProcessEnvironment,\n requested: string,\n): string | undefined {\n const exact = environment[requested];\n if (exact !== undefined || process.platform !== \"win32\") return exact;\n const upper = requested.toUpperCase();\n return Object.entries(environment).find(\n ([name]) => name.toUpperCase() === upper,\n )?.[1];\n}\n\n/** @internal */\nexport function configuredCodexHome(environment: ProcessEnvironment): string {\n return resolve(\n expandHome(\n environmentEntry(environment, \"CODEX_HOME\")?.trim() ||\n join(homedir(), \".codex\"),\n environment,\n ),\n );\n}\n\n/** @internal */\nexport async function readCodexHomeConfig(\n environment: ProcessEnvironment,\n signal?: AbortSignal,\n): Promise<JsonObject> {\n try {\n return parse(\n await readFile(join(configuredCodexHome(environment), \"config.toml\"), {\n encoding: \"utf8\",\n signal,\n }),\n ) as JsonObject;\n } catch (error) {\n signal?.throwIfAborted();\n if ((error as NodeJS.ErrnoException).code === \"ENOENT\") return {};\n throw new CodexSecurityError(\n \"Could not read the configured Codex provider.\",\n );\n }\n}\n\nexport interface LoginResult {\n success: boolean;\n exitCode: number | null;\n stdout: string;\n stderr: string;\n}\n\nexport interface AccountStatus {\n authenticated: boolean;\n details: string;\n}\n\nexport class CodexLoginHandle {\n readonly #child: ChildProcessWithoutNullStreams;\n readonly #completion: Promise<LoginResult>;\n readonly #urlReady = Promise.withResolvers<void>();\n readonly #deviceReady = Promise.withResolvers<void>();\n #canceled = false;\n #forcedTermination: ReturnType<typeof setTimeout> | undefined;\n readonly #output = { stdout: \"\", stderr: \"\" };\n readonly #tails = { stdout: \"\", stderr: \"\" };\n readonly #urls: Record<\"stdout\" | \"stderr\", string | null> = {\n stdout: null,\n stderr: null,\n };\n readonly #codes: Record<\"stdout\" | \"stderr\", string | null> = {\n stdout: null,\n stderr: null,\n };\n\n public constructor(\n command: CodexCommand,\n args: readonly string[],\n environment: ProcessEnvironment,\n onSuccess: () => void | Promise<void>,\n ) {\n void this.#urlReady.promise.catch(() => undefined);\n void this.#deviceReady.promise.catch(() => undefined);\n this.#child = spawn(executablePathForSpawn(command.command), [...args], {\n env: environment,\n stdio: [\"pipe\", \"pipe\", \"pipe\"],\n windowsHide: true,\n });\n this.#child.stdin.end();\n this.#child.stdout.setEncoding(\"utf8\");\n this.#child.stderr.setEncoding(\"utf8\");\n this.#child.stdout.on(\"data\", (chunk: string) => {\n this.#recordOutput(\"stdout\", chunk);\n });\n this.#child.stderr.on(\"data\", (chunk: string) => {\n this.#recordOutput(\"stderr\", chunk);\n });\n this.#completion = new Promise((resolve, reject) => {\n this.#child.once(\"close\", (exitCode) => {\n clearTimeout(this.#forcedTermination);\n if (!this.#canceled) {\n this.#flushInstructionTails();\n }\n const result = {\n success: exitCode === 0 && !this.#canceled,\n exitCode,\n ...this.#output,\n };\n this.#settleInstructionWaiters(result);\n if (result.success) {\n Promise.resolve(onSuccess()).then(() => resolve(result), reject);\n } else {\n resolve(result);\n }\n });\n this.#child.once(\"error\", (error) => {\n clearTimeout(this.#forcedTermination);\n this.#settleInstructionWaiters({\n success: false,\n exitCode: null,\n stdout: this.#output.stdout,\n stderr: error.message,\n });\n reject(error);\n });\n });\n }\n\n public get loginId(): null {\n return null;\n }\n\n public get authUrl(): string | null {\n return this.#urls.stdout ?? this.#urls.stderr;\n }\n\n public get verificationUrl(): string | null {\n return this.authUrl;\n }\n\n public get userCode(): string | null {\n return this.#codes.stdout ?? this.#codes.stderr;\n }\n\n public async wait(): Promise<LoginResult> {\n return await this.#completion;\n }\n\n public async waitForInstructions(\n options: { deviceCode?: boolean } = {},\n ): Promise<void> {\n await (options.deviceCode === true ? this.#deviceReady : this.#urlReady)\n .promise;\n }\n\n public cancel(): void {\n this.#canceled = true;\n if (this.#child.exitCode !== null || this.#child.signalCode !== null)\n return;\n this.#child.kill(\"SIGTERM\");\n if (this.#forcedTermination !== undefined) return;\n this.#forcedTermination = setTimeout(() => {\n if (this.#child.exitCode === null && this.#child.signalCode === null) {\n this.#child.kill(\"SIGKILL\");\n }\n this.#child.stdin.destroy();\n this.#child.stdout.destroy();\n this.#child.stderr.destroy();\n }, LOGIN_CHILD_TERMINATION_GRACE_MS);\n }\n\n #recordOutput(stream: \"stdout\" | \"stderr\", chunk: string): void {\n this.#output[stream] += chunk;\n const output = `${this.#tails[stream]}${chunk.replaceAll(\"\\r\", \"\\n\")}`;\n const lastDelimiter = output.lastIndexOf(\"\\n\");\n const completed =\n lastDelimiter === -1 ? \"\" : output.slice(0, lastDelimiter + 1);\n this.#urls[stream] ??= preferredAuthUrl(completed);\n this.#codes[stream] ??= userCodeFromOutput(completed);\n this.#tails[stream] =\n lastDelimiter === -1 ? output : output.slice(lastDelimiter + 1);\n this.#notifyInstructions();\n }\n\n #flushInstructionTails(): void {\n for (const stream of [\"stdout\", \"stderr\"] as const) {\n this.#urls[stream] ??= preferredAuthUrl(this.#tails[stream]);\n this.#codes[stream] ??= userCodeFromOutput(this.#tails[stream]);\n }\n }\n\n #notifyInstructions(): void {\n if (this.authUrl !== null) this.#urlReady.resolve();\n if (this.verificationUrl !== null && this.userCode !== null)\n this.#deviceReady.resolve();\n }\n\n #settleInstructionWaiters(result: LoginResult): void {\n this.#notifyInstructions();\n if (result.success) {\n this.#urlReady.resolve();\n this.#deviceReady.resolve();\n return;\n }\n const error = new PluginBootstrapError(\n this.#canceled\n ? \"Codex login was canceled.\"\n : `Codex login exited before authentication instructions were available: ${result.stderr.trim() || result.stdout.trim() || result.exitCode || \"unknown error\"}`,\n );\n this.#urlReady.reject(error);\n this.#deviceReady.reject(error);\n }\n}\n\nexport async function loginApiKey(\n command: CodexCommand,\n environment: ProcessEnvironment,\n apiKey: string,\n signal?: AbortSignal,\n): Promise<LoginResult> {\n if (apiKey.trim().length === 0) {\n throw new PluginBootstrapError(\"The API key must be non-empty.\");\n }\n return await runCodexCommand(\n command,\n [\"login\", \"--with-api-key\"],\n environment,\n `${apiKey}\\n`,\n signal,\n );\n}\n\nexport async function accountStatus(\n command: CodexCommand,\n environment: ProcessEnvironment,\n signal?: AbortSignal,\n): Promise<AccountStatus> {\n const result = await runCodexCommand(\n command,\n [\"login\", \"status\"],\n environment,\n undefined,\n signal,\n );\n const details = [result.stdout.trim(), result.stderr.trim()]\n .filter(Boolean)\n .join(\"\\n\");\n return {\n authenticated:\n result.exitCode === 0 && !/not logged in|unauthenticated/i.test(details),\n details,\n };\n}\n\nexport async function logout(\n command: CodexCommand,\n environment: ProcessEnvironment,\n signal?: AbortSignal,\n): Promise<void> {\n const result = await runCodexCommand(\n command,\n [\"logout\"],\n environment,\n undefined,\n signal,\n );\n if (!result.success) {\n throw new PluginBootstrapError(\n `Codex logout failed: ${result.stderr.trim() || result.stdout.trim() || \"unknown error\"}`,\n );\n }\n}\n\nfunction preferredAuthUrl(value: string): string | null {\n for (const match of plainTerminalText(value).matchAll(\n /https?:\\/\\/[^\\s<>\"']+/g,\n )) {\n const url = match[0].replace(/[.,;:!?)\\]}]+$/, \"\");\n try {\n const hostname = new URL(url).hostname.toLowerCase().replace(/\\.$/, \"\");\n if (\n hostname !== \"localhost\" &&\n !hostname.endsWith(\".localhost\") &&\n !(isIP(hostname) === 4 && hostname.startsWith(\"127.\")) &&\n hostname !== \"0.0.0.0\" &&\n hostname !== \"[::1]\" &&\n hostname !== \"[::]\" &&\n hostname !== \"[::ffff:0:0]\" &&\n !hostname.startsWith(\"[::ffff:7f\") &&\n !hostname.startsWith(\"[::7f\")\n ) {\n return url;\n }\n } catch {\n continue;\n }\n }\n return null;\n}\n\nfunction userCodeFromOutput(value: string): string | null {\n const output = plainTerminalText(value);\n return (\n output.match(/(?:code|user code)\\s*[:=]\\s*([A-Z0-9-]{4,})/i)?.[1] ??\n output.match(/\\b[A-Z0-9]{4,}(?:-[A-Z0-9]{4,})+\\b/)?.[0] ??\n null\n );\n}\n\nfunction plainTerminalText(value: string): string {\n return value\n .replace(/\\u001b\\][^\\u0007]*(?:\\u0007|\\u001b\\\\)/g, \"\")\n .replace(/\\u001b\\[[0-?]*[ -/]*[@-~]/g, \"\")\n .replace(/\\r/g, \"\");\n}\n"]}
|
package/dist/cli.d.ts
CHANGED
|
@@ -13,6 +13,7 @@ import { checkScanPublication, publishScan } from "./publish.js";
|
|
|
13
13
|
import { type CodexCommand } from "./runtime.js";
|
|
14
14
|
import { type matchScanFindings } from "./scan-comparison.js";
|
|
15
15
|
import { CODEX_SECURITY_THREAD_SOURCES, type CodexSecurityThreadSource } from "./thread-source.js";
|
|
16
|
+
import { ScanDashboard } from "./scan-dashboard.js";
|
|
16
17
|
import type { PatchSelection } from "./patch-tui.js";
|
|
17
18
|
import { type UpdateNotice } from "./version.js";
|
|
18
19
|
type Writable = Pick<NodeJS.WriteStream, "write"> & {
|
|
@@ -67,6 +68,7 @@ interface CliDependencies {
|
|
|
67
68
|
prepareAuthenticationHome?: (environment: NodeJS.ProcessEnv) => Promise<string>;
|
|
68
69
|
hasStoredChatGPTSignIn?: (signal?: AbortSignal) => Promise<boolean>;
|
|
69
70
|
scanAuthenticationPrompt?: Pick<BulkScanPrompt, "isInteractive" | "select">;
|
|
71
|
+
scanInput?: ConstructorParameters<typeof ScanDashboard>[1]["input"];
|
|
70
72
|
publishPrompt?: Pick<BulkScanPrompt, "isInteractive" | "select"> & Partial<Pick<BulkScanPrompt, "checkbox">>;
|
|
71
73
|
checkScanPublication?: typeof checkScanPublication;
|
|
72
74
|
publishScan?: typeof publishScan;
|
package/dist/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAiDA,OAAO,EAEL,aAAa,
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/cli.js
CHANGED
|
@@ -3,7 +3,7 @@ import { execFile as execFileCallback, execFileSync, spawn, } from "node:child_p
|
|
|
3
3
|
import { createHash } from "node:crypto";
|
|
4
4
|
import { accessSync, constants, createReadStream, existsSync, lstatSync, realpathSync, writeSync, } from "node:fs";
|
|
5
5
|
import { chmod, lstat, mkdir, mkdtemp, open, readFile, realpath, rm, writeFile, } from "node:fs/promises";
|
|
6
|
-
import { tmpdir } from "node:os";
|
|
6
|
+
import { homedir, tmpdir } from "node:os";
|
|
7
7
|
import { basename, dirname, isAbsolute, join, parse, relative, resolve, sep, win32, } from "node:path";
|
|
8
8
|
import { cwd } from "node:process";
|
|
9
9
|
import { createInterface } from "node:readline";
|
|
@@ -13,7 +13,7 @@ import { fileURLToPath, pathToFileURL } from "node:url";
|
|
|
13
13
|
import { promisify, stripVTControlCharacters } from "node:util";
|
|
14
14
|
import { Cli, z } from "incur";
|
|
15
15
|
import { parse as parseToml } from "smol-toml";
|
|
16
|
-
import { classifyConnectionFailure, createSecurityInternal, environmentValue, listRepositoryFindings, SCAN_AUTH_MODES, scanAuthentication, } from "./api.js";
|
|
16
|
+
import { classifyConnectionFailure, createSecurityInternal, environmentValue, formatEnvironmentVariableRemovalGuidance, initialCredentialsAvailable, listRepositoryFindings, SCAN_AUTH_MODES, scanAuthentication, } from "./api.js";
|
|
17
17
|
import { accountStatus } from "./auth.js";
|
|
18
18
|
import { publishScanToCustom } from "./custom-publish.js";
|
|
19
19
|
import { deduplicateScanInternal } from "./deduplication/scan.js";
|
|
@@ -29,8 +29,8 @@ import { runMultiscan } from "./multiscan.js";
|
|
|
29
29
|
import { componentPlanSchema } from "./component-plan.js";
|
|
30
30
|
import { runComponentScans } from "./component-scan.js";
|
|
31
31
|
import { checkScanPublication, forceTerminatePublicationProcesses as terminatePublishers, publishScan, } from "./publish.js";
|
|
32
|
-
import { bundledPluginRoot, canonicalizeModelSafePath, codexSecurityCredentialHome, codexSecurityStateDirectory, expandHome, prepareCodexSecurityCredentialHome, pythonUtf8Environment, resolveCodexCommand, resolvePluginPython, runWorkbench, setCodexSecurityCredentialLogout, } from "./runtime.js";
|
|
33
|
-
import { matchScanFindingsInternal, } from "./scan-comparison.js";
|
|
32
|
+
import { bundledPluginRoot, canonicalizeModelSafePath, codexSecurityCredentialHome, codexSecurityStateDirectory, executablePathForSpawn, expandHome, prepareCodexSecurityCredentialHome, pythonUtf8Environment, resolveCodexCommand, resolvePluginPython, runWorkbench, setCodexSecurityCredentialLogout, } from "./runtime.js";
|
|
33
|
+
import { comparisonFindingGroups, matchScanFindingsInternal, unionFindingGroups, } from "./scan-comparison.js";
|
|
34
34
|
import { scanActivitiesFromEvent } from "./scan-activity.js";
|
|
35
35
|
import { CODEX_SECURITY_THREAD_SOURCES, } from "./thread-source.js";
|
|
36
36
|
import { readScanLogs } from "./scan-logs.js";
|
|
@@ -826,7 +826,7 @@ export async function runCodexSkillCommand(args, output, command = resolveCodexC
|
|
|
826
826
|
if (configuredHome?.trim()) {
|
|
827
827
|
environment["CODEX_HOME"] = resolve(expandHome(configuredHome, processEnvironment));
|
|
828
828
|
}
|
|
829
|
-
const invocation = spawn(command.command, [...args], {
|
|
829
|
+
const invocation = spawn(executablePathForSpawn(command.command), [...args], {
|
|
830
830
|
env: environment,
|
|
831
831
|
cwd: output?.appServer?.directory ?? parse(process.execPath).root,
|
|
832
832
|
stdio: output === undefined
|
|
@@ -2084,7 +2084,7 @@ export async function main(argv = process.argv.slice(2), output = process.stdout
|
|
|
2084
2084
|
.number()
|
|
2085
2085
|
.positive()
|
|
2086
2086
|
.optional()
|
|
2087
|
-
.describe("Stop
|
|
2087
|
+
.describe("Stop above AMOUNT in estimated USD; the dashboard offers increases near the limit."),
|
|
2088
2088
|
headless: z
|
|
2089
2089
|
.boolean()
|
|
2090
2090
|
.default(false)
|
|
@@ -2093,6 +2093,10 @@ export async function main(argv = process.argv.slice(2), output = process.stdout
|
|
|
2093
2093
|
.boolean()
|
|
2094
2094
|
.default(false)
|
|
2095
2095
|
.describe("Validate local scan inputs without starting a scan."),
|
|
2096
|
+
mock: z
|
|
2097
|
+
.boolean()
|
|
2098
|
+
.default(false)
|
|
2099
|
+
.describe("Save synthetic Standard scan findings without calling an LLM."),
|
|
2096
2100
|
})
|
|
2097
2101
|
.refine((options) => Number(options.path.length > 0) +
|
|
2098
2102
|
Number(options.diff !== undefined) +
|
|
@@ -2113,6 +2117,9 @@ export async function main(argv = process.argv.slice(2), output = process.stdout
|
|
|
2113
2117
|
})
|
|
2114
2118
|
.refine((options) => !options.patch || !options.dryRun, {
|
|
2115
2119
|
message: "--patch cannot be combined with --dry-run.",
|
|
2120
|
+
})
|
|
2121
|
+
.refine((options) => !options.mock || (!options.dryRun && !options.patch), {
|
|
2122
|
+
message: "--mock cannot be combined with --dry-run or --patch.",
|
|
2116
2123
|
})
|
|
2117
2124
|
.refine((options) => options.mode === "deep" ||
|
|
2118
2125
|
(options.workers === undefined &&
|
|
@@ -2181,6 +2188,7 @@ export async function main(argv = process.argv.slice(2), output = process.stdout
|
|
|
2181
2188
|
maxCostUsd: options.maxCost,
|
|
2182
2189
|
headless: options.headless,
|
|
2183
2190
|
dryRun: options.dryRun,
|
|
2191
|
+
mock: options.mock,
|
|
2184
2192
|
}, errorOutput, dependencies, format !== "json" && format !== "jsonl");
|
|
2185
2193
|
exitCode = outcome.exitCode;
|
|
2186
2194
|
if (outcome.error !== undefined) {
|
|
@@ -3128,6 +3136,11 @@ export async function main(argv = process.argv.slice(2), output = process.stdout
|
|
|
3128
3136
|
const credentialHome = dependencies.prepareAuthenticationHome !== undefined
|
|
3129
3137
|
? await dependencies.prepareAuthenticationHome(dependencies.environment)
|
|
3130
3138
|
: await prepareCodexSecurityCredentialHome(dependencies.environment);
|
|
3139
|
+
if (args.action === "status" && existsSync(credentialHome)) {
|
|
3140
|
+
const ambientHome = environmentValue(dependencies.environment, "CODEX_HOME") ??
|
|
3141
|
+
join(homedir(), ".codex");
|
|
3142
|
+
await initialCredentialsAvailable(dependencies.environment, ambientHome, credentialHome);
|
|
3143
|
+
}
|
|
3131
3144
|
const authenticationEnvironment = {
|
|
3132
3145
|
...dependencies.environment,
|
|
3133
3146
|
CODEX_HOME: credentialHome,
|
|
@@ -3150,7 +3163,7 @@ export async function main(argv = process.argv.slice(2), output = process.stdout
|
|
|
3150
3163
|
(exitCode === 0 || exitCode === 1)) {
|
|
3151
3164
|
exitCode = 0;
|
|
3152
3165
|
errorOutput.write(`Effective scan authentication: API key from ${authentication.source}.\n`);
|
|
3153
|
-
errorOutput.write(
|
|
3166
|
+
errorOutput.write(`To use a ChatGPT sign-in, ${formatEnvironmentVariableRemovalGuidance(["OPENAI_API_KEY", "CODEX_API_KEY"])}.\n`);
|
|
3154
3167
|
}
|
|
3155
3168
|
}
|
|
3156
3169
|
else if (exitCode === 0 && !options.withApiKey) {
|
|
@@ -3169,8 +3182,8 @@ export async function main(argv = process.argv.slice(2), output = process.stdout
|
|
|
3169
3182
|
? "your stored credentials"
|
|
3170
3183
|
: "your ChatGPT sign-in";
|
|
3171
3184
|
errorOutput.write(loginWarning +
|
|
3172
|
-
`To use ${storedCredentials}, pass '--auth chatgpt' or
|
|
3173
|
-
|
|
3185
|
+
`To use ${storedCredentials}, pass '--auth chatgpt' or ` +
|
|
3186
|
+
`${formatEnvironmentVariableRemovalGuidance(configuredApiKeyVariables)}.\n`);
|
|
3174
3187
|
}
|
|
3175
3188
|
}
|
|
3176
3189
|
},
|
|
@@ -3195,7 +3208,7 @@ export async function main(argv = process.argv.slice(2), output = process.stdout
|
|
|
3195
3208
|
},
|
|
3196
3209
|
})
|
|
3197
3210
|
.command("serve", {
|
|
3198
|
-
description: "Start the findings HTTP service (HOST=127.0.0.1, PORT=3000).",
|
|
3211
|
+
description: "Start the findings HTTP service (HOST=127.0.0.1, PORT=3000). CODEX_SECURITY_EMBEDDINGS_URL overrides the embeddings endpoint (default: https://api.openai.com/v1/embeddings).",
|
|
3199
3212
|
destructive: true,
|
|
3200
3213
|
mcp: false,
|
|
3201
3214
|
options: z.object({
|
|
@@ -3410,6 +3423,7 @@ function scanArgumentsFromRecipe(recipe, parentScanId, validationPromptFile) {
|
|
|
3410
3423
|
maxCostUsd,
|
|
3411
3424
|
dryRun: false,
|
|
3412
3425
|
parentScanId,
|
|
3426
|
+
...(recipe["mock"] === true ? { mock: true } : {}),
|
|
3413
3427
|
expectedPluginVersion: typeof recipe["pluginVersion"] === "string"
|
|
3414
3428
|
? recipe["pluginVersion"]
|
|
3415
3429
|
: undefined,
|
|
@@ -3549,11 +3563,23 @@ async function matchAllScans(dependencies, force) {
|
|
|
3549
3563
|
const { repository, scanCount, unavailableScans, skippedPairs, batches } = result;
|
|
3550
3564
|
let matchedPairs = 0;
|
|
3551
3565
|
let findingMatches = 0;
|
|
3552
|
-
|
|
3566
|
+
const newlyMatchedGroups = [];
|
|
3567
|
+
for (const { afterScanId, afterFindings, beforeScans, knownFindingGroups = [], } of batches) {
|
|
3553
3568
|
const before = beforeScans.flatMap(({ findings }) => findings);
|
|
3569
|
+
const knownGroups = unionFindingGroups([
|
|
3570
|
+
...knownFindingGroups,
|
|
3571
|
+
...newlyMatchedGroups,
|
|
3572
|
+
]);
|
|
3573
|
+
const input = {
|
|
3574
|
+
before,
|
|
3575
|
+
after: afterFindings,
|
|
3576
|
+
...(knownGroups.length === 0 ? {} : { knownFindingGroups: knownGroups }),
|
|
3577
|
+
};
|
|
3554
3578
|
const matching = before.length === 0 || afterFindings.length === 0
|
|
3555
3579
|
? { matches: [], uncertain: [] }
|
|
3556
|
-
: await dependencies.matchFindings(
|
|
3580
|
+
: await dependencies.matchFindings(input, {
|
|
3581
|
+
allowHistoricalUncertainty: true,
|
|
3582
|
+
});
|
|
3557
3583
|
const comparisons = beforeScans.map(({ scanId, findings }) => {
|
|
3558
3584
|
const beforeIds = new Set(findings.map(({ occurrenceId }) => occurrenceId));
|
|
3559
3585
|
const matches = matching.matches.flatMap((match) => {
|
|
@@ -3563,13 +3589,14 @@ async function matchAllScans(dependencies, force) {
|
|
|
3563
3589
|
: [{ ...match, beforeOccurrenceIds }];
|
|
3564
3590
|
});
|
|
3565
3591
|
const uncertain = matching.uncertain.filter(({ beforeOccurrenceId }) => beforeIds.has(beforeOccurrenceId));
|
|
3592
|
+
const related = matching.related?.filter(({ beforeOccurrenceId }) => beforeIds.has(beforeOccurrenceId));
|
|
3566
3593
|
const matchedAfter = new Set(matches.flatMap(({ afterOccurrenceIds }) => afterOccurrenceIds));
|
|
3567
3594
|
if (uncertain.some(({ afterOccurrenceId }) => matchedAfter.has(afterOccurrenceId))) {
|
|
3568
3595
|
throw new CodexSecurityError("Scan matching returned conflicting confirmed and uncertain findings.");
|
|
3569
3596
|
}
|
|
3570
|
-
return { scanId, matches, uncertain };
|
|
3597
|
+
return { scanId, matches, uncertain, related };
|
|
3571
3598
|
});
|
|
3572
|
-
for (const { scanId, matches, uncertain } of comparisons) {
|
|
3599
|
+
for (const { scanId, matches, uncertain, related } of comparisons) {
|
|
3573
3600
|
await dependencies.runWorkbench([
|
|
3574
3601
|
"save-scan-comparison",
|
|
3575
3602
|
"--before-scan-id",
|
|
@@ -3577,10 +3604,11 @@ async function matchAllScans(dependencies, force) {
|
|
|
3577
3604
|
"--after-scan-id",
|
|
3578
3605
|
afterScanId,
|
|
3579
3606
|
"--matches-json-stdin",
|
|
3580
|
-
], JSON.stringify({ matches, uncertain }));
|
|
3607
|
+
], JSON.stringify({ matches, uncertain, related }));
|
|
3581
3608
|
matchedPairs += 1;
|
|
3582
3609
|
findingMatches += matches.reduce((count, { beforeOccurrenceIds, afterOccurrenceIds }) => count + beforeOccurrenceIds.length * afterOccurrenceIds.length, 0);
|
|
3583
3610
|
}
|
|
3611
|
+
newlyMatchedGroups.push(...comparisonFindingGroups(input, matching));
|
|
3584
3612
|
}
|
|
3585
3613
|
return {
|
|
3586
3614
|
repository,
|
|
@@ -4597,6 +4625,7 @@ async function withTerminalErrorsHandled(errorOutput, operation) {
|
|
|
4597
4625
|
}
|
|
4598
4626
|
async function executeScan(arguments_, errorOutput, dependencies, interactive = true) {
|
|
4599
4627
|
let scanDir = null;
|
|
4628
|
+
const scanInput = dependencies.scanInput ?? process.stdin;
|
|
4600
4629
|
let requestedSignal = null;
|
|
4601
4630
|
let firstSignalAt = 0;
|
|
4602
4631
|
let progress = null;
|
|
@@ -4606,6 +4635,7 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
4606
4635
|
let workerCapacity = null;
|
|
4607
4636
|
let fileProgress = null;
|
|
4608
4637
|
let runningCost = null;
|
|
4638
|
+
let maxCostUsd = arguments_.maxCostUsd;
|
|
4609
4639
|
let phase = null;
|
|
4610
4640
|
const targetWarnings = [];
|
|
4611
4641
|
const configuredLogLevel = dependencies.environment["CODEX_SECURITY_LOG_LEVEL"]?.trim() ||
|
|
@@ -4705,7 +4735,7 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
4705
4735
|
({ model: effectiveModel, reasoningEffort: effectiveReasoningEffort } =
|
|
4706
4736
|
scanModelConfiguration(effectiveConfiguration));
|
|
4707
4737
|
const provider = scanModelProvider(effectiveConfiguration);
|
|
4708
|
-
const auth = !arguments_.dryRun && interactive
|
|
4738
|
+
const auth = !arguments_.dryRun && !arguments_.mock && interactive
|
|
4709
4739
|
? await chooseInteractiveAuthentication({
|
|
4710
4740
|
auth: arguments_.auth,
|
|
4711
4741
|
provider,
|
|
@@ -4719,7 +4749,9 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
4719
4749
|
providerConfiguration: effectiveConfiguration["model_providers"]?.[provider],
|
|
4720
4750
|
};
|
|
4721
4751
|
}
|
|
4722
|
-
selectedAuthentication =
|
|
4752
|
+
selectedAuthentication = arguments_.mock
|
|
4753
|
+
? null
|
|
4754
|
+
: scanAuthentication(dependencies.environment, auth, provider);
|
|
4723
4755
|
diagnostic("scan.configuration", {
|
|
4724
4756
|
cli_version: VERSION,
|
|
4725
4757
|
bundled_plugin_version: BUNDLED_PLUGIN_VERSION,
|
|
@@ -4736,6 +4768,7 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
4736
4768
|
: "repository",
|
|
4737
4769
|
requested_auth: auth ?? "auto",
|
|
4738
4770
|
dry_run: arguments_.dryRun,
|
|
4771
|
+
mock: arguments_.mock,
|
|
4739
4772
|
profile: typeof selectedProfileName === "string"
|
|
4740
4773
|
? selectedProfileName
|
|
4741
4774
|
: undefined,
|
|
@@ -4757,7 +4790,7 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
4757
4790
|
clock: dependencies,
|
|
4758
4791
|
color: dependencies.environment["NO_COLOR"] === undefined,
|
|
4759
4792
|
sanitize: safeErrorMessage,
|
|
4760
|
-
input:
|
|
4793
|
+
input: scanInput,
|
|
4761
4794
|
onInterrupt,
|
|
4762
4795
|
});
|
|
4763
4796
|
}
|
|
@@ -4801,7 +4834,11 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
4801
4834
|
}
|
|
4802
4835
|
}
|
|
4803
4836
|
security = dependencies.createSecurity(config);
|
|
4837
|
+
if (arguments_.mock) {
|
|
4838
|
+
errorOutput.write("codex-security: Mock scan: generating synthetic findings; no security analysis or LLM calls.\n");
|
|
4839
|
+
}
|
|
4804
4840
|
const options = {
|
|
4841
|
+
...(arguments_.mock ? { mock: true } : {}),
|
|
4805
4842
|
...(arguments_.workflowId === undefined
|
|
4806
4843
|
? {}
|
|
4807
4844
|
: { workflowId: arguments_.workflowId }),
|
|
@@ -4822,7 +4859,11 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
4822
4859
|
expectedPluginVersion: arguments_.expectedPluginVersion,
|
|
4823
4860
|
failureSeverity: arguments_.failOnSeverity,
|
|
4824
4861
|
maxCostUsd: arguments_.maxCostUsd,
|
|
4825
|
-
onCost: (cost) => {
|
|
4862
|
+
onCost: (cost, limit = maxCostUsd) => {
|
|
4863
|
+
if (limit !== maxCostUsd && limit !== undefined) {
|
|
4864
|
+
dashboard?.note(`Total cost limit increased to ${formatUsd(limit)}.`);
|
|
4865
|
+
}
|
|
4866
|
+
maxCostUsd = limit;
|
|
4826
4867
|
diagnostic("cost.updated", {
|
|
4827
4868
|
model: cost.model,
|
|
4828
4869
|
estimated_usd: cost.estimatedUsd,
|
|
@@ -4830,15 +4871,15 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
4830
4871
|
cached_input_tokens: cost.cachedInputTokens,
|
|
4831
4872
|
cache_write_input_tokens: cost.cacheWriteInputTokens,
|
|
4832
4873
|
output_tokens: cost.outputTokens,
|
|
4833
|
-
max_cost_usd:
|
|
4874
|
+
max_cost_usd: maxCostUsd,
|
|
4834
4875
|
});
|
|
4835
4876
|
runningCost = cost;
|
|
4836
4877
|
if (dashboard !== null) {
|
|
4837
|
-
dashboard.setCost(cost);
|
|
4878
|
+
dashboard.setCost(cost, maxCostUsd);
|
|
4838
4879
|
return;
|
|
4839
4880
|
}
|
|
4840
4881
|
progress?.stopTimer();
|
|
4841
|
-
if (
|
|
4882
|
+
if (maxCostUsd === undefined) {
|
|
4842
4883
|
const tokens = formatTokenUsage({
|
|
4843
4884
|
input_tokens: cost.inputTokens,
|
|
4844
4885
|
cached_input_tokens: cost.cachedInputTokens,
|
|
@@ -4847,13 +4888,15 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
4847
4888
|
progress?.stage(`${tokens === null ? "" : `Tokens: ${tokens}. `}Estimated cost: ${formatUsd(cost.estimatedUsd)} USD.`);
|
|
4848
4889
|
}
|
|
4849
4890
|
else {
|
|
4850
|
-
progress?.stage(`Estimated cost: ${formatUsd(cost.estimatedUsd)} of ${formatUsd(
|
|
4891
|
+
progress?.stage(`Estimated cost: ${formatUsd(cost.estimatedUsd)} of ${formatUsd(maxCostUsd)} limit`);
|
|
4851
4892
|
}
|
|
4852
|
-
if (
|
|
4853
|
-
cost.estimatedUsd <= arguments_.maxCostUsd) {
|
|
4893
|
+
if (maxCostUsd === undefined || cost.estimatedUsd <= maxCostUsd) {
|
|
4854
4894
|
progress?.startTimer(runningMessage());
|
|
4855
4895
|
}
|
|
4856
4896
|
},
|
|
4897
|
+
onBudgetApproaching: scanInput.isTTY === true
|
|
4898
|
+
? dashboard?.requestBudgetIncrease.bind(dashboard)
|
|
4899
|
+
: undefined,
|
|
4857
4900
|
onOutputArchived: (archiveDir) => {
|
|
4858
4901
|
diagnostic("scan.output_archived", { archive_dir: archiveDir });
|
|
4859
4902
|
if (dashboard !== null) {
|
|
@@ -4873,9 +4916,7 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
4873
4916
|
diagnostic("authentication.selected", {
|
|
4874
4917
|
requested: auth ?? "auto",
|
|
4875
4918
|
method: authentication.method,
|
|
4876
|
-
source: authentication.
|
|
4877
|
-
? authentication.source
|
|
4878
|
-
: undefined,
|
|
4919
|
+
source: "source" in authentication ? authentication.source : undefined,
|
|
4879
4920
|
verified: authentication.verified,
|
|
4880
4921
|
});
|
|
4881
4922
|
if (dashboard !== null) {
|
|
@@ -4883,7 +4924,9 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
4883
4924
|
? `Using API key from ${authentication.source}`
|
|
4884
4925
|
: authentication.method === "aws_credentials"
|
|
4885
4926
|
? `Using AWS credentials from ${authentication.source}`
|
|
4886
|
-
:
|
|
4927
|
+
: authentication.method === "command"
|
|
4928
|
+
? "Using native Codex command authentication"
|
|
4929
|
+
: "Using stored Codex credentials");
|
|
4887
4930
|
return;
|
|
4888
4931
|
}
|
|
4889
4932
|
progress?.stopTimer();
|
|
@@ -4894,6 +4937,9 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
4894
4937
|
else if (authentication.method === "aws_credentials") {
|
|
4895
4938
|
progress?.stage(`Authentication: AWS credentials from ${authentication.source}.`);
|
|
4896
4939
|
}
|
|
4940
|
+
else if (authentication.method === "command") {
|
|
4941
|
+
progress?.stage("Authentication: native Codex command.");
|
|
4942
|
+
}
|
|
4897
4943
|
else {
|
|
4898
4944
|
progress?.stage("Authentication: stored Codex credentials.");
|
|
4899
4945
|
}
|
|
@@ -4947,7 +4993,7 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
4947
4993
|
dashboard.setStage("inspecting repository files");
|
|
4948
4994
|
}
|
|
4949
4995
|
},
|
|
4950
|
-
onSessionEvent:
|
|
4996
|
+
onSessionEvent: scanInput.isTTY === true
|
|
4951
4997
|
? dashboard?.recordDetails.bind(dashboard)
|
|
4952
4998
|
: undefined,
|
|
4953
4999
|
onProgress: (update) => {
|
|
@@ -5110,7 +5156,7 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
5110
5156
|
model: effectivePreflight.model,
|
|
5111
5157
|
reasoning_effort: effectivePreflight.reasoningEffort,
|
|
5112
5158
|
method: effectivePreflight.authentication.method,
|
|
5113
|
-
source: effectivePreflight.authentication
|
|
5159
|
+
source: "source" in effectivePreflight.authentication
|
|
5114
5160
|
? effectivePreflight.authentication.source
|
|
5115
5161
|
: undefined,
|
|
5116
5162
|
verified: effectivePreflight.authentication.verified,
|
|
@@ -5135,7 +5181,7 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
5135
5181
|
const incomplete = result.coverage.completeness !== "complete";
|
|
5136
5182
|
let deepScanStop;
|
|
5137
5183
|
if (arguments_.mode === "deep") {
|
|
5138
|
-
deepScanStop = (await readDeepScanStop(result,
|
|
5184
|
+
deepScanStop = (await readDeepScanStop(result, maxCostUsd, dependencies.runWorkbench).catch(() => undefined)) ?? {
|
|
5139
5185
|
reason: "Stop reason unavailable. See the report for details.",
|
|
5140
5186
|
};
|
|
5141
5187
|
}
|
|
@@ -5168,7 +5214,8 @@ async function executeScan(arguments_, errorOutput, dependencies, interactive =
|
|
|
5168
5214
|
? arguments_.patchSeverity ?? "low"
|
|
5169
5215
|
: undefined;
|
|
5170
5216
|
let patchSelection = null;
|
|
5171
|
-
if (
|
|
5217
|
+
if (!arguments_.mock &&
|
|
5218
|
+
actionableFindings.length > 0 &&
|
|
5172
5219
|
arguments_.patchSeverity === undefined &&
|
|
5173
5220
|
progress?.interactive === true &&
|
|
5174
5221
|
(dependencies.patchEditor !== undefined || process.stdin.isTTY === true)) {
|
|
@@ -5302,6 +5349,9 @@ function scanFailureMessage(error, authentication) {
|
|
|
5302
5349
|
}
|
|
5303
5350
|
switch (classifyConnectionFailure(error)) {
|
|
5304
5351
|
case "unauthorized":
|
|
5352
|
+
if (authentication?.method === "command") {
|
|
5353
|
+
return "Native Codex command authentication failed. Check the configured provider auth command.";
|
|
5354
|
+
}
|
|
5305
5355
|
if (authentication?.method === "aws_credentials") {
|
|
5306
5356
|
return (`Authentication failed using AWS credentials from ${authentication.source}. ` +
|
|
5307
5357
|
"Check your Amazon Bedrock bearer token or AWS credential chain.");
|
|
@@ -5312,6 +5362,9 @@ function scanFailureMessage(error, authentication) {
|
|
|
5312
5362
|
: "Authentication failed using stored ChatGPT credentials. " +
|
|
5313
5363
|
"Sign in again with 'codex-security login' or provide a valid API key.";
|
|
5314
5364
|
case "forbidden":
|
|
5365
|
+
if (authentication?.method === "command") {
|
|
5366
|
+
return "The configured Codex provider denied access. Check the command credentials and provider permissions.";
|
|
5367
|
+
}
|
|
5315
5368
|
if (authentication?.method === "aws_credentials") {
|
|
5316
5369
|
return (`The AWS credentials from ${authentication.source} cannot access the configured Amazon Bedrock model. ` +
|
|
5317
5370
|
"Check your AWS identity and Bedrock model permissions.");
|