fix(cli): support unquoted multi-word --content values

Elixir 1.18+ OptionParser in strict mode consumes only one
token after a flag, so --content Code review approved
parsed as content='Code' and 'review approved' as extra
positional args, which CliMate rejected with
'unexpected extra argument review'.

Added a pre-parse pass in AdoCli.CLI.run/1 that detects
flags in @multivalue_opts (--content --message --body
--description --reason --summary --text) and joins all
subsequent non-flag tokens into a single value using the
--flag=value syntax. This makes the common case of
unquoted multi-word content work without forcing users
to remember shell quoting rules.

Applies to:
  * ado prs comments add/update --content
  * ado prs create --description
  * any other command using these option names

The @<file> and - (stdin) shorthands still work because
those don't continue the flag sequence.

Added 12 unit tests in test/ado_cli/cli_test.exs covering
single-word, multi-word, --status-after, = syntax, -/,
@file, and combination cases. Updated help text and
ado-cli skill to document the new behavior.

337 tests pass, credo clean, dialyzer clean.

Author: gilbertwong96

lib/ado_cli/cli.ex

@@ -160,6 +160,7 @@ defmodule AdoCli.CLI do
       System.halt(0)
     end
 
+    args = join_multivalue_opts(args)
     parsed = parse_or_halt!(args, @command)
 
     # Apply global options to runtime env for auth resolution
@@ -168,6 +169,46 @@ defmodule AdoCli.CLI do
     parsed.execute.()
   end
 
+  # String options that should consume all subsequent non-flag tokens.
+  # Without this, `--content foo bar baz` would parse as content=foo
+  # and bar/baz as extra positional args, which CliMate rejects.
+  # This is the same convention as `curl --data`, `tar -cf`, etc.
+  @multivalue_opts ~w(--content --message --body --description --reason --summary --text)
+
+  def join_multivalue_opts(args) do
+    join_multivalue_opts(args, [])
+  end
+
+  defp join_multivalue_opts([], result), do: Enum.reverse(result)
+
+  defp join_multivalue_opts([arg | rest], result) do
+    if arg in @multivalue_opts do
+      {joined, remaining} = take_multivalue_tokens(rest)
+      join_multivalue_opts(remaining, ["#{arg}=#{joined}" | result])
+    else
+      join_multivalue_opts(rest, [arg | result])
+    end
+  end
+
+  # Collects consecutive non-flag tokens after a multivalue flag like
+  # --content, stopping at the next flag. Returns the joined string
+  # and the leftover args (so a subsequent --status can still parse).
+  defp take_multivalue_tokens(tokens) do
+    take_multivalue_tokens(tokens, [])
+  end
+
+  defp take_multivalue_tokens([arg | rest] = tokens, acc) do
+    if String.starts_with?(arg, "-") and arg != "-" do
+      {join_words(Enum.reverse(acc)), tokens}
+    else
+      take_multivalue_tokens(rest, [arg | acc])
+    end
+  end
+
+  defp take_multivalue_tokens([], acc), do: {join_words(Enum.reverse(acc)), []}
+
+  defp join_words(words), do: Enum.join(words, " ")
+
   defp apply_global_opts(opts) do
     if org = opts[:org], do: :persistent_term.put({:ado_cli, :org}, org)
     if pat = opts[:pat], do: :persistent_term.put({:ado_cli, :pat}, pat)

lib/ado_cli/cli/pull_requests.ex

@@ -244,8 +244,10 @@ defmodule AdoCli.CLI.PullRequests do
                 content: [
                   type: :string,
                   doc:
-                    "New comment content. Supports @<file> to read from a file " <>
-                      "or - to read from stdin. Omit to update status only.",
+                    "New comment content. Multi-word values do NOT need quoting " <>
+                      "— all subsequent args are joined until the next flag. " <>
+                      "Use @<file> to read from a file or `-` to read from stdin. " <>
+                      "Omit to update status only.",
                   doc_arg: "TEXT"
                 ],
                 status: [
@@ -287,7 +289,11 @@ defmodule AdoCli.CLI.PullRequests do
                 content: [
                   type: :string,
                   required: true,
-                  doc: "Comment text (markdown allowed)",
+                  doc:
+                    "Comment text (markdown allowed). Multi-word values do NOT " <>
+                      "need quoting — all subsequent args are joined until the " <>
+                      "next flag. Use @<file> to read from a file or `-` to read " <>
+                      "from stdin.",
                   doc_arg: "TEXT"
                 ],
                 file_path: [

priv/skills/ado-cli/SKILL.md

@@ -193,10 +193,12 @@ ado prs reviewers list MyProject MyRepo 42
 ado prs reviewers add MyProject MyRepo 42 --reviewer USER_GUID
 ado prs reviewers remove MyProject MyRepo 42 --reviewer USER_GUID
 
-# Review PR comments
-ado prs comments add MyProject MyRepo 42 --content "LGTM!"
+# Review PR comments (multi-word --content does not need quoting)
+ado prs comments add MyProject MyRepo 42 --content LGTM ship it
+ado prs comments add MyProject MyRepo 42 --content @notes.md
+echo "review body" | ado prs comments add MyProject MyRepo 42 --content -
 ado prs comments list MyProject MyRepo 42 --all
-ado prs comments update MyProject MyRepo 42 7 5 --content "updated" --status fixed
+ado prs comments update MyProject MyRepo 42 7 5 --content updated text --status fixed
 
 # Trigger a pipeline with variables
 ado pipelines run MyProject 42 --branch main --variables "ENV=staging,DEBUG=true"

test/ado_cli/cli_test.exs

@@ -0,0 +1,98 @@
+defmodule AdoCli.CLITest do
+  use ExUnit.Case, async: true
+
+  # The public entry point is the same one used by escript/Burrito.
+  # We test join_multivalue_opts indirectly by calling run/1 with
+  # a list of args and observing the parsed execute function's
+  # arguments. To keep the test focused, we test the
+  # join_multivalue_opts/1 helper directly.
+  describe "join_multivalue_opts/1" do
+    test "joins unquoted multi-word content into --content=value" do
+      args = ["--content", "Code", "review", "approved", "and", "merged."]
+
+      assert AdoCli.CLI.join_multivalue_opts(args) == [
+               "--content=Code review approved and merged."
+             ]
+    end
+
+    test "leaves --content with --status after intact" do
+      args = ["--content", "Code", "review", "--status", "active"]
+
+      assert AdoCli.CLI.join_multivalue_opts(args) == [
+               "--content=Code review",
+               "--status",
+               "active"
+             ]
+    end
+
+    test "leaves single-word --content unchanged" do
+      args = ["--content", "Approved"]
+      assert AdoCli.CLI.join_multivalue_opts(args) == ["--content=Approved"]
+    end
+
+    test "handles --content=... pre-joined form" do
+      args = ["--content=Code review", "--status", "active"]
+
+      assert AdoCli.CLI.join_multivalue_opts(args) == [
+               "--content=Code review",
+               "--status",
+               "active"
+             ]
+    end
+
+    test "leaves --content - (stdin) alone" do
+      args = ["--content", "-"]
+      assert AdoCli.CLI.join_multivalue_opts(args) == ["--content=-"]
+    end
+
+    test "leaves --content @file alone" do
+      args = ["--content", "@/tmp/note.md"]
+      assert AdoCli.CLI.join_multivalue_opts(args) == ["--content=@/tmp/note.md"]
+    end
+
+    test "stops at the next flag even with quoted-looking words" do
+      args = ["--content", "LGTM!", "--json"]
+      assert AdoCli.CLI.join_multivalue_opts(args) == ["--content=LGTM!", "--json"]
+    end
+
+    test "preserves unrelated args around the multivalue" do
+      args = ["--org", "myorg", "pos1", "pos2", "--content", "hello world", "--json"]
+
+      assert AdoCli.CLI.join_multivalue_opts(args) == [
+               "--org",
+               "myorg",
+               "pos1",
+               "pos2",
+               "--content=hello world",
+               "--json"
+             ]
+    end
+
+    test "applies to --description too" do
+      args = ["--description", "This is a", "multi-line", "description"]
+
+      assert AdoCli.CLI.join_multivalue_opts(args) == [
+               "--description=This is a multi-line description"
+             ]
+    end
+
+    test "joins empty list at end of args" do
+      args = ["--content", "hello", "world"]
+      assert AdoCli.CLI.join_multivalue_opts(args) == ["--content=hello world"]
+    end
+
+    test "handles multiple multivalue options" do
+      args = ["--content", "foo bar", "--description", "baz qux"]
+
+      assert AdoCli.CLI.join_multivalue_opts(args) == [
+               "--content=foo bar",
+               "--description=baz qux"
+             ]
+    end
+
+    test "leaves other flags untouched" do
+      args = ["--json", "--org", "myorg"]
+      assert AdoCli.CLI.join_multivalue_opts(args) == ["--json", "--org", "myorg"]
+    end
+  end
+end