fix

Signed-off-by: SequeI <[email protected]>

Author: SequeI

src/agent/cli/cli_utils.py

@@ -51,6 +51,6 @@ def handle_parse_result(self, ctx, opts, args):
         other_used = [name for name in self.mutually_exclusive if opts.get(name)]
         if other_used and opts.get(self.name):
             raise click.UsageError(
-                f"Option '{self.name.replace('_', '-')}' is mutually exclusive with: {', '.join(other_used)}"
+                f"Option '{self.name.replace('_', '-')}' is mutually exclusive with: {', '.join(n.replace('_', '-') for n in other_used)}"
             )
         return super().handle_parse_result(ctx, opts, args)

src/agent/cli/commands/plugin_manage.py

@@ -73,7 +73,6 @@ def simple_edit_distance(s1: str, s2: str) -> int:
 @click.option(
     "--add-scope",
     "-a",
-    "--add_scope",
     multiple=True,
     cls=MutuallyExclusiveOption,
     mutually_exclusive=["remove_scope"],
@@ -82,22 +81,26 @@ def simple_edit_distance(s1: str, s2: str) -> int:
 @click.option(
     "--remove-scope",
     "-r",
-    "--remove_scope",
     multiple=True,
     cls=MutuallyExclusiveOption,
     mutually_exclusive=["add_scope"],
     help="Remove scopes: -r capability_id::scope (repeatable).",
 )
-@click.option("-n", "--dry-run", is_flag=True, help="Show planned changes only (File diff, no write).")
-@click.option("--config", type=click.Path(path_type=Path), default=Path("agentup.yml"), show_default=True)
+@click.option("-n", "--dry-run", is_flag=True, help="Show planned changes without writing to the file.")
+@click.option(
+    "--config",
+    type=click.Path(path_type=Path, readable=True, dir_okay=False, file_okay=True),
+    default=Path("agentup.yml"),
+    show_default=True,
+)
 @click.pass_context
 def manage(
     ctx: click.Context,
     plugin_name: str,
     add_scope: tuple[str, ...],
     remove_scope: tuple[str, ...],
     dry_run: bool,
-    config: Path | None,
+    config: Path,
 ):
     """Add or remove scopes on a plugin capability in agentup.yml.
 
@@ -106,8 +109,12 @@ def manage(
     agentup plugin manage brave_search -a search_images::search:images:query
     agentup plugin manage brave_search -r search_internet::search:web:query
     """
-    # Resolve config path
-    intent_config_path = config if config else (Path.cwd() / "agentup.yml")
+
+    intent_config_path = config.resolve()
+
+    if not intent_config_path.is_file():
+        click.secho(f"Configuration file not found at '{intent_config_path}'.", fg="red")
+        ctx.exit(1)
 
     # Load config
     try:
@@ -117,7 +124,7 @@ def manage(
         ctx.exit(1)
 
     # Validate plugin exists in config
-    if not intent_config.plugins or plugin_name not in intent_config.plugins:
+    if plugin_name not in intent_config.plugins:
         click.secho(f"Plugin '{plugin_name}' not found in {intent_config_path}", fg="red")
         ctx.exit(1)
 
@@ -163,11 +170,9 @@ def manage(
             click.secho(f"Capability '{capability_id}' not found for plugin '{plugin_name}'.", fg="yellow")
             continue
         cap_override = plugin_override.capabilities[capability_id]
-        scopes = cap_override.required_scopes or []
-        if scope_name in scopes:
+        if cap_override.required_scopes and scope_name in cap_override.required_scopes:
             planned_changes.append(f"DROP scope '{scope_name}' ← capability '{capability_id}' (plugin '{plugin_name}')")
-            scopes.remove(scope_name)
-            cap_override.required_scopes = scopes
+            cap_override.required_scopes = scope_name
             changed = True
         else:
             click.secho(