refactor: tighten codex toolset parity without freeform (#1014)

src/cli/components/ApprovalDialogRich.tsx

@@ -96,7 +96,13 @@ const DynamicPreview: React.FC<DynamicPreviewProps> = ({
     const cmd =
       typeof cmdVal === "string" ? cmdVal : toolArgs || "(no arguments)";
     const descVal = parsedArgs?.description;
-    const desc = typeof descVal === "string" ? descVal : "";
+    const justificationVal = parsedArgs?.justification;
+    const desc =
+      typeof descVal === "string"
+        ? descVal
+        : typeof justificationVal === "string"
+          ? justificationVal
+          : "";
 
     return (
       <Box flexDirection="column" paddingLeft={2}>

src/cli/components/ApprovalSwitch.tsx

@@ -109,7 +109,11 @@ function getBashInfo(approval: ApprovalRequest): BashInfo | null {
       command =
         typeof args.command === "string" ? args.command : "(no command)";
       description =
-        typeof args.description === "string" ? args.description : "";
+        typeof args.description === "string"
+          ? args.description
+          : typeof args.justification === "string"
+            ? args.justification
+            : "";
     }
 
     return {

src/cli/components/ToolsetSelector.tsx

@@ -48,13 +48,15 @@ const toolsets: ToolsetOption[] = [
     label: "Codex Tools",
     description: "Toolset optimized for GPT/Codex models",
     tools: [
+      "AskUserQuestion",
+      "EnterPlanMode",
+      "ExitPlanMode",
+      "Task",
+      "Skill",
       "ShellCommand",
-      "Shell",
-      "ReadFile",
-      "ListDir",
-      "GrepFiles",
       "ApplyPatch",
       "UpdatePlan",
+      "ViewImage",
     ],
     isFeatured: true,
   },
@@ -62,15 +64,7 @@ const toolsets: ToolsetOption[] = [
     id: "codex_snake",
     label: "Codex Tools (snake_case)",
     description: "Toolset optimized for GPT/Codex models (snake_case)",
-    tools: [
-      "shell_command",
-      "shell",
-      "read_file",
-      "list_dir",
-      "grep_files",
-      "apply_patch",
-      "update_plan",
-    ],
+    tools: ["shell_command", "apply_patch", "update_plan", "view_image"],
   },
   {
     id: "gemini",