fix(protocol): relax Pydantic models (extra=ignore) to accept intersection fields in EventMsg; Makefile uses 'codex generate-types' when available

Author: gersmann

Makefile

@@ -54,7 +54,13 @@ clean:
 gen-protocol:
 	@echo "Generating TypeScript protocol types via codex-proj/codex-rs ..."
 	@mkdir -p .generated/ts
-	@cd codex-proj/codex-rs && cargo run -p codex-protocol-ts -- --out ../../.generated/ts
+	@if command -v codex >/dev/null 2>&1; then \
+		echo "Using 'codex generate-types'"; \
+		codex generate-types --out .generated/ts; \
+	else \
+		echo "Using cargo run -p codex-protocol-ts"; \
+		cd codex-proj/codex-rs && cargo run -p codex-protocol-ts -- --out ../../.generated/ts; \
+	fi
 	@echo "Generating Python bindings ..."
 	@python3 scripts/generate_protocol_py.py .generated/ts
 	@$(MAKE) fmt

codex/api.py

@@ -51,8 +51,10 @@ def run_exec(
     prompt: str,
     *,
     model: str | None = None,
+    oss: bool = False,
     full_auto: bool = False,
     cd: str | None = None,
+    skip_git_repo_check: bool = False,
     timeout: float | None = None,
     env: Mapping[str, str] | None = None,
     executable: str = "codex",
@@ -73,8 +75,12 @@ def run_exec(
         cmd.extend(["--cd", cd])
     if model:
         cmd.extend(["-m", model])
+    if oss:
+        cmd.append("--oss")
     if full_auto:
         cmd.append("--full-auto")
+    if skip_git_repo_check:
+        cmd.append("--skip-git-repo-check")
     if extra_args:
         cmd.extend(list(extra_args))
 
@@ -127,8 +133,10 @@ def run(
         prompt: str,
         *,
         model: str | None = None,
+        oss: bool | None = None,
         full_auto: bool | None = None,
         cd: str | None = None,
+        skip_git_repo_check: bool | None = None,
         timeout: float | None = None,
         env: Mapping[str, str] | None = None,
         extra_args: Iterable[str] | None = None,
@@ -140,6 +148,8 @@ def run(
         eff_model = model if model is not None else self.model
         eff_full_auto = full_auto if full_auto is not None else self.full_auto
         eff_cd = cd if cd is not None else self.cd
+        eff_oss = bool(oss) if oss is not None else False
+        eff_skip_git = bool(skip_git_repo_check) if skip_git_repo_check is not None else False
 
         # Merge environment overlays; run_exec will merge with os.environ
         merged_env: Mapping[str, str] | None
@@ -160,8 +170,10 @@ def run(
         return run_exec(
             prompt,
             model=eff_model,
+            oss=eff_oss,
             full_auto=eff_full_auto,
             cd=eff_cd,
+            skip_git_repo_check=eff_skip_git,
             timeout=timeout,
             env=merged_env,
             executable=self.executable,

codex/protocol/runtime.py

@@ -22,8 +22,10 @@ def stream_exec_events(
     *,
     executable: str = "codex",
     model: str | None = None,
+    oss: bool = False,
     full_auto: bool = False,
     cd: str | None = None,
+    skip_git_repo_check: bool = False,
     env: dict[str, str] | None = None,
 ) -> Iterator[Event]:
     """Spawn `codex exec --json` and yield Event objects from NDJSON stdout.
@@ -35,8 +37,12 @@ def stream_exec_events(
         cmd += ["--cd", cd]
     if model:
         cmd += ["-m", model]
+    if oss:
+        cmd.append("--oss")
     if full_auto:
         cmd.append("--full-auto")
+    if skip_git_repo_check:
+        cmd.append("--skip-git-repo-check")
     cmd += ["exec", "--json", prompt]
 
     with subprocess.Popen(