codex-multi-auth 2.17.2 → 2.17.3

package/dist/lib/synthetic-response.d.ts

@@ -28,4 +28,3 @@ export interface SyntheticSseResponseOptions {
  * notice the plugin itself generated.
  */
 export declare function createSyntheticSseResponse(options: SyntheticSseResponseOptions): Response;
-//# sourceMappingURL=synthetic-response.d.ts.map

package/dist/lib/table-formatter.d.ts

@@ -29,4 +29,3 @@ export declare function buildTableRow(values: string[], options: TableOptions):
  * Build a complete table with header, separator, and rows.
  */
 export declare function buildTable(rows: string[][], options: TableOptions): string[];
-//# sourceMappingURL=table-formatter.d.ts.map

package/dist/lib/temp-path.d.ts

@@ -23,4 +23,3 @@ export declare function tempFileNonce(): string;
  * lib/oc-chatgpt-target-detection.ts) continue to skip/collect staged files.
  */
 export declare function tempPathFor(targetPath: string): string;
-//# sourceMappingURL=temp-path.d.ts.map

package/dist/lib/tools/hashline-tools.d.ts

@@ -48,4 +48,3 @@ export declare function applyHashlineEdit(content: string, args: HashlineEditArg
 export declare function createHashlineReadTool(): ToolDefinition;
 export declare function createHashlineEditTool(): ToolDefinition;
 export {};
-//# sourceMappingURL=hashline-tools.d.ts.map

package/dist/lib/types.d.ts

@@ -225,4 +225,3 @@ export type { Auth, Provider, Model };
 export type OAuthAuthDetails = Extract<Auth, {
     type: "oauth";
 }>;
-//# sourceMappingURL=types.d.ts.map

package/dist/lib/ui/ansi.d.ts

@@ -37,4 +37,3 @@ export type KeyAction = "up" | "down" | "home" | "end" | "enter" | "escape" | "e
  */
 export declare function parseKey(data: Buffer): KeyAction;
 export declare function isTTY(): boolean;
-//# sourceMappingURL=ansi.d.ts.map

package/dist/lib/ui/auth-menu-builder.d.ts

@@ -98,4 +98,3 @@ export declare function currentMarkerLabel(marker: AccountCurrentMarker): string
 export declare function resolveQuotaWindowLabel(windowMinutes: number | undefined, fallbackLabel: string): string;
 export declare function formatAccountHint(account: AccountInfo, ui: ReturnType<typeof getUiRuntimeOptions>): string;
 export declare function authMenuFocusKey(action: AuthMenuAction): string;
-//# sourceMappingURL=auth-menu-builder.d.ts.map

package/dist/lib/ui/auth-menu.d.ts

@@ -4,4 +4,3 @@ export type { AccountAction, AccountInfo, AccountStatus, AuthMenuAction, AuthMen
 export declare function showAuthMenu(accounts: AccountInfo[], options?: AuthMenuOptions): Promise<AuthMenuAction>;
 export declare function showAccountDetails(account: AccountInfo): Promise<AccountAction>;
 export { isTTY };
-//# sourceMappingURL=auth-menu.d.ts.map

package/dist/lib/ui/check-progress.d.ts

@@ -5,4 +5,3 @@ type ProgressOutput = {
 /** Indeterminate progress: elapsed time is real; no guessed completion percentage. */
 export declare function withCheckProgress<T>(label: string | (() => string), operation: () => Promise<T>, log?: (message: string) => void, output?: ProgressOutput): Promise<T>;
 export {};
-//# sourceMappingURL=check-progress.d.ts.map

package/dist/lib/ui/confirm.d.ts

@@ -8,4 +8,3 @@
  * @returns `true` if the user selects "Yes", `false` otherwise
  */
 export declare function confirm(message: string, defaultYes?: boolean): Promise<boolean>;
-//# sourceMappingURL=confirm.d.ts.map

package/dist/lib/ui/display-width.d.ts

@@ -24,4 +24,3 @@ export declare function truncateToWidth(text: string, maxWidth: number): {
     text: string;
     width: number;
 };
-//# sourceMappingURL=display-width.d.ts.map

package/dist/lib/ui/format.d.ts

@@ -61,4 +61,3 @@ export declare function formatUiBadge(ui: UiRuntimeOptions, label: string, tone?
 export declare function quotaToneFromLeftPercent(leftPercent: number): Extract<UiTextTone, "success" | "warning" | "danger">;
 /** Style human-readable reports; JSON callers must bypass this presentation helper. */
 export declare function styleReportText(text: string, tone?: UiTextTone): string;
-//# sourceMappingURL=format.d.ts.map

package/dist/lib/ui/index.d.ts

@@ -7,4 +7,3 @@ export { getUiRuntimeOptions, resetUiRuntimeOptions, setUiRuntimeOptions, type U
 export { select, type MenuItem, type SelectOptions } from "./select.js";
 export { createUiTheme, shouldDisableColor, type UiAccent, type UiColorProfile, type UiGlyphMode, type UiPalette, type UiTheme, } from "./theme.js";
 export { UI_COPY, formatCheckFlaggedLabel } from "./ui-copy.js";
-//# sourceMappingURL=index.d.ts.map

package/dist/lib/ui/runtime.d.ts

@@ -40,4 +40,3 @@ export declare function getUiRuntimeOptions(): UiRuntimeOptions;
  * @returns The new runtime options object set to the defaults
  */
 export declare function resetUiRuntimeOptions(): UiRuntimeOptions;
-//# sourceMappingURL=runtime.d.ts.map

package/dist/lib/ui/select.d.ts

@@ -80,4 +80,3 @@ export declare function truncateAnsi(input: string, maxVisibleChars: number): st
  * @throws If not running on a TTY, if `items` is empty, or if all menu items are non-selectable.
  */
 export declare function select<T>(items: MenuItem<T>[], options: SelectOptions<T>): Promise<T | null>;
-//# sourceMappingURL=select.d.ts.map

package/dist/lib/ui/theme.d.ts

@@ -67,4 +67,3 @@ export declare function createUiTheme(options?: {
     disableColor?: boolean;
 }): UiTheme;
 export {};
-//# sourceMappingURL=theme.d.ts.map

package/dist/lib/ui/ui-copy.d.ts

@@ -157,4 +157,3 @@ export declare const UI_COPY: {
  * @returns The resulting label string: the base label when `flaggedCount` is 0 or less, otherwise the base label followed by ` (count)`.
  */
 export declare function formatCheckFlaggedLabel(flaggedCount: number): string;
-//# sourceMappingURL=ui-copy.d.ts.map

package/dist/lib/unified-settings.d.ts

@@ -34,10 +34,12 @@ export declare function saveUnifiedPluginConfigSync(pluginConfig: JsonRecord): v
 /**
  * Persist the provided plugin configuration to the unified settings file, replacing the `pluginConfig` section.
  *
- * Writes a shallow clone of `pluginConfig` into the on-disk settings payload. In-process calls are serialized
- * through an async queue to reduce lost-update races, but there is still no cross-process locking. On Windows,
- * filesystem atomicity and visibility semantics are platform-dependent; do not assume atomic merges across processes.
- * The settings file is written as plain JSON; redact or remove any sensitive tokens or secrets before calling.
+ * Writes a shallow clone of `pluginConfig` into the on-disk settings payload. Calls are serialized
+ * through a per-path async queue and a cross-process lock directory (lib/storage/json-store-lock.ts);
+ * each attempt re-reads the freshest on-disk record and re-applies the section under mtime CAS, so a
+ * concurrent process's write is merged rather than clobbered. On Windows, filesystem atomicity and
+ * visibility semantics are platform-dependent. The settings file is written as plain JSON; redact or
+ * remove any sensitive tokens or secrets before calling.
  *
  * @param pluginConfig - The plugin configuration object to store (will be shallow-cloned)
  */
@@ -57,15 +59,15 @@ export declare function loadUnifiedDashboardSettings(): Promise<JsonRecord | nul
  *
  * Writes `dashboardDisplaySettings` into the shared settings.json (overwriting
  * any existing dashboardDisplaySettings section) and ensures the payload is
- * normalized with the file version. In-process async callers are serialized
- * through an internal queue (last writer still wins), but no cross-process lock
- * is provided. On Windows, path and directory creation follow Node's filesystem
- * semantics (case-insensitive paths, ACLs apply). Sensitive tokens or secrets
- * included in `dashboardDisplaySettings` are written verbatim — callers must
- * redact or omit secrets before calling.
+ * normalized with the file version. Async callers are serialized through a
+ * per-path queue plus the cross-process lock directory
+ * (lib/storage/json-store-lock.ts), with mtime CAS reload-and-retry inside the
+ * lock (last writer still wins per section). On Windows, path and directory
+ * creation follow Node's filesystem semantics (case-insensitive paths, ACLs
+ * apply). Sensitive tokens or secrets included in `dashboardDisplaySettings`
+ * are written verbatim — callers must redact or omit secrets before calling.
  *
  * @param dashboardDisplaySettings - A plain JSON record describing dashboard display preferences; the object is shallow-copied before persisting.
  */
 export declare function saveUnifiedDashboardSettings(dashboardDisplaySettings: JsonRecord): Promise<void>;
 export {};
-//# sourceMappingURL=unified-settings.d.ts.map

package/dist/lib/unified-settings.js

@@ -3,12 +3,12 @@ import { join } from "node:path";
 import { getCodexMultiAuthDir } from "./runtime-paths.js";
 import { sleep } from "./utils.js";
 import { tempPathFor } from "./temp-path.js";
+import { withJsonStoreFileLock, withJsonStoreWriteQueue, } from "./storage/json-store-lock.js";
 export const UNIFIED_SETTINGS_VERSION = 1;
 const UNIFIED_SETTINGS_PATH = join(getCodexMultiAuthDir(), "settings.json");
 const UNIFIED_SETTINGS_BACKUP_PATH = `${UNIFIED_SETTINGS_PATH}.bak`;
 const RETRYABLE_FS_CODES = new Set(["EBUSY", "EPERM"]);
 const TRANSIENT_READ_FS_CODES = new Set(["EBUSY", "EAGAIN"]);
-let settingsWriteQueue = Promise.resolve();
 function isRetryableFsError(error) {
     const code = error?.code;
     return typeof code === "string" && RETRYABLE_FS_CODES.has(code);
@@ -403,10 +403,15 @@ async function getUnifiedSettingsMtimeMs() {
         throw error;
     }
 }
+/**
+ * Serialize async settings writes: the per-path promise queue orders writers
+ * inside THIS process, and the cross-process lock directory
+ * (lib/storage/json-store-lock.ts) closes the same read→merge→rename window
+ * against OTHER processes. The task keeps its mtime CAS retry as the
+ * second-line guard for writers that do not take the lockfile.
+ */
 async function enqueueSettingsWrite(task) {
-    const run = settingsWriteQueue.catch(() => { }).then(task);
-    settingsWriteQueue = run.then(() => undefined, () => undefined);
-    return run;
+    return withJsonStoreWriteQueue(UNIFIED_SETTINGS_PATH, () => withJsonStoreFileLock(UNIFIED_SETTINGS_PATH, task));
 }
 /**
  * Get the absolute filesystem path to the unified settings JSON file used for multi-auth plugins.
@@ -461,10 +466,12 @@ export function saveUnifiedPluginConfigSync(pluginConfig) {
 /**
  * Persist the provided plugin configuration to the unified settings file, replacing the `pluginConfig` section.
  *
- * Writes a shallow clone of `pluginConfig` into the on-disk settings payload. In-process calls are serialized
- * through an async queue to reduce lost-update races, but there is still no cross-process locking. On Windows,
- * filesystem atomicity and visibility semantics are platform-dependent; do not assume atomic merges across processes.
- * The settings file is written as plain JSON; redact or remove any sensitive tokens or secrets before calling.
+ * Writes a shallow clone of `pluginConfig` into the on-disk settings payload. Calls are serialized
+ * through a per-path async queue and a cross-process lock directory (lib/storage/json-store-lock.ts);
+ * each attempt re-reads the freshest on-disk record and re-applies the section under mtime CAS, so a
+ * concurrent process's write is merged rather than clobbered. On Windows, filesystem atomicity and
+ * visibility semantics are platform-dependent. The settings file is written as plain JSON; redact or
+ * remove any sensitive tokens or secrets before calling.
  *
  * @param pluginConfig - The plugin configuration object to store (will be shallow-cloned)
  */
@@ -517,12 +524,13 @@ export async function loadUnifiedDashboardSettings() {
  *
  * Writes `dashboardDisplaySettings` into the shared settings.json (overwriting
  * any existing dashboardDisplaySettings section) and ensures the payload is
- * normalized with the file version. In-process async callers are serialized
- * through an internal queue (last writer still wins), but no cross-process lock
- * is provided. On Windows, path and directory creation follow Node's filesystem
- * semantics (case-insensitive paths, ACLs apply). Sensitive tokens or secrets
- * included in `dashboardDisplaySettings` are written verbatim — callers must
- * redact or omit secrets before calling.
+ * normalized with the file version. Async callers are serialized through a
+ * per-path queue plus the cross-process lock directory
+ * (lib/storage/json-store-lock.ts), with mtime CAS reload-and-retry inside the
+ * lock (last writer still wins per section). On Windows, path and directory
+ * creation follow Node's filesystem semantics (case-insensitive paths, ACLs
+ * apply). Sensitive tokens or secrets included in `dashboardDisplaySettings`
+ * are written verbatim — callers must redact or omit secrets before calling.
  *
  * @param dashboardDisplaySettings - A plain JSON record describing dashboard display preferences; the object is shallow-copied before persisting.
  */

package/dist/lib/update-notice.d.ts

@@ -9,4 +9,3 @@ export declare function formatManualUpdateNotice(result: UpdateCheckResult): str
 export declare function checkForUpdates(force?: boolean, fetchTimeoutMs?: number): Promise<UpdateCheckResult>;
 export declare function checkAndNotify(showToast?: (message: string, variant: "info" | "warning") => Promise<void>): Promise<void>;
 export declare function clearUpdateCache(): void;
-//# sourceMappingURL=update-notice.d.ts.map

package/dist/lib/usage/index.d.ts

@@ -4,4 +4,3 @@ export * from "./redaction.js";
 export * from "./ledger.js";
 export * from "./usage-extraction.js";
 export * from "./stream-usage-deferral.js";
-//# sourceMappingURL=index.d.ts.map

package/dist/lib/usage/ledger.d.ts

@@ -9,4 +9,3 @@ export declare function rotateUsageLedger(options?: {
     ifLargerThanBytes?: number;
 }): Promise<string | null>;
 export declare function resetUsageLedgerQueueForTests(): void;
-//# sourceMappingURL=ledger.d.ts.map

package/dist/lib/usage/pricing.d.ts

@@ -55,4 +55,3 @@ export declare const UNPRICED_ROUTABLE_MODELS: readonly ["gpt-6-astra-aeon", "gp
 export declare function getUsageModelPricing(model: string | null | undefined): UsageModelPricing | null;
 export declare function estimateUsageCostUsd(model: string | null | undefined, tokens: UsageTokenCounts): number | null;
 export declare function listUsageModelPricing(): Record<string, UsageModelPricing>;
-//# sourceMappingURL=pricing.d.ts.map

package/dist/lib/usage/redaction.d.ts

@@ -7,4 +7,3 @@ export declare function createUsageAccountRef(input: {
 }): UsageLedgerAccountRef | null;
 export declare function normalizeUsageLedgerRow(input: UsageLedgerAppendInput): UsageLedgerRow;
 export declare function usageRowToJsonLine(row: UsageLedgerRow): string;
-//# sourceMappingURL=redaction.d.ts.map

package/dist/lib/usage/stream-usage-deferral.d.ts

@@ -36,4 +36,3 @@ export declare function createStreamUsageDeferral<TRow extends object>(options:
         cancel: () => void;
     };
 }): StreamUsageDeferral<TRow>;
-//# sourceMappingURL=stream-usage-deferral.d.ts.map

package/dist/lib/usage/types.d.ts

@@ -125,4 +125,3 @@ export interface UsageLedgerPaths {
     dir: string;
     current: string;
 }
-//# sourceMappingURL=types.d.ts.map

package/dist/lib/usage/usage-extraction.d.ts

@@ -42,4 +42,3 @@ export declare function createUsageStreamScanner(options: {
     /** Observe parsed upstream events without reparsing the stream. */
     onEvent?: (event: unknown) => void;
 }): UsageStreamScanner;
-//# sourceMappingURL=usage-extraction.d.ts.map

package/dist/lib/utils.d.ts

@@ -14,6 +14,27 @@ export declare function isRecord(value: unknown): value is Record<string, unknow
  * @returns True when the error should be treated as an abort signal
  */
 export declare function isAbortError(error: unknown): boolean;
+/**
+ * Combines two abort signals into one that aborts when the FIRST input does.
+ *
+ * This is a thin null-tolerant wrapper over `AbortSignal.any` — available
+ * since Node 18.17.0, which the engines floor already requires. Using the
+ * native composite matters beyond brevity: a manual addEventListener pair
+ * stays registered on BOTH inputs until one fires, so a caller that combines
+ * a long-lived signal (e.g. a proxy-lifetime abort) once per request would
+ * pin one listener + controller closure per completed request. The native
+ * composite is tracked as a weak dependency of the sources, so it detaches
+ * from a long-lived caller signal as soon as the request drops it.
+ *
+ * The forwarded signal aborts with the firing signal's `reason` (matching
+ * `AbortSignal.any` semantics, including timeout reasons from
+ * `AbortSignal.timeout`).
+ *
+ * Undefined/null inputs are treated as "no constraint": one real signal is
+ * returned as-is, and two absent inputs yield a never-aborting signal. An
+ * already-aborted input is returned directly so its reason survives.
+ */
+export declare function combineSignals(first: AbortSignal | null | undefined, second: AbortSignal | null | undefined): AbortSignal;
 /**
  * Returns the current timestamp in milliseconds.
  * Wrapper for Date.now() to enable testing with mocked time.
@@ -32,4 +53,3 @@ export declare function toStringValue(value: unknown): string;
  * @returns Promise that resolves after the specified time
  */
 export declare function sleep(ms: number): Promise<void>;
-//# sourceMappingURL=utils.d.ts.map

package/dist/lib/utils.js

@@ -21,6 +21,37 @@ export function isAbortError(error) {
     const maybe = error;
     return maybe.name === "AbortError" || maybe.code === "ABORT_ERR";
 }
+/**
+ * Combines two abort signals into one that aborts when the FIRST input does.
+ *
+ * This is a thin null-tolerant wrapper over `AbortSignal.any` — available
+ * since Node 18.17.0, which the engines floor already requires. Using the
+ * native composite matters beyond brevity: a manual addEventListener pair
+ * stays registered on BOTH inputs until one fires, so a caller that combines
+ * a long-lived signal (e.g. a proxy-lifetime abort) once per request would
+ * pin one listener + controller closure per completed request. The native
+ * composite is tracked as a weak dependency of the sources, so it detaches
+ * from a long-lived caller signal as soon as the request drops it.
+ *
+ * The forwarded signal aborts with the firing signal's `reason` (matching
+ * `AbortSignal.any` semantics, including timeout reasons from
+ * `AbortSignal.timeout`).
+ *
+ * Undefined/null inputs are treated as "no constraint": one real signal is
+ * returned as-is, and two absent inputs yield a never-aborting signal. An
+ * already-aborted input is returned directly so its reason survives.
+ */
+export function combineSignals(first, second) {
+    if (first?.aborted)
+        return first;
+    if (second?.aborted)
+        return second;
+    if (!first)
+        return second ?? new AbortController().signal;
+    if (!second)
+        return first;
+    return AbortSignal.any([first, second]);
+}
 /**
  * Returns the current timestamp in milliseconds.
  * Wrapper for Date.now() to enable testing with mocked time.

package/dist/lib/wsl.d.ts

@@ -25,4 +25,3 @@ export declare function getWslDistroName(): string | undefined;
  * @internal Test seam — production code must not call this.
  */
 export declare function resetWslDetectionCacheForTests(): void;
-//# sourceMappingURL=wsl.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "codex-multi-auth",
-	"version": "2.17.2",
+	"version": "2.17.3",
 	"description": "Codex CLI multi-account OAuth manager with account switching, health checks, runtime rotation, diagnostics, and recovery tools for @openai/codex",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -81,7 +81,7 @@
 		"build": "tsc && node scripts/copy-oauth-success.js",
 		"generate:schema": "npm run build && node scripts/generate-config-schema.mjs",
 		"typecheck": "tsc --noEmit",
-		"typecheck:scripts": "npm run build && tsc -p tsconfig.scripts.json",
+		"typecheck:scripts": "tsc -p tsconfig.scripts.json",
 		"lint": "npm run lint:ts && npm run lint:scripts",
 		"lint:ts": "eslint . --ext .ts",
 		"lint:scripts": "eslint scripts --ext .js,.mjs",
@@ -125,6 +125,7 @@
 		"dist/",
 		"assets/",
 		"config/",
+		"skills/",
 		"scripts/codex.js",
 		"scripts/codex-app-launcher.js",
 		"scripts/codex-app-router.js",
@@ -183,7 +184,10 @@
 	"overrides": {
 		"hono": "4.13.9",
 		"flatted": "3.4.2",
-		"minimatch": "10.2.4",
+		"minimatch": {
+			".": "10.2.4",
+			"brace-expansion": "5.0.9"
+		},
 		"picomatch": "4.0.4",
 		"rollup": "4.59.0",
 		"vite": "^7.3.2",
@@ -191,9 +195,11 @@
 			"picomatch": "2.3.2"
 		},
 		"@typescript-eslint/typescript-estree": {
-			"minimatch": "9.0.9"
+			"minimatch": {
+				".": "9.0.9",
+				"brace-expansion": "2.1.7"
+			}
 		},
-		"brace-expansion": "5.0.9",
 		"postcss": "8.5.25",
 		"nanoid": "3.3.18"
 	}

package/scripts/codex-bin-resolver.js

@@ -90,6 +90,21 @@ function resolveWindowsCmdPath(env) {
 	return "cmd.exe";
 }
 
+// win32.isAbsolute("\bin\codex.exe") is true for a root-relative path with no
+// drive — it resolves against the CURRENT drive, so the existence check would
+// probe (and a forwarder would exec) whatever file lives at "<cwd's
+// drive>\bin\codex.exe". CWE-426: a binary override must be drive-qualified
+// (C:\...) or a UNC/device path (\\server\share\..., \\?\...), never a bare
+// "\" or "/" root. POSIX keeps plain absolute-path semantics.
+export function isFullyQualifiedBinOverride(candidatePath, platform) {
+	if (platform === "win32") {
+		if (!win32.isAbsolute(candidatePath)) return false;
+		const root = win32.parse(candidatePath).root;
+		return root !== "\\" && root !== "/";
+	}
+	return posix.isAbsolute(candidatePath);
+}
+
 export function splitPathEntries(pathValue, platform = process.platform) {
 	if (typeof pathValue !== "string" || pathValue.trim().length === 0) {
 		return [];
@@ -235,7 +250,11 @@ export function resolveRealCodexBin(options = {}) {
 
 	const override = (env.CODEX_MULTI_AUTH_REAL_CODEX_BIN ?? "").trim();
 	if (override.length > 0) {
-		if (!existsSyncImpl(override)) return null;
+		// The override is the binary every forwarded command execs, so require a
+		// fully-qualified absolute path: a relative one resolves against the
+		// caller's cwd, and on Windows a root-relative one resolves against the
+		// cwd's DRIVE — either could silently exec a planted file.
+		if (!isFullyQualifiedBinOverride(override, platform) || !existsSyncImpl(override)) return null;
 		if (platform === "win32" && isWindowsShimPath(override)) {
 			const entry = resolveWindowsShimPackageEntry(override, existsSyncImpl);
 			return entry ? createResolvedCodexBin(entry) : null;

package/scripts/codex-multi-auth.js

@@ -53,7 +53,13 @@ if (args.length === 1 && versionFlags.has(firstArg)) {
 		process.exitCode = 1;
 	}
 } else {
-	const { runCodexMultiAuthCli } = await import("../dist/lib/codex-manager.js");
+	// The specifier lives in a variable so `tsc -p tsconfig.scripts.json` can
+	// check this file without a prior `npm run build`: a literal
+	// "../dist/lib/codex-manager.js" specifier forces module resolution against
+	// dist/. The imported surface is guarded by Number.isInteger below, so the
+	// erased type information costs nothing here.
+	const managerModuleSpecifier = "../dist/lib/codex-manager.js";
+	const { runCodexMultiAuthCli } = await import(managerModuleSpecifier);
 	const exitCode = await runCodexMultiAuthCli(args);
 	process.exitCode = Number.isInteger(exitCode) ? exitCode : 1;
 }