codex-multi-auth 2.1.3 → 2.1.5

package/scripts/test-model-matrix.js

@@ -110,6 +110,7 @@ function printUsage() {
 			"  --plugin=dist|package          Load plugin from local dist URI or package name (default: dist)",
 			"  --max-cases=N                  Hard cap number of cases per scenario",
 			"  --report-json=PATH             Write JSON report to PATH (relative to repo root)",
+			"  --strict-capabilities          Fail unsupported account/model capabilities instead of skipping them",
 			"  --no-restore                   Keep generated local config files after run",
 			"  -h, --help                     Show help",
 		].join("\n"),
@@ -148,6 +149,15 @@ function runQuiet(command, commandArgs) {
 	}
 }
 
+function runQuietWindowsTaskkill(pid) {
+	runQuiet("cmd.exe", [
+		"/d",
+		"/s",
+		"/c",
+		`taskkill /F /T /PID ${pid}`,
+	]);
+}
+
 export function registerSpawnedCodex(pid) {
 	if (!Number.isInteger(pid) || pid <= 0) return;
 	spawnedCodexPids.add(pid);
@@ -171,18 +181,67 @@ export function resolveMatrixTimeoutMs(smoke = false) {
 	return parsedTimeout;
 }
 
-function hasCompletedSuccessfully(output, token) {
+function parseNdjsonEvents(output) {
+	const events = [];
+	for (const line of output.split(/\r?\n/)) {
+		const trimmed = line.trim();
+		if (!trimmed.startsWith("{")) {
+			continue;
+		}
+		try {
+			events.push(JSON.parse(trimmed));
+		} catch {
+			// Ignore wrapper noise and partial lines.
+		}
+	}
+	return events;
+}
+
+function findLastIndex(items, predicate) {
+	for (let index = items.length - 1; index >= 0; index -= 1) {
+		if (predicate(items[index], index)) {
+			return index;
+		}
+	}
+	return -1;
+}
+
+function hasTerminalFailure(events) {
+	const lastCompletedIndex = findLastIndex(
+		events,
+		(event) =>
+			event?.type === "turn.completed" || event?.type === "response.completed",
+	);
 	return (
-		output.includes(token) ||
-		output.includes('"type":"turn.completed"') ||
-		output.includes('"type":"response.completed"')
+		findLastIndex(
+			events,
+			(event, index) =>
+				index > lastCompletedIndex &&
+				(event?.type === "error" ||
+					event?.type === "turn.failed" ||
+					event?.type === "response.failed" ||
+					event?.type === "response.error" ||
+					event?.type === "response.incomplete"),
+		) >= 0
 	);
 }
 
-function getSmokeSkipReason(exitCode, output) {
-	if (exitCode === 124) {
-		return "timed-out";
+function hasCompletedSuccessfully(output, token) {
+	const events = parseNdjsonEvents(output);
+	if (events.length > 0) {
+		if (hasTerminalFailure(events)) {
+			return false;
+		}
+		return events.some(
+			(event) =>
+				event?.type === "turn.completed" ||
+				event?.type === "response.completed",
+		);
 	}
+	return output.includes(token);
+}
+
+function getCapabilitySkipReason(exitCode, output, smoke) {
 	if (/not supported when using codex with a chatgpt account/i.test(output)) {
 		return "unsupported-model";
 	}
@@ -192,14 +251,26 @@ function getSmokeSkipReason(exitCode, output) {
 	) {
 		return "unsupported-reasoning";
 	}
+	if (smoke && exitCode === 124) {
+		return "timed-out";
+	}
 	return null;
 }
 
-function finalizeModelCaseResult(caseInfo, exitCode, output, token, smoke) {
+function finalizeModelCaseResult(
+	caseInfo,
+	exitCode,
+	output,
+	token,
+	{ smoke, strictCapabilities } = {},
+) {
 	const hasToken = output.includes(token);
 	const completed = hasCompletedSuccessfully(output, token);
 	const ok = exitCode === 0 && completed;
-	const skipReason = !ok && smoke ? getSmokeSkipReason(exitCode, output) : null;
+	const skipReason =
+		!ok && strictCapabilities !== true
+			? getCapabilitySkipReason(exitCode, output, smoke === true)
+			: null;
 
 	return {
 		...caseInfo,
@@ -219,8 +290,12 @@ export function __finalizeModelCaseResultForTests(
 	output,
 	token,
 	smoke = false,
+	strictCapabilities = false,
 ) {
-	return finalizeModelCaseResult(caseInfo, exitCode, output, token, smoke);
+	return finalizeModelCaseResult(caseInfo, exitCode, output, token, {
+		smoke,
+		strictCapabilities,
+	});
 }
 
 function stopCodexServersInternal() {
@@ -228,7 +303,7 @@ function stopCodexServersInternal() {
 	spawnedCodexPids.clear();
 	for (const pid of tracked) {
 		if (process.platform === "win32") {
-			runQuiet("taskkill", ["/F", "/T", "/PID", String(pid)]);
+			runQuietWindowsTaskkill(pid);
 			continue;
 		}
 		runQuiet("kill", ["-9", String(pid)]);
@@ -352,7 +427,10 @@ function executeModelCase(caseInfo, index) {
 			124,
 			`Timed out after ${timeoutMs}ms`,
 			token,
-			caseInfo.smoke === true,
+			{
+				smoke: caseInfo.smoke === true,
+				strictCapabilities: caseInfo.strictCapabilities === true,
+			},
 		);
 	}
 
@@ -364,7 +442,10 @@ function executeModelCase(caseInfo, index) {
 		exitCode,
 		combinedOutput,
 		token,
-		caseInfo.smoke === true,
+		{
+			smoke: caseInfo.smoke === true,
+			strictCapabilities: caseInfo.strictCapabilities === true,
+		},
 	);
 }
 
@@ -442,6 +523,7 @@ async function runScenario(scenario, options) {
 		(caseInfo) => ({
 			...caseInfo,
 			smoke: options.smoke,
+			strictCapabilities: options.strictCapabilities,
 		}),
 	);
 	console.log(`\n=== ${scenario.toUpperCase()} (${cases.length} cases) ===`);
@@ -483,6 +565,7 @@ async function main() {
 	const scenarioValue =
 		parseArgValue(args, "--scenario") ?? (smoke ? "modern" : "all");
 	const pluginMode = parseArgValue(args, "--plugin") ?? "dist";
+	const strictCapabilities = args.includes("--strict-capabilities");
 	const noRestore = args.includes("--no-restore");
 	const maxCasesRaw = parseArgValue(args, "--max-cases");
 	const maxCases = maxCasesRaw ? Number.parseInt(maxCasesRaw, 10) : 0;
@@ -530,6 +613,7 @@ async function main() {
 				smoke,
 				maxCases,
 				pluginRef,
+				strictCapabilities,
 			});
 			allResults.push(
 				...scenarioResults.map((item) => ({ ...item, scenario })),

package/dist/lib/auto-update-checker.d.ts

@@ -1,32 +0,0 @@
-export interface UpdateCheckResult {
-    hasUpdate: boolean;
-    currentVersion: string;
-    latestVersion: string | null;
-    updateCommand: string;
-}
-export interface AutoUpdateResult extends UpdateCheckResult {
-    checked: boolean;
-    updated: boolean;
-    reason: "disabled" | "not-updateable-install" | "already-running" | "current" | "updated" | "update-failed";
-    exitCode: number | null;
-    error: string | null;
-}
-export interface AutoUpdateOptions {
-    env?: NodeJS.ProcessEnv;
-    forceCheck?: boolean;
-    forceInstall?: boolean;
-    npmCommand?: string;
-    packageRoot?: string;
-    platform?: NodeJS.Platform;
-    fetchTimeoutMs?: number;
-    timeoutMs?: number;
-    onUpdateStart?: (result: UpdateCheckResult) => void;
-}
-export declare function isAutoUpdateEnabled(env?: NodeJS.ProcessEnv): boolean;
-export declare function resolvePackageRootFromModuleDir(moduleDir: string): string;
-export declare function isUpdateablePackageInstall(packageRoot?: string): boolean;
-export declare function checkForUpdates(force?: boolean, fetchTimeoutMs?: number): Promise<UpdateCheckResult>;
-export declare function autoUpdateIfAvailable(options?: AutoUpdateOptions): Promise<AutoUpdateResult>;
-export declare function checkAndNotify(showToast?: (message: string, variant: "info" | "warning") => Promise<void>): Promise<void>;
-export declare function clearUpdateCache(): void;
-//# sourceMappingURL=auto-update-checker.d.ts.map

package/dist/lib/auto-update-checker.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"auto-update-checker.d.ts","sourceRoot":"","sources":["../../lib/auto-update-checker.ts"],"names":[],"mappings":"AAiSA,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAiB,SAAQ,iBAAiB;IAC1D,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EACH,UAAU,GACV,wBAAwB,GACxB,iBAAiB,GACjB,SAAS,GACT,SAAS,GACT,eAAe,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACpD;AAmBD,wBAAgB,mBAAmB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAIjF;AAUD,wBAAgB,+BAA+B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAmBzE;AAOD,wBAAgB,0BAA0B,CACzC,WAAW,SAAmB,GAC5B,OAAO,CAGT;AA6TD,wBAAsB,eAAe,CACpC,KAAK,UAAQ,EACb,cAAc,SAA0B,GACtC,OAAO,CAAC,iBAAiB,CAAC,CA+B5B;AAED,wBAAsB,qBAAqB,CAC1C,OAAO,GAAE,iBAAsB,GAC7B,OAAO,CAAC,gBAAgB,CAAC,CAyF3B;AAED,wBAAsB,cAAc,CAClC,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,GAC1E,OAAO,CAAC,IAAI,CAAC,CAkBf;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAUvC"}