Merge fork/main into rebase-on-471: resolve spawn-c vs openai#471 in favor of openai#471 reconstruction

# Conflicts:
#	.claude-plugin/marketplace.json
#	README.md
#	plugins/codex/.claude-plugin/plugin.json
#	plugins/codex/commands/adversarial-review.md
#	plugins/codex/commands/review.md
#	plugins/codex/scripts/lib/app-server.mjs
#	plugins/codex/scripts/lib/broker-lifecycle.mjs
#	tests/commands.test.mjs
#	tests/runtime.test.mjs

Author: axisrow

plugins/codex/scripts/app-server-broker.mjs

@@ -67,7 +67,7 @@ async function main() {
   }
 
   const { options } = parseArgs(argv, {
-    valueOptions: ["cwd", "pid-file", "endpoint"]
+    valueOptions: ["cwd", "pid-file", "endpoint", "model", "effort"]
   });
 
   if (!options.endpoint) {
@@ -80,7 +80,7 @@ async function main() {
   const pidFile = options["pid-file"] ? path.resolve(options["pid-file"]) : null;
   writePidFile(pidFile);
 
-  const appClient = await CodexAppServerClient.connect(cwd, { disableBroker: true });
+  const appClient = await CodexAppServerClient.connect(cwd, { disableBroker: true, model: options.model, effort: options.effort });
   let activeRequestSocket = null;
   let activeStreamSocket = null;
   let activeStreamThreadIds = null;

plugins/codex/scripts/lib/codex.mjs

@@ -607,10 +607,10 @@ async function captureTurn(client, threadId, startRequest, options = {}) {
   }
 }
 
-async function withAppServer(cwd, fn) {
+async function withAppServer(cwd, fn, clientOptions = {}) {
   let client = null;
   try {
-    client = await CodexAppServerClient.connect(cwd);
+    client = await CodexAppServerClient.connect(cwd, clientOptions);
     const result = await fn(client);
     await client.close();
     return result;
@@ -629,7 +629,7 @@ async function withAppServer(cwd, fn) {
       throw error;
     }
 
-    const directClient = await CodexAppServerClient.connect(cwd, { disableBroker: true });
+    const directClient = await CodexAppServerClient.connect(cwd, { ...clientOptions, disableBroker: true });
     try {
       return await fn(directClient);
     } finally {
@@ -1067,7 +1067,7 @@ export async function runAppServerReview(cwd, options = {}) {
       error: turnState.error,
       stderr: cleanCodexStderr(client.stderr)
     };
-  });
+  }, { model: options.model, effort: options.effort });
 }
 
 export async function importExternalAgentSession(cwd, options = {}) {
@@ -1203,7 +1203,7 @@ export async function runAppServerTurn(cwd, options = {}) {
       touchedFiles: collectTouchedFiles(turnState.fileChanges),
       commandExecutions: turnState.commandExecutions
     };
-  });
+  }, { model: options.model, effort: options.effort });
 }
 
 export async function findLatestTaskThread(cwd) {

tests/fake-codex-fixture.mjs

@@ -20,7 +20,7 @@ const readline = require("node:readline");
 
 	function loadState() {
 	  if (!fs.existsSync(STATE_PATH)) {
-	    return { nextThreadId: 1, nextTurnId: 1, appServerStarts: 0, threads: [], capabilities: null, lastInterrupt: null };
+	    return { nextThreadId: 1, nextTurnId: 1, appServerStarts: 0, threads: [], capabilities: null, lastInterrupt: null, lastAppServerSpawnArgs: null, lastReviewStart: null };
 	  }
 	  return JSON.parse(fs.readFileSync(STATE_PATH, "utf8"));
 	}
@@ -298,6 +298,7 @@ if (args[0] !== "app-server") {
 }
 const bootState = loadState();
 bootState.appServerStarts = (bootState.appServerStarts || 0) + 1;
+bootState.lastAppServerSpawnArgs = args;
 saveState(bootState);
 
 const rl = readline.createInterface({ input: process.stdin });
@@ -493,6 +494,14 @@ rl.on("line", (line) => {
           send({ method: "thread/started", params: { thread: { id: reviewThread.id } } });
         }
         const turnId = nextTurnId(state);
+        state.lastReviewStart = {
+          threadId: message.params.threadId,
+          reviewThreadId: reviewThread.id,
+          model: message.params.model ?? null,
+          effort: message.params.effort ?? null,
+          target: message.params.target
+        };
+        saveState(state);
         send({ id: message.id, result: { turn: buildTurn(turnId), reviewThreadId: reviewThread.id } });
         emitTurnCompleted(reviewThread.id, turnId, [
           {