fix(cli): address Codex review - flag collision, missing args, compat

1. Remove -w from _reorder_argv global flags — it collides with
   deployment's -w/--wait_on_pending (boolean). --workspace long form
   is still reordered safely. Prevents deployment add -w from being
   misinterpreted as workspace flag.

2. Forward annotation_group to workspace.search_export() in _do_export.
   Also add -g/--annotation-group flag to the canonical search command
   (was only on the hidden search-export alias).

3. Restore -M shorthand on upload alias for backwards compat with
   scripts using `roboflow upload ... -M '{"key":"val"}'`.

283 tests pass, all linting clean.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: yeldarby

roboflow/cli/__init__.py

@@ -145,7 +145,9 @@ def _reorder_argv(argv: list[str]) -> list[str]:
     e.g. ``roboflow project list --json``.  This helper transparently
     re-orders the argv so those flags are consumed by the root parser.
     """
-    global_flags_with_value = {"--api-key", "-k", "--workspace", "-w"}
+    # Note: -w is intentionally excluded — it collides with deployment's
+    # -w/--wait_on_pending (boolean).  --workspace (long form) is safe.
+    global_flags_with_value = {"--api-key", "-k", "--workspace"}
     global_flags_bool = {"--json", "-j", "--quiet", "-q", "--version"}
 
     reordered: list[str] = []

roboflow/cli/handlers/_aliases.py

@@ -44,7 +44,7 @@ def register(subparsers: argparse._SubParsersAction) -> None:  # type: ignore[ty
     upload_p.add_argument("-r", "--retries", dest="num_retries", type=int, default=0, help="Retry count")
     upload_p.add_argument("-b", "--batch", dest="batch", help="Batch name")
     upload_p.add_argument("-t", "--tag", dest="tag_names", help="Comma-separated tag names")
-    upload_p.add_argument("--metadata", dest="metadata", help="JSON metadata string")
+    upload_p.add_argument("-M", "--metadata", dest="metadata", help="JSON metadata string")
     upload_p.add_argument("-c", "--concurrency", dest="concurrency", type=int, default=10, help="Upload concurrency")
     upload_p.add_argument("--is-prediction", dest="is_prediction", action="store_true", help="Mark as prediction")
     upload_p.set_defaults(func=_handle_upload)

roboflow/cli/handlers/search.py

@@ -25,6 +25,13 @@ def register(subparsers: argparse._SubParsersAction) -> None:  # type: ignore[ty
     search_parser.add_argument(
         "-d", "--dataset", dest="dataset", default=None, help="Limit to a specific dataset (project slug)"
     )
+    search_parser.add_argument(
+        "-g",
+        "--annotation-group",
+        dest="annotation_group",
+        default=None,
+        help="Limit export to a specific annotation group",
+    )
     search_parser.add_argument("--name", dest="name", default=None, help="Optional name for the export")
     search_parser.add_argument(
         "--no-extract", dest="no_extract", action="store_true", default=False, help="Keep zip file, skip extraction"
@@ -91,6 +98,7 @@ def _do_export(args: argparse.Namespace, workspace: Any) -> None:
             format=args.format,
             location=args.location,
             dataset=args.dataset,
+            annotation_group=getattr(args, "annotation_group", None),
             name=args.name,
             extract_zip=not args.no_extract,
         )

tests/cli/test_discovery.py

@@ -84,8 +84,10 @@ def test_short_value_flag(self) -> None:
         self.assertEqual(result, ["-k", "abc123", "project", "list"])
 
     def test_multiple_flags_mixed(self) -> None:
+        # -w is NOT reordered (collides with deployment's -w/--wait_on_pending)
+        # but --workspace (long form) and --json are reordered
         result = self._reorder(["project", "list", "--json", "-w", "my-ws"])
-        self.assertEqual(result, ["--json", "-w", "my-ws", "project", "list"])
+        self.assertEqual(result, ["--json", "project", "list", "-w", "my-ws"])
 
     def test_value_flag_at_end_without_value(self) -> None:
         """A value flag at the very end with no following arg should still be moved."""