fix(agent-manager): consume variadic codex -i/--image values in helper detection (#298) (#301)

Codex CLI 0.157.1 declares -i, --image <FILE>... (clap num_args = 1..), so the helper-subcommand check now skips image values until the next flag or known subcommand name, matching clap. Also treats the cloud-tasks alias of cloud as a helper.

Author: codeaholicguy

packages/agent-manager/src/__tests__/adapters/CodexAdapter.test.ts

@@ -295,6 +295,42 @@ describe("CodexAdapter", () => {
     expect(agents.map((agent) => agent.pid)).toEqual([4321]);
   });
 
+  // Codex CLI 0.157.1 declares `-i, --image <FILE>...` (clap `num_args = 1..`,
+  // `value_delimiter = ','`), its only variadic root flag. clap keeps taking
+  // image values until a flag or a subcommand name, so a helper subcommand can
+  // follow several images.
+  describe("variadic -i/--image values (Codex CLI 0.157.1)", () => {
+    const helperCommands = [
+      "codex -i a.png b.png cloud",
+      "codex --image a.png b.png app-server",
+      "codex -i a.png -i b.png agents",
+      "codex -i a.png b.png c.png --model o3 mcp list",
+      "codex --image=a.png,b.png cloud",
+      "codex -i a.png,b.png login",
+      "codex -i a.png b.png a",
+      "codex --image a.png b.png cloud-tasks list",
+    ];
+    const agentCommands = [
+      'codex -i a.png "fix the bug"',
+      "codex -i a.png fix the bug",
+      "codex -i a.png b.png",
+      "codex -i a.png resume --last",
+      "codex --image a.png b.png fork --last",
+      "codex -i a.png b.png exec summarize the screenshots",
+      "codex -i a.png b.png e -",
+      "codex -i a.png b.png review",
+      "codex -i a.png --model o3 describe this",
+    ];
+
+    it.each(helperCommands)("does not handle helper command %s", (command) => {
+      expect(adapter.canHandle({ pid: 30, command, cwd: "/repo", tty: "??" })).toBe(false);
+    });
+
+    it.each(agentCommands)("handles agent command %s", (command) => {
+      expect(adapter.canHandle({ pid: 31, command, cwd: "/repo", tty: "ttys003" })).toBe(true);
+    });
+  });
+
   it("still excludes helper subcommands when Codex lives under a path containing spaces", () => {
     const executable = path.join(
       tmpHome,

packages/agent-manager/src/providers/codex/CodexAdapter.ts

@@ -46,6 +46,7 @@ const CODEX_HELPER_SUBCOMMANDS = new Set([
   "a",
   "archive",
   "cloud",
+  "cloud-tasks",
   "completion",
   "debug",
   "delete",
@@ -68,6 +69,21 @@ const CODEX_HELPER_SUBCOMMANDS = new Set([
   "update",
 ]);
 
+/**
+ * Known root Codex subcommand names and aliases, including the hidden ones in
+ * Codex CLI 0.157.1. A variadic flag's values stop at these, as clap stops there.
+ */
+const CODEX_SUBCOMMANDS = new Set([
+  ...CODEX_HELPER_SUBCOMMANDS,
+  "e",
+  "exec",
+  "execpolicy",
+  "fork",
+  "resume",
+  "review",
+  "tcp-tunnel",
+]);
+
 /** Global Codex flags that consume the following argument as their value. */
 const CODEX_VALUE_FLAGS = new Set([
   "-c",
@@ -82,8 +98,6 @@ const CODEX_VALUE_FLAGS = new Set([
   "--ask-for-approval",
   "-C",
   "--cd",
-  "-i",
-  "--image",
   "--add-dir",
   "--enable",
   "--disable",
@@ -92,6 +106,12 @@ const CODEX_VALUE_FLAGS = new Set([
   "--remote-auth-token-env",
 ]);
 
+/**
+ * Global Codex flags that take one or more values (clap `num_args = 1..`).
+ * `-i, --image <FILE>...` is the only one in Codex CLI 0.157.1.
+ */
+const CODEX_VARIADIC_VALUE_FLAGS = new Set(["-i", "--image"]);
+
 const CODEX_APP_SERVER_DAEMON_DIR = "app-server-daemon";
 
 function isCodexHelperCommand(command: string): boolean {
@@ -112,11 +132,21 @@ function firstPositionalArgument(args: string[]): string | undefined {
     const arg = args[index];
     if (arg === "--") return undefined;
     if (!arg.startsWith("-")) return arg;
-    if (!arg.includes("=") && CODEX_VALUE_FLAGS.has(arg)) index++;
+    if (arg.includes("=")) continue;
+    if (CODEX_VALUE_FLAGS.has(arg)) {
+      index++;
+    } else if (CODEX_VARIADIC_VALUE_FLAGS.has(arg)) {
+      // Like clap, take values until the next flag or subcommand name.
+      while (index + 1 < args.length && isVariadicFlagValue(args[index + 1])) index++;
+    }
   }
   return undefined;
 }
 
+function isVariadicFlagValue(arg: string): boolean {
+  return !arg.startsWith("-") && !CODEX_SUBCOMMANDS.has(arg);
+}
+
 interface MappedAgentResult {
   agents: AgentInfo[];
   fallback: ProcessInfo[];