codex: don't inject --profile on subcommands that reject it (app-server)

`ucode codex` prepends the global `--profile ucode` flag to every launch.
codex only accepts that flag on runtime commands (interactive, `exec`) and
`codex mcp`; management subcommands like `app-server` reject it outright
("--profile only applies to runtime commands and codex mcp") and fail to
start. This breaks callers that drive `codex app-server` through ucode
(e.g. omnigent's managed codex-native harness).

Skip `--profile` when the target subcommand is one that rejects it. Those
subcommands still resolve the `[profiles.ucode]` provider config via the
top-level `profile = "ucode"` selector ucode writes into the config file,
so the flag is redundant for them anyway. A small subcommand scanner skips
leading global options (e.g. `--model X`) so it isn't mistaken for the
subcommand.

Co-authored-by: Isaac

Author: Edwinhe03

src/ucode/agents/codex.py

@@ -391,12 +391,74 @@ def _gpt_version_key(entry: tuple[str, tuple[int, int | None, int | None, str]])
     return max(parsed, key=_gpt_version_key)[0]
 
 
+# codex accepts the global ``--profile`` flag only on runtime commands (the
+# interactive TUI and ``exec``) and ``codex mcp``. Management subcommands such
+# as ``app-server`` reject it outright ("--profile only applies to runtime
+# commands and codex mcp") and fail to start. Those subcommands still resolve
+# the ``[profiles.ucode]`` provider config through the top-level
+# ``profile = "ucode"`` selector ucode writes into the config file, so the CLI
+# flag is redundant for them anyway — skip it rather than break the launch.
+_SUBCOMMANDS_REJECTING_PROFILE = frozenset({"app-server"})
+
+# codex global options that consume the following token as their value. Used to
+# skip past a leading global (e.g. ``--model X``) when locating the subcommand,
+# so it isn't mistaken for the subcommand itself. Boolean flags take no value;
+# ``--flag=value`` forms are self-contained and handled inline.
+_CODEX_GLOBAL_VALUE_FLAGS = frozenset(
+    {
+        "-c",
+        "--config",
+        "-i",
+        "--image",
+        "-m",
+        "--model",
+        "-p",
+        "--profile",
+        "-s",
+        "--sandbox",
+        "-C",
+        "--cd",
+        "-a",
+        "--ask-for-approval",
+        "--enable",
+        "--disable",
+        "--remote",
+        "--remote-auth-token-env",
+        "--local-provider",
+        "--add-dir",
+    }
+)
+
+
+def _codex_subcommand(tool_args: list[str]) -> str | None:
+    """Return the codex subcommand in *tool_args*, skipping global options.
+
+    ``None`` when there is no subcommand (the interactive TUI).
+    """
+    i = 0
+    while i < len(tool_args):
+        arg = tool_args[i]
+        if not arg.startswith("-"):
+            return arg
+        # A bare value flag (``--model X``) consumes the next token too; a
+        # ``--flag=value`` form or a boolean flag consumes only itself.
+        if "=" not in arg and arg in _CODEX_GLOBAL_VALUE_FLAGS:
+            i += 1
+        i += 1
+    return None
+
+
 def launch(state: dict, tool_args: list[str]) -> None:
     binary = SPEC["binary"]
     workspace = state.get("workspace")
     if workspace:
         os.environ["OAUTH_TOKEN"] = get_databricks_token(workspace, state.get("profile"))
-    exec_or_spawn([binary, "--profile", CODEX_PROFILE_NAME, *tool_args])
+    profile_argv = (
+        []
+        if _codex_subcommand(tool_args) in _SUBCOMMANDS_REJECTING_PROFILE
+        else ["--profile", CODEX_PROFILE_NAME]
+    )
+    exec_or_spawn([binary, *profile_argv, *tool_args])
 
 
 def validate_cmd(binary: str) -> list[str]:

tests/test_agent_codex.py

@@ -436,3 +436,58 @@ def fake_execvp(binary: str, args: list[str]) -> None:
 
         assert os.environ["OAUTH_TOKEN"] == "fresh-token"
         assert exec_calls == [("codex", ["codex", "--profile", "ucode", "--search"])]
+
+    def test_omits_profile_for_app_server(self, monkeypatch):
+        # `codex app-server` rejects the global --profile flag, so ucode must
+        # not inject it there — even when a global option precedes it.
+        exec_calls: list[tuple[str, list[str]]] = []
+
+        def fake_execvp(binary: str, args: list[str]) -> None:
+            exec_calls.append((binary, args))
+            raise RuntimeError("stop")
+
+        monkeypatch.setattr(codex, "get_databricks_token", lambda workspace, profile=None: "tok")
+        monkeypatch.setattr(os, "execvp", fake_execvp)
+
+        try:
+            codex.launch({"workspace": WS}, ["--model", "gpt-5", "app-server", "--listen", "u"])
+        except RuntimeError:
+            pass
+
+        assert exec_calls == [
+            ("codex", ["codex", "--model", "gpt-5", "app-server", "--listen", "u"])
+        ]
+
+    def test_keeps_profile_for_exec_subcommand(self, monkeypatch):
+        exec_calls: list[tuple[str, list[str]]] = []
+
+        def fake_execvp(binary: str, args: list[str]) -> None:
+            exec_calls.append((binary, args))
+            raise RuntimeError("stop")
+
+        monkeypatch.setattr(codex, "get_databricks_token", lambda workspace, profile=None: "tok")
+        monkeypatch.setattr(os, "execvp", fake_execvp)
+
+        try:
+            codex.launch({"workspace": WS}, ["exec", "say hi"])
+        except RuntimeError:
+            pass
+
+        assert exec_calls == [("codex", ["codex", "--profile", "ucode", "exec", "say hi"])]
+
+
+class TestCodexSubcommand:
+    def test_none_for_interactive(self):
+        assert codex._codex_subcommand([]) is None
+        assert codex._codex_subcommand(["--search"]) is None
+
+    def test_finds_bare_subcommand(self):
+        assert codex._codex_subcommand(["exec", "hi"]) == "exec"
+        assert codex._codex_subcommand(["app-server"]) == "app-server"
+
+    def test_skips_leading_value_flags(self):
+        assert codex._codex_subcommand(["--model", "gpt-5", "app-server"]) == "app-server"
+        assert codex._codex_subcommand(["-c", "k=v", "exec"]) == "exec"
+
+    def test_handles_equals_form(self):
+        assert codex._codex_subcommand(["--model=gpt-5", "app-server"]) == "app-server"