codex-multi-auth 0.1.3 → 0.1.5

package/scripts/test-model-matrix.js

@@ -1,9 +1,9 @@
-import { existsSync } from "node:fs";
-import { readFile, writeFile, rm, mkdir } from "node:fs/promises";
-import { spawnSync } from "node:child_process";
-import { dirname, join, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-import process from "node:process";
+import { existsSync, readFileSync } from "node:fs";
+import { readFile, writeFile, rm, mkdir } from "node:fs/promises";
+import { spawnSync } from "node:child_process";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import process from "node:process";
 
 const scriptDir = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(scriptDir, "..");
@@ -13,21 +13,50 @@ const scenarioTemplates = {
 	modern: join(repoRoot, "config", "codex-modern.json"),
 };
 
-const defaultPromptPrefix = "Reply exactly:";
-const modelProviderId = "openai";
-const pluginPackageName = "codex-multi-auth";
-const DEFAULT_MATRIX_TIMEOUT_MS = 120000;
-
-export function resolveCodexExecutable() {
-	const envOverride = process.env.CODEX_BIN;
-	if (envOverride && envOverride.trim().length > 0) {
-		const command = envOverride.trim();
-		return { command, shell: /\.cmd$/i.test(command) };
-	}
-
-	if (process.platform !== "win32") {
-		return { command: "codex", shell: false };
-	}
+const pluginPackageName = "codex-multi-auth";
+const DEFAULT_MATRIX_TIMEOUT_MS = 120000;
+
+function resolveCmdScriptEntry(commandPath) {
+	if (!/\.cmd$/i.test(commandPath)) {
+		return null;
+	}
+	try {
+		const raw = readFileSync(commandPath, "utf8");
+		const match = raw.match(/"%dp0%\\([^"\r\n]+\.js)"/i);
+		if (!match || typeof match[1] !== "string") {
+			return null;
+		}
+		const relScriptPath = match[1].replace(/[\\/]+/g, "/");
+		const scriptPath = resolve(dirname(commandPath), relScriptPath);
+		return existsSync(scriptPath) ? scriptPath : null;
+	} catch {
+		return null;
+	}
+}
+
+function buildExecutable(command) {
+	const scriptEntry = resolveCmdScriptEntry(command);
+	if (scriptEntry) {
+		return {
+			command: process.execPath,
+			shell: false,
+			prefixArgs: [scriptEntry],
+			displayCommand: command,
+		};
+	}
+	return { command, shell: /\.cmd$/i.test(command) };
+}
+
+export function resolveCodexExecutable() {
+	const envOverride = process.env.CODEX_BIN;
+	if (envOverride && envOverride.trim().length > 0) {
+		const command = envOverride.trim();
+		return buildExecutable(command);
+	}
+
+	if (process.platform !== "win32") {
+		return { command: "codex", shell: false };
+	}
 
 	const whereResult = spawnSync("where", ["Codex"], {
 		encoding: "utf8",
@@ -42,27 +71,27 @@ export function resolveCodexExecutable() {
 		return { command: "codex", shell: false };
 	}
 
-	const exactExe = candidates.find((candidate) =>
-		/npm\\Codex\.exe$/i.test(candidate),
-	);
-	if (exactExe) {
-		return { command: exactExe, shell: false };
+	const exactExe = candidates.find((candidate) =>
+		/npm\\Codex\.exe$/i.test(candidate),
+	);
+	if (exactExe) {
+		return { command: exactExe, shell: false };
 	}
 
-	const exactCmd = candidates.find((candidate) =>
-		/npm\\Codex\.cmd$/i.test(candidate),
-	);
-	if (exactCmd) {
-		return { command: exactCmd, shell: true };
-	}
-
-	const anyCmd = candidates.find((candidate) => /\.cmd$/i.test(candidate));
-	if (anyCmd) {
-		return { command: anyCmd, shell: true };
-	}
-
-	return { command: candidates[0], shell: false };
-}
+	const exactCmd = candidates.find((candidate) =>
+		/npm\\Codex\.cmd$/i.test(candidate),
+	);
+	if (exactCmd) {
+		return buildExecutable(exactCmd);
+	}
+
+	const anyCmd = candidates.find((candidate) => /\.cmd$/i.test(candidate));
+	if (anyCmd) {
+		return buildExecutable(anyCmd);
+	}
+
+	return { command: candidates[0], shell: false };
+}
 
 const CodexExecutable = resolveCodexExecutable();
 
@@ -215,27 +244,28 @@ function enumerateCases(models, smoke, maxCases) {
 	return selected;
 }
 
-function executeModelCase(caseInfo, index, port) {
-	const token = `MODEL_MATRIX_OK_${index}`;
-	const message = `${defaultPromptPrefix} ${token}`;
-	const args = [
-		"run",
-		message,
-		"--model",
-		`${modelProviderId}/${caseInfo.model}`,
-		"--port",
-		String(port),
-	];
-	if (caseInfo.variant) {
-		args.push("--variant", caseInfo.variant);
-	}
-
-	const timeoutMs = resolveMatrixTimeoutMs();
-	const finalized = spawnSync(CodexExecutable.command, args, {
-		cwd: repoRoot,
-		encoding: "utf8",
-		windowsHide: true,
-		shell: CodexExecutable.shell,
+function executeModelCase(caseInfo, index) {
+	const token = `MODEL_MATRIX_OK_${index}`;
+	const message = token;
+	const args = [
+		"exec",
+		message,
+		"--model",
+		caseInfo.model,
+		"--json",
+		"--skip-git-repo-check",
+	];
+	if (caseInfo.variant) {
+		args.push("-c", `model_reasoning_effort="${caseInfo.variant}"`);
+	}
+
+	const timeoutMs = resolveMatrixTimeoutMs();
+	const commandArgs = [...(CodexExecutable.prefixArgs ?? []), ...args];
+	const finalized = spawnSync(CodexExecutable.command, commandArgs, {
+		cwd: repoRoot,
+		encoding: "utf8",
+		windowsHide: true,
+		shell: CodexExecutable.shell,
 		timeout: timeoutMs,
 		killSignal: "SIGKILL",
 		env: {
@@ -256,11 +286,10 @@ function executeModelCase(caseInfo, index, port) {
 		};
 	}
 
-	const combinedOutput = `${finalized.stdout ?? ""}\n${finalized.stderr ?? ""}`.trim();
-	const hasToken = combinedOutput.includes(token);
-	const hasFatalError = /ProviderModelNotFoundError|Model not found/i.test(combinedOutput);
-	const exitCode = finalized.status ?? 1;
-	const ok = exitCode === 0 && hasToken && !hasFatalError;
+	const combinedOutput = `${finalized.stdout ?? ""}\n${finalized.stderr ?? ""}`.trim();
+	const hasToken = combinedOutput.includes(token);
+	const exitCode = finalized.status ?? 1;
+	const ok = exitCode === 0 && hasToken;
 
 	return {
 		...caseInfo,
@@ -342,12 +371,11 @@ async function runScenario(scenario, options) {
 
 	const results = [];
 	for (let i = 0; i < cases.length; i += 1) {
-		const caseInfo = cases[i];
-		const result = executeModelCase(
-			caseInfo,
-			i + 1,
-			options.portStart + i,
-		);
+		const caseInfo = cases[i];
+		const result = executeModelCase(
+			caseInfo,
+			i + 1,
+		);
 		results.push(result);
 		const variantLabel = result.variant ? ` [variant=${result.variant}]` : "";
 		if (result.ok) {
@@ -398,10 +426,10 @@ async function main() {
 
 	console.log("Codex Model Matrix Audit");
 	console.log(`Repo: ${repoRoot}`);
-	console.log(`Scenarios: ${scenarios.join(", ")}`);
-	console.log(`Mode: ${smoke ? "smoke" : "full"}`);
-	console.log(`Plugin: ${pluginRef}`);
-	console.log(`Codex command: ${CodexExecutable.command}`);
+	console.log(`Scenarios: ${scenarios.join(", ")}`);
+	console.log(`Mode: ${smoke ? "smoke" : "full"}`);
+	console.log(`Plugin: ${pluginRef}`);
+	console.log(`Codex command: ${CodexExecutable.displayCommand ?? CodexExecutable.command}`);
 
 	const backups = await backupLocalConfigs();
 	const allResults = [];
@@ -435,10 +463,10 @@ async function main() {
 			generatedAt: new Date().toISOString(),
 			repoRoot,
 			scenarios,
-			mode: smoke ? "smoke" : "full",
-			plugin: pluginRef,
-			CodexCommand: CodexExecutable.command,
-			totals: {
+			mode: smoke ? "smoke" : "full",
+			plugin: pluginRef,
+			CodexCommand: CodexExecutable.displayCommand ?? CodexExecutable.command,
+			totals: {
 				total: allResults.length,
 				passed,
 				failed: failed.length,

package/scripts/validate-model-map.sh

@@ -1,7 +1,7 @@
-#!/bin/bash
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-node "${SCRIPT_DIR}/test-model-matrix.js" --smoke "$@"
-
+#!/bin/bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+node "${SCRIPT_DIR}/test-model-matrix.js" --smoke "$@"
+

package/vendor/codex-ai-plugin/dist/index.d.ts

@@ -1,2 +1,2 @@
-export type PluginInput = any;
+export type PluginInput = any;
 export type Plugin = any;

package/vendor/codex-ai-plugin/dist/tool.d.ts

@@ -1,42 +1,42 @@
-export interface ToolContext {
-  [key: string]: any;
-  directory: string;
-  worktree: string;
-  ask: (request: any) => Promise<any> | any;
-}
-
-export interface ToolDefinition<TArgs = any, TResult = any> {
-  description?: string;
-  args?: Record<string, any>;
-  parameters?: unknown;
-  execute: (args: TArgs, context: ToolContext) => Promise<TResult> | TResult;
-  [key: string]: any;
-}
-
-export interface SchemaNode {
-  optional: () => SchemaNode;
-  describe: (_text: string) => SchemaNode;
-  min: (_value: number) => SchemaNode;
-  max: (_value: number) => SchemaNode;
-  default: (_value: unknown) => SchemaNode;
-  int: () => SchemaNode;
-  array: (_node?: unknown) => SchemaNode;
-  [key: string]: any;
-}
-
-export interface ToolFactory {
-  <TArgs = any, TResult = any>(definition: ToolDefinition<TArgs, TResult>): ToolDefinition<TArgs, TResult>;
-  schema: {
-    string: () => SchemaNode;
-    number: () => SchemaNode;
-    boolean: () => SchemaNode;
-    object: (shape: Record<string, unknown>) => SchemaNode;
-    enum: (values: readonly unknown[]) => SchemaNode;
-    literal: (value: unknown) => SchemaNode;
-    array: (node: unknown) => SchemaNode;
-    any: () => SchemaNode;
-    unknown: () => SchemaNode;
-  };
-}
-
+export interface ToolContext {
+  [key: string]: any;
+  directory: string;
+  worktree: string;
+  ask: (request: any) => Promise<any> | any;
+}
+
+export interface ToolDefinition<TArgs = any, TResult = any> {
+  description?: string;
+  args?: Record<string, any>;
+  parameters?: unknown;
+  execute: (args: TArgs, context: ToolContext) => Promise<TResult> | TResult;
+  [key: string]: any;
+}
+
+export interface SchemaNode {
+  optional: () => SchemaNode;
+  describe: (_text: string) => SchemaNode;
+  min: (_value: number) => SchemaNode;
+  max: (_value: number) => SchemaNode;
+  default: (_value: unknown) => SchemaNode;
+  int: () => SchemaNode;
+  array: (_node?: unknown) => SchemaNode;
+  [key: string]: any;
+}
+
+export interface ToolFactory {
+  <TArgs = any, TResult = any>(definition: ToolDefinition<TArgs, TResult>): ToolDefinition<TArgs, TResult>;
+  schema: {
+    string: () => SchemaNode;
+    number: () => SchemaNode;
+    boolean: () => SchemaNode;
+    object: (shape: Record<string, unknown>) => SchemaNode;
+    enum: (values: readonly unknown[]) => SchemaNode;
+    literal: (value: unknown) => SchemaNode;
+    array: (node: unknown) => SchemaNode;
+    any: () => SchemaNode;
+    unknown: () => SchemaNode;
+  };
+}
+
 export declare const tool: ToolFactory;

package/vendor/codex-ai-plugin/dist/tool.js

@@ -1,29 +1,29 @@
-const chain = {
-  optional() { return this; },
-  describe() { return this; },
-  min() { return this; },
-  max() { return this; },
-  default() { return this; },
-  int() { return this; },
-  array() { return this; },
-};
-
-function node() {
-  return Object.create(chain);
-}
-
-export function tool(definition) {
-  return definition;
-}
-
-tool.schema = {
-  string: () => node(),
-  number: () => node(),
-  boolean: () => node(),
-  object: () => node(),
-  enum: () => node(),
-  literal: () => node(),
-  array: () => node(),
-  any: () => node(),
-  unknown: () => node(),
+const chain = {
+  optional() { return this; },
+  describe() { return this; },
+  min() { return this; },
+  max() { return this; },
+  default() { return this; },
+  int() { return this; },
+  array() { return this; },
+};
+
+function node() {
+  return Object.create(chain);
+}
+
+export function tool(definition) {
+  return definition;
+}
+
+tool.schema = {
+  string: () => node(),
+  number: () => node(),
+  boolean: () => node(),
+  object: () => node(),
+  enum: () => node(),
+  literal: () => node(),
+  array: () => node(),
+  any: () => node(),
+  unknown: () => node(),
 };

package/vendor/codex-ai-sdk/dist/index.d.ts

@@ -1,4 +1,4 @@
-export type Auth = any;
-export type Provider = any;
-export type Model = any;
+export type Auth = any;
+export type Provider = any;
+export type Model = any;
 export type CodexClient = any;