Merge remote-tracking branch 'origin/cowork/improve-devforge-cli' into cowork/improve-devforge-cli

Author: Coding-Dev-Tools

.github/workflows/cowork-auto-pr.yml

@@ -12,6 +12,14 @@ jobs:
   ensure-pr:
     runs-on: ubuntu-latest
     steps:
+      # gh pr create requires a local git checkout to diff head against base;
+      # without this step every run failed with "not a git repository" and no
+      # PR was ever opened (fleet-wide defect: 11/11 seeded copies lacked it).
+      - name: Check out the pushed branch
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref_name }}
+          fetch-depth: 0
       - name: Open PR for this branch if none exists
         env:
           GH_TOKEN: ${{ github.token }}

src/devforge/cli.py

@@ -153,9 +153,7 @@ def _make_dispatch(tool_name: str):
     """Create a typer command that dispatches to the underlying tool CLI."""
     pkg = TOOLS[tool_name]["package"]
 
-    def dispatch(
-        args: list[str] = typer.Argument(None, help="Arguments to pass to the tool."),  # noqa: B008
-    ):
+    def dispatch(ctx: typer.Context):
         info = TOOLS.get(tool_name)
         if not info:
             console.print(f"[red]Unknown tool: {tool_name}[/red]")
@@ -170,8 +168,12 @@ def dispatch(
             )
             raise typer.Exit(code=1)
 
+        # `ignore_unknown_options` + `allow_extra_args` let tool flags (e.g.
+        # `--config file.yaml`) reach the underlying CLI instead of being
+        # rejected by typer as "No such option".
+        forwarded = list(ctx.args)
         result = subprocess.run(
-            [sys.executable, "-m", module_name] + (args or []),
+            [sys.executable, "-m", module_name] + forwarded,
             capture_output=True,
             text=True,
         )
@@ -183,11 +185,14 @@ def dispatch(
 
     dispatch.__name__ = tool_name
     dispatch.__doc__ = f"Run `{pkg}` commands via the {tool_name} subcommand."
-    return dispatch
+    return app.command(
+        name=tool_name,
+        context_settings={"ignore_unknown_options": True, "allow_extra_args": True},
+    )(dispatch)
 
 
 for cmd_name in TOOLS:
-    app.command(name=cmd_name)(_make_dispatch(cmd_name))
+    _make_dispatch(cmd_name)
 
 
 def main():

tests/test_cli.py

@@ -134,6 +134,27 @@ def test_dispatch_installed_tool_runs(self, mock_run, _mock_installed):
         cmd = mock_run.call_args[0][0]
         assert "api_contract_guardian" in cmd
 
+    @mock.patch("devforge.cli._is_tool_installed", return_value=True)
+    @mock.patch("devforge.cli.subprocess.run")
+    def test_dispatch_forwards_tool_flags(self, mock_run, _mock_installed):
+        """Tool flags (e.g. `--config file.yaml`) must reach the underlying CLI.
+
+        Regression guard for the silent-failure trap where typer rejected any
+        argument beginning with `-` as 'No such option' before the tool ran.
+        With ignore_unknown_options/allow_extra_args, such flags are forwarded
+        via ctx.args.
+        """
+        mock_run.return_value = mock.MagicMock(returncode=0)
+        with mock.patch("devforge.cli.sys.exit"):
+            runner.invoke(app, ["guard", "--config", "x.yaml", "--verbose"])
+        mock_run.assert_called_once()
+        cmd = mock_run.call_args[0][0]
+        # Underlying module is launched...
+        assert "api_contract_guardian" in cmd
+        # ...and the tool flags are forwarded, not swallowed by typer.
+        assert "--config" in cmd
+        assert "x.yaml" in cmd
+        assert "--verbose" in cmd
 
     @mock.patch("devforge.cli._is_tool_installed", return_value=False)
     def test_dispatch_install_hint_escapes_extra_brackets(self, _mock):