codex-multi-auth 2.1.13-beta.1 → 2.2.0

package/scripts/install-codex-auth-utils.js

@@ -1,206 +1,206 @@
-// @ts-check
-
-import { rename as fsRename } from "node:fs/promises";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import process from "node:process";
-
-const PLUGIN_NAME = "codex-multi-auth";
-
-const TRUE_VALUES = new Set(["1", "true", "yes"]);
-const FALSE_VALUES = new Set(["0", "false", "no"]);
-const CI_ENV_KEYS = [
-	"CI",
-	"GITHUB_ACTIONS",
-	"GITLAB_CI",
-	"CIRCLECI",
-	"BUILDKITE",
-	"TF_BUILD",
-	"TEAMCITY_VERSION",
-	"JENKINS_URL",
-	"TRAVIS",
-	"APPVEYOR",
-	"BITBUCKET_BUILD_NUMBER",
-];
-
-/** @param {string | undefined} value */
-function readOptionalBooleanValue(value) {
-	if (value === undefined || value.trim().length === 0) return null;
-	const normalized = value.trim().toLowerCase();
-	if (TRUE_VALUES.has(normalized)) return true;
-	if (FALSE_VALUES.has(normalized)) return false;
-	return null;
-}
-
-/** @param {NodeJS.ProcessEnv} env @param {string} key */
-function isEnabledEnvFlag(env, key) {
-	const value = env[key];
-	if (value === undefined || value.trim().length === 0) return false;
-	return readOptionalBooleanValue(value) !== false;
-}
-
-/** @param {NodeJS.ProcessEnv} [env] */
-export function isCiEnvironment(env = process.env) {
-	if (readOptionalBooleanValue(env.npm_config_ignore_scripts) === true) return true;
-	return CI_ENV_KEYS.some((key) => isEnabledEnvFlag(env, key));
-}
-export const FILE_RETRY_CODES = new Set([
-	"EBUSY",
-	"EPERM",
-	"EAGAIN",
-	"ENOTEMPTY",
-	"EACCES",
-]);
-export const FILE_RETRY_MAX_ATTEMPTS = 6;
-export const FILE_RETRY_BASE_DELAY_MS = 25;
-export const FILE_RETRY_JITTER_MS = 20;
-
-/**
- * @param {NodeJS.Platform} [platform]
- * @param {NodeJS.ProcessEnv} [env]
- * @param {string} [home]
- */
-export function resolveInstallPaths(
-	platform = process.platform,
-	env = process.env,
-	home = homedir(),
-) {
-	const isWindows = platform === "win32";
-	const appData = (env.APPDATA ?? "").trim();
-	const localAppData = (env.LOCALAPPDATA ?? appData).trim();
-	const configBase = isWindows
-		? appData || join(home, "AppData", "Roaming")
-		: join(home, ".config");
-	const cacheBase = isWindows
-		? localAppData || join(home, "AppData", "Local")
-		: join(home, ".cache");
-	const configDir = join(configBase, "Codex");
-	const configPath = join(configDir, "Codex.json");
-	const cacheDir = join(cacheBase, "Codex");
-	return {
-		configDir,
-		configPath,
-		cacheDir,
-		cacheNodeModules: join(cacheDir, "node_modules", PLUGIN_NAME),
-		cacheBunLock: join(cacheDir, "bun.lock"),
-		cachePackageJson: join(cacheDir, "package.json"),
-	};
-}
-
-/** @param {unknown} list */
-export function removePluginFromList(list) {
-	const entries = Array.isArray(list) ? list.filter(Boolean) : [];
-	return entries.filter((entry) => {
-		if (typeof entry !== "string") return true;
-		return entry !== PLUGIN_NAME && !entry.startsWith(`${PLUGIN_NAME}@`);
-	});
-}
-
-/** @param {unknown} list */
-export function normalizePluginList(list) {
-	const entries = Array.isArray(list) ? list.filter(Boolean) : [];
-	const filtered = entries.filter((entry) => {
-		if (typeof entry !== "string") return true;
-		return entry !== PLUGIN_NAME && !entry.startsWith(`${PLUGIN_NAME}@`);
-	});
-	const deduped = [];
-	const seen = new Set();
-	for (const entry of filtered) {
-		const key =
-			typeof entry === "string" ? `s:${entry}` : `j:${JSON.stringify(entry)}`;
-		if (seen.has(key)) continue;
-		seen.add(key);
-		deduped.push(entry);
-	}
-	return [...deduped, PLUGIN_NAME];
-}
-
-/** @param {number} ms */
-function sleep(ms) {
-	// Keep this helper local so installer scripts remain standalone and do not depend on lib/.
-	return new Promise((resolve) => {
-		setTimeout(resolve, ms);
-	});
-}
-
-/** @param {unknown} error */
-function shouldRetryFileOperation(error) {
-	const fileError = /** @type {NodeJS.ErrnoException | undefined} */ (error);
-	return (
-		fileError instanceof Error &&
-		typeof fileError.code === "string" &&
-		FILE_RETRY_CODES.has(fileError.code)
-	);
-}
-
-/** @template T @param {() => Promise<T>} operation */
-export async function withFileOperationRetry(operation) {
-	for (let attempt = 1; ; attempt += 1) {
-		try {
-			return await operation();
-		} catch (error) {
-			if (
-				!shouldRetryFileOperation(error) ||
-				attempt >= FILE_RETRY_MAX_ATTEMPTS
-			) {
-				throw error;
-			}
-
-			const jitter = Math.floor(Math.random() * FILE_RETRY_JITTER_MS);
-			const delayMs = FILE_RETRY_BASE_DELAY_MS * 2 ** (attempt - 1) + jitter;
-			await sleep(delayMs);
-		}
-	}
-}
-
-/**
- * @param {string} sourcePath
- * @param {string} targetPath
- * @param {{
- *   rename?: (sourcePath: string, targetPath: string) => Promise<void>,
- *   log?: (message: string) => void,
- *   maxRetries?: number,
- *   baseDelayMs?: number,
- *   jitterMs?: number,
- *   random?: () => number,
- *   sleep?: (ms: number) => Promise<void>,
- * }} [options]
- */
-export async function renameWithRetry(sourcePath, targetPath, options = {}) {
-	const {
-		rename = fsRename,
-		log = () => {},
-		maxRetries = FILE_RETRY_MAX_ATTEMPTS,
-		baseDelayMs = FILE_RETRY_BASE_DELAY_MS,
-		jitterMs = FILE_RETRY_JITTER_MS,
-		random = Math.random,
-		sleep: sleepImpl = sleep,
-	} = options;
-
-	if (!Number.isInteger(maxRetries) || maxRetries < 1) {
-		throw new RangeError("maxRetries must be an integer >= 1");
-	}
-
-	for (let attempt = 0; attempt < maxRetries; attempt += 1) {
-		try {
-			await rename(sourcePath, targetPath);
-			return;
-		} catch (error) {
-			const code =
-				error && typeof error === "object" && "code" in error
-					? error.code
-					: undefined;
-			const isRetryable =
-				typeof code === "string" && FILE_RETRY_CODES.has(code);
-			if (!isRetryable || attempt === maxRetries - 1) {
-				throw error;
-			}
-			const delayMs =
-				baseDelayMs * 2 ** attempt + Math.floor(random() * jitterMs);
-			log(
-				`Retrying atomic rename (${attempt + 1}/${maxRetries}) code=${code ?? "unknown"} source=${sourcePath} target=${targetPath} delayMs=${delayMs}`,
-			);
-			await sleepImpl(delayMs);
-		}
-	}
-}
+// @ts-check
+
+import { rename as fsRename } from "node:fs/promises";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import process from "node:process";
+
+const PLUGIN_NAME = "codex-multi-auth";
+
+const TRUE_VALUES = new Set(["1", "true", "yes"]);
+const FALSE_VALUES = new Set(["0", "false", "no"]);
+const CI_ENV_KEYS = [
+	"CI",
+	"GITHUB_ACTIONS",
+	"GITLAB_CI",
+	"CIRCLECI",
+	"BUILDKITE",
+	"TF_BUILD",
+	"TEAMCITY_VERSION",
+	"JENKINS_URL",
+	"TRAVIS",
+	"APPVEYOR",
+	"BITBUCKET_BUILD_NUMBER",
+];
+
+/** @param {string | undefined} value */
+function readOptionalBooleanValue(value) {
+	if (value === undefined || value.trim().length === 0) return null;
+	const normalized = value.trim().toLowerCase();
+	if (TRUE_VALUES.has(normalized)) return true;
+	if (FALSE_VALUES.has(normalized)) return false;
+	return null;
+}
+
+/** @param {NodeJS.ProcessEnv} env @param {string} key */
+function isEnabledEnvFlag(env, key) {
+	const value = env[key];
+	if (value === undefined || value.trim().length === 0) return false;
+	return readOptionalBooleanValue(value) !== false;
+}
+
+/** @param {NodeJS.ProcessEnv} [env] */
+export function isCiEnvironment(env = process.env) {
+	if (readOptionalBooleanValue(env.npm_config_ignore_scripts) === true) return true;
+	return CI_ENV_KEYS.some((key) => isEnabledEnvFlag(env, key));
+}
+export const FILE_RETRY_CODES = new Set([
+	"EBUSY",
+	"EPERM",
+	"EAGAIN",
+	"ENOTEMPTY",
+	"EACCES",
+]);
+export const FILE_RETRY_MAX_ATTEMPTS = 6;
+export const FILE_RETRY_BASE_DELAY_MS = 25;
+export const FILE_RETRY_JITTER_MS = 20;
+
+/**
+ * @param {NodeJS.Platform} [platform]
+ * @param {NodeJS.ProcessEnv} [env]
+ * @param {string} [home]
+ */
+export function resolveInstallPaths(
+	platform = process.platform,
+	env = process.env,
+	home = homedir(),
+) {
+	const isWindows = platform === "win32";
+	const appData = (env.APPDATA ?? "").trim();
+	const localAppData = (env.LOCALAPPDATA ?? appData).trim();
+	const configBase = isWindows
+		? appData || join(home, "AppData", "Roaming")
+		: join(home, ".config");
+	const cacheBase = isWindows
+		? localAppData || join(home, "AppData", "Local")
+		: join(home, ".cache");
+	const configDir = join(configBase, "Codex");
+	const configPath = join(configDir, "Codex.json");
+	const cacheDir = join(cacheBase, "Codex");
+	return {
+		configDir,
+		configPath,
+		cacheDir,
+		cacheNodeModules: join(cacheDir, "node_modules", PLUGIN_NAME),
+		cacheBunLock: join(cacheDir, "bun.lock"),
+		cachePackageJson: join(cacheDir, "package.json"),
+	};
+}
+
+/** @param {unknown} list */
+export function removePluginFromList(list) {
+	const entries = Array.isArray(list) ? list.filter(Boolean) : [];
+	return entries.filter((entry) => {
+		if (typeof entry !== "string") return true;
+		return entry !== PLUGIN_NAME && !entry.startsWith(`${PLUGIN_NAME}@`);
+	});
+}
+
+/** @param {unknown} list */
+export function normalizePluginList(list) {
+	const entries = Array.isArray(list) ? list.filter(Boolean) : [];
+	const filtered = entries.filter((entry) => {
+		if (typeof entry !== "string") return true;
+		return entry !== PLUGIN_NAME && !entry.startsWith(`${PLUGIN_NAME}@`);
+	});
+	const deduped = [];
+	const seen = new Set();
+	for (const entry of filtered) {
+		const key =
+			typeof entry === "string" ? `s:${entry}` : `j:${JSON.stringify(entry)}`;
+		if (seen.has(key)) continue;
+		seen.add(key);
+		deduped.push(entry);
+	}
+	return [...deduped, PLUGIN_NAME];
+}
+
+/** @param {number} ms */
+function sleep(ms) {
+	// Keep this helper local so installer scripts remain standalone and do not depend on lib/.
+	return new Promise((resolve) => {
+		setTimeout(resolve, ms);
+	});
+}
+
+/** @param {unknown} error */
+function shouldRetryFileOperation(error) {
+	const fileError = /** @type {NodeJS.ErrnoException | undefined} */ (error);
+	return (
+		fileError instanceof Error &&
+		typeof fileError.code === "string" &&
+		FILE_RETRY_CODES.has(fileError.code)
+	);
+}
+
+/** @template T @param {() => Promise<T>} operation */
+export async function withFileOperationRetry(operation) {
+	for (let attempt = 1; ; attempt += 1) {
+		try {
+			return await operation();
+		} catch (error) {
+			if (
+				!shouldRetryFileOperation(error) ||
+				attempt >= FILE_RETRY_MAX_ATTEMPTS
+			) {
+				throw error;
+			}
+
+			const jitter = Math.floor(Math.random() * FILE_RETRY_JITTER_MS);
+			const delayMs = FILE_RETRY_BASE_DELAY_MS * 2 ** (attempt - 1) + jitter;
+			await sleep(delayMs);
+		}
+	}
+}
+
+/**
+ * @param {string} sourcePath
+ * @param {string} targetPath
+ * @param {{
+ *   rename?: (sourcePath: string, targetPath: string) => Promise<void>,
+ *   log?: (message: string) => void,
+ *   maxRetries?: number,
+ *   baseDelayMs?: number,
+ *   jitterMs?: number,
+ *   random?: () => number,
+ *   sleep?: (ms: number) => Promise<void>,
+ * }} [options]
+ */
+export async function renameWithRetry(sourcePath, targetPath, options = {}) {
+	const {
+		rename = fsRename,
+		log = () => {},
+		maxRetries = FILE_RETRY_MAX_ATTEMPTS,
+		baseDelayMs = FILE_RETRY_BASE_DELAY_MS,
+		jitterMs = FILE_RETRY_JITTER_MS,
+		random = Math.random,
+		sleep: sleepImpl = sleep,
+	} = options;
+
+	if (!Number.isInteger(maxRetries) || maxRetries < 1) {
+		throw new RangeError("maxRetries must be an integer >= 1");
+	}
+
+	for (let attempt = 0; attempt < maxRetries; attempt += 1) {
+		try {
+			await rename(sourcePath, targetPath);
+			return;
+		} catch (error) {
+			const code =
+				error && typeof error === "object" && "code" in error
+					? error.code
+					: undefined;
+			const isRetryable =
+				typeof code === "string" && FILE_RETRY_CODES.has(code);
+			if (!isRetryable || attempt === maxRetries - 1) {
+				throw error;
+			}
+			const delayMs =
+				baseDelayMs * 2 ** attempt + Math.floor(random() * jitterMs);
+			log(
+				`Retrying atomic rename (${attempt + 1}/${maxRetries}) code=${code ?? "unknown"} source=${sourcePath} target=${targetPath} delayMs=${delayMs}`,
+			);
+			await sleepImpl(delayMs);
+		}
+	}
+}

package/scripts/mcodex

@@ -0,0 +1,117 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+monitor_interval="${MCODEX_MONITOR_INTERVAL:-5}"
+live_accounts=0
+tmux_history_limit="${MCODEX_TMUX_HISTORY_LIMIT:-50000}"
+
+# Security: monitor_interval is embedded into `watch -n <n> ...` command strings
+# that tmux hands to a shell. An attacker-controlled MCODEX_MONITOR_INTERVAL like
+# "5; rm -rf ~" would otherwise execute. Require a positive integer (optionally
+# with a fractional part for sub-second intervals) and fall back to the default
+# otherwise, so no shell metacharacters can ever reach the command string.
+if ! [[ "$monitor_interval" =~ ^[0-9]+(\.[0-9]+)?$ ]]; then
+  echo "mcodex: invalid MCODEX_MONITOR_INTERVAL '$monitor_interval'; using 5" >&2
+  monitor_interval=5
+fi
+
+# Same hardening for the tmux scrollback history limit (used as a tmux option
+# argument): must be a plain integer.
+if ! [[ "$tmux_history_limit" =~ ^[0-9]+$ ]]; then
+  echo "mcodex: invalid MCODEX_TMUX_HISTORY_LIMIT '$tmux_history_limit'; using 50000" >&2
+  tmux_history_limit=50000
+fi
+
+quote_args() {
+  local quoted=()
+  local arg
+  for arg in "$@"; do
+    printf -v arg '%q' "$arg"
+    quoted+=("$arg")
+  done
+  # Join with single spaces and NO trailing space (a trailing space would become
+  # part of the interpolated tmux command string).
+  local IFS=' '
+  printf '%s' "${quoted[*]}"
+}
+
+require_watch() {
+  if ! command -v watch >/dev/null 2>&1; then
+    echo "mcodex: 'watch' is not installed; the live account monitor requires it (install procps / procps-ng)." >&2
+    return 1
+  fi
+}
+
+run_monitor() {
+  require_watch || return 1
+  watch -n "$monitor_interval" 'codex-multi-auth list'
+}
+
+configure_tmux_scrollback() {
+  local target="${1:-}"
+  local target_args=()
+  if [[ -n "$target" ]]; then
+    target_args=(-t "$target")
+  fi
+
+  tmux set-option "${target_args[@]}" mouse on >/dev/null 2>&1
+  tmux set-option "${target_args[@]}" history-limit "$tmux_history_limit" >/dev/null 2>&1
+  tmux bind-key -T root WheelUpPane copy-mode -e >/dev/null 2>&1
+  tmux bind-key -T copy-mode WheelUpPane send-keys -X scroll-up >/dev/null 2>&1
+  tmux bind-key -T copy-mode WheelDownPane send-keys -X scroll-down >/dev/null 2>&1
+  tmux bind-key -T copy-mode-vi WheelUpPane send-keys -X scroll-up >/dev/null 2>&1
+  tmux bind-key -T copy-mode-vi WheelDownPane send-keys -X scroll-down >/dev/null 2>&1
+}
+
+if [[ "${1:-}" == "--monitor" ]]; then
+  # --monitor takes no extra args; the live account list is fixed. Propagate the
+  # watch-availability check's exit code instead of masking it with `exit 0`.
+  run_monitor
+  exit $?
+fi
+
+if [[ "${1:-}" == "--tmux" || "${1:-}" == "-t" ]]; then
+  shift
+  if [[ "${1:-}" == "--live-accounts" ]]; then
+    live_accounts=1
+    shift
+  fi
+  if ! command -v tmux >/dev/null 2>&1; then
+    echo "mcodex: tmux is not installed; launching without tmux" >&2
+    exec codex-multi-auth-codex "$@"
+  fi
+
+  if [[ -n "${TMUX:-}" ]]; then
+    configure_tmux_scrollback
+    if [[ "$live_accounts" == "1" ]] && require_watch; then
+      tmux split-window -h "watch -n $monitor_interval 'codex-multi-auth list'"
+    fi
+    exec codex-multi-auth-codex "$@"
+  fi
+
+  session="${MCODEX_TMUX_SESSION:-mcodex}"
+  suffix="$(date +%H%M%S)"
+  if tmux has-session -t "$session" 2>/dev/null; then
+    session="${session}-${suffix}"
+  fi
+
+  # Build the inner shell-command as a single string. quote_args runs each arg
+  # through printf %q, so every token is already shell-safe (embedded quotes,
+  # spaces, $, backticks are escaped); the surrounding expansion is not
+  # re-evaluated, so the command tmux receives is exactly this string.
+  cmd="codex-multi-auth-codex"
+  args="$(quote_args "$@")"
+  if [[ -n "$args" ]]; then
+    cmd="$cmd $args"
+  fi
+  tmux new-session -d -s "$session" -n codex "$cmd"
+  configure_tmux_scrollback "$session"
+  if [[ "$live_accounts" == "1" ]] && require_watch; then
+    tmux split-window -h -t "$session:0" "watch -n $monitor_interval 'codex-multi-auth list'"
+  fi
+  tmux select-pane -t "$session:0.0"
+  tmux attach-session -t "$session"
+  exit 0
+fi
+
+exec codex-multi-auth-codex "$@"