keepassxc-cli 1.6.0__tar.gz → 2.0.0__tar.gz

{keepassxc_cli-1.6.0 → keepassxc_cli-2.0.0}/CLAUDE.md

@@ -13,19 +13,21 @@ keepassxc_cli/
 ├── __init__.py          # empty (just from __future__ import annotations)
 ├── __main__.py          # CLI entry point; argument parsing; dispatches to commands
 ├── config.py            # CliConfig dataclass; save/load ~/.keepassxc/cli.json
-├── output.py            # Output formatting: table, json
+├── output.py            # Output formatting: table, json; ensure_scheme() URL helper
 └── commands/
     ├── __init__.py      # empty
     ├── setup.py         # associate with KeePassXC
     ├── status.py        # show connection/association status
     ├── show.py          # show entries by URL
-    ├── add.py           # add new entry
-    ├── edit.py          # edit existing entry by UUID
-    ├── rm.py            # delete entry by UUID
+    ├── add.py           # add new entry: positional url/username, --group/--group-uuid optional
+    ├── edit.py          # edit existing entry: positional url, --uuid/--username/--password optional
+    ├── rm.py            # delete entry: positional url, --uuid optional for disambiguation
     ├── totp.py          # get TOTP code
-    ├── clip.py          # copy field to clipboard
+    ├── clip.py          # copy field to clipboard: positional url then field
     ├── lock.py          # lock database
-    └── mkdir.py         # create group
+    ├── mkdir.py         # create group
+    ├── group_uuid.py    # look up a group UUID by path
+    └── version.py       # print installed package version
 
 tests/
 ├── conftest.py          # fixtures: mock_entry, mock_group, mock_browser_config, mock_client
@@ -109,6 +111,7 @@ ruff check --ignore=E501 --exclude=__init__.py ./keepassxc_cli
   | `4` | `ProtocolError(error_code=6 or 19)` — access denied by user |
 
 - **Config permissions**: Config files are written with `0o600` (owner read/write only).
+- **URL normalisation**: All URL-accepting command `run()` functions call `ensure_scheme(url)` (from `output.py`) before passing the URL to any `BrowserClient` method. This auto-prepends `https://` for bare hostnames (e.g. `example.com`) and emits a `logger.warning`. KeePassXC derives the entry title from `QUrl(url).host()`, which returns `""` for URLs without a scheme.
 - **Venv**: Always use `.venv` for development.
 - **Python ≥ 3.10** required.
 - **Password visibility**: `show` omits password and TOTP entirely when `-p` is not passed (no masking).

{keepassxc_cli-1.6.0/keepassxc_cli.egg-info → keepassxc_cli-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: keepassxc-cli
-Version: 1.6.0
+Version: 2.0.0
 Summary: CLI for KeePassXC using the browser extension protocol with biometric unlock
 License-Expression: MIT
 Requires-Python: >=3.10
@@ -86,6 +86,8 @@ keepassxc-cli status -j
 
 ### Commands
 
+> **URL scheme**: All commands that accept a URL argument require a scheme (`https://` or `http://`). If you pass a bare hostname (e.g. `example.com`), the CLI will automatically prepend `https://` and emit a warning. KeePassXC derives the entry title from `QUrl(url).host()`, which returns an empty string for URLs without a scheme.
+
 #### `setup` — Associate with KeePassXC
 
 ```bash
@@ -119,19 +121,20 @@ keepassxc-cli totp https://github.com -j
 #### `clip` — Copy a field to clipboard
 
 ```bash
-keepassxc-cli clip password https://github.com
-keepassxc-cli clip username https://github.com
-keepassxc-cli clip totp     https://github.com
+keepassxc-cli clip https://github.com password
+keepassxc-cli clip https://github.com username
+keepassxc-cli clip https://github.com totp
 ```
 
 #### `add` — Add a new entry
 
 ```bash
 # Password is prompted securely if --password is not given
-keepassxc-cli add --url https://example.com --username user@example.com
-keepassxc-cli add --url https://example.com --username user --password mypass
-# Place the entry in a specific group by UUID
-keepassxc-cli add --url https://example.com --username user --group-uuid <group-uuid>
+keepassxc-cli add https://example.com user@example.com
+keepassxc-cli add https://example.com user --password mypass
+# Place the entry in a specific group by UUID or by path
+keepassxc-cli add https://example.com user --group-uuid <group-uuid>
+keepassxc-cli add https://example.com user --group "Work/Projects"
 ```
 
 > **Note**: The entry title is always derived from the URL hostname by KeePassXC. The protocol has no field to set a custom title.
@@ -139,19 +142,20 @@ keepassxc-cli add --url https://example.com --username user --group-uuid <group-
 #### `edit` — Edit an entry
 
 ```bash
-# Get the UUID first
-keepassxc-cli show https://github.com -p
-
-# Then edit — --url is required to resolve the current entry
-keepassxc-cli edit <uuid> --url https://github.com --username newuser
-keepassxc-cli edit <uuid> --url https://github.com --password newpass --title "New Title"
+# URL is positional; --uuid is optional when the URL matches exactly one entry
+keepassxc-cli edit https://github.com --username newuser
+keepassxc-cli edit https://github.com --password newpass
+# Specify --uuid explicitly when the URL matches multiple entries
+keepassxc-cli edit https://github.com --uuid <uuid> --username newuser
 ```
 
 #### `rm` — Delete an entry
 
 ```bash
-keepassxc-cli rm <uuid>        # prompts for confirmation
-keepassxc-cli rm <uuid> --yes  # skip confirmation
+keepassxc-cli rm https://example.com         # prompts for confirmation
+keepassxc-cli rm https://example.com --yes   # skip confirmation
+# Specify --uuid when URL matches multiple entries
+keepassxc-cli rm https://example.com --uuid <uuid> --yes
 ```
 
 #### `lock` — Lock the database

{keepassxc_cli-1.6.0 → keepassxc_cli-2.0.0}/README.md

@@ -71,6 +71,8 @@ keepassxc-cli status -j
 
 ### Commands
 
+> **URL scheme**: All commands that accept a URL argument require a scheme (`https://` or `http://`). If you pass a bare hostname (e.g. `example.com`), the CLI will automatically prepend `https://` and emit a warning. KeePassXC derives the entry title from `QUrl(url).host()`, which returns an empty string for URLs without a scheme.
+
 #### `setup` — Associate with KeePassXC
 
 ```bash
@@ -104,19 +106,20 @@ keepassxc-cli totp https://github.com -j
 #### `clip` — Copy a field to clipboard
 
 ```bash
-keepassxc-cli clip password https://github.com
-keepassxc-cli clip username https://github.com
-keepassxc-cli clip totp     https://github.com
+keepassxc-cli clip https://github.com password
+keepassxc-cli clip https://github.com username
+keepassxc-cli clip https://github.com totp
 ```
 
 #### `add` — Add a new entry
 
 ```bash
 # Password is prompted securely if --password is not given
-keepassxc-cli add --url https://example.com --username user@example.com
-keepassxc-cli add --url https://example.com --username user --password mypass
-# Place the entry in a specific group by UUID
-keepassxc-cli add --url https://example.com --username user --group-uuid <group-uuid>
+keepassxc-cli add https://example.com user@example.com
+keepassxc-cli add https://example.com user --password mypass
+# Place the entry in a specific group by UUID or by path
+keepassxc-cli add https://example.com user --group-uuid <group-uuid>
+keepassxc-cli add https://example.com user --group "Work/Projects"
 ```
 
 > **Note**: The entry title is always derived from the URL hostname by KeePassXC. The protocol has no field to set a custom title.
@@ -124,19 +127,20 @@ keepassxc-cli add --url https://example.com --username user --group-uuid <group-
 #### `edit` — Edit an entry
 
 ```bash
-# Get the UUID first
-keepassxc-cli show https://github.com -p
-
-# Then edit — --url is required to resolve the current entry
-keepassxc-cli edit <uuid> --url https://github.com --username newuser
-keepassxc-cli edit <uuid> --url https://github.com --password newpass --title "New Title"
+# URL is positional; --uuid is optional when the URL matches exactly one entry
+keepassxc-cli edit https://github.com --username newuser
+keepassxc-cli edit https://github.com --password newpass
+# Specify --uuid explicitly when the URL matches multiple entries
+keepassxc-cli edit https://github.com --uuid <uuid> --username newuser
 ```
 
 #### `rm` — Delete an entry
 
 ```bash
-keepassxc-cli rm <uuid>        # prompts for confirmation
-keepassxc-cli rm <uuid> --yes  # skip confirmation
+keepassxc-cli rm https://example.com         # prompts for confirmation
+keepassxc-cli rm https://example.com --yes   # skip confirmation
+# Specify --uuid when URL matches multiple entries
+keepassxc-cli rm https://example.com --uuid <uuid> --yes
 ```
 
 #### `lock` — Lock the database

{keepassxc_cli-1.6.0 → keepassxc_cli-2.0.0}/keepassxc_cli/__main__.py

@@ -48,13 +48,13 @@ def main() -> None:
     setup.add_parser(subparsers)
     status.add_parser(subparsers, fmt_parent)
     show.add_parser(subparsers, fmt_parent)
-    add.add_parser(subparsers)
-    edit.add_parser(subparsers)
-    rm.add_parser(subparsers)
+    add.add_parser(subparsers, fmt_parent)
+    edit.add_parser(subparsers, fmt_parent)
+    rm.add_parser(subparsers, fmt_parent)
     totp.add_parser(subparsers, fmt_parent)
-    clip.add_parser(subparsers)
-    lock.add_parser(subparsers)
-    mkdir.add_parser(subparsers)
+    clip.add_parser(subparsers, fmt_parent)
+    lock.add_parser(subparsers, fmt_parent)
+    mkdir.add_parser(subparsers, fmt_parent)
     group_uuid.add_parser(subparsers, fmt_parent)
     version.add_parser(subparsers)
 

{keepassxc_cli-1.6.0 → keepassxc_cli-2.0.0}/keepassxc_cli/commands/add.py

@@ -8,14 +8,16 @@ from pathlib import Path
 from keepassxc_browser_api import BrowserClient, BrowserConfig
 
 from keepassxc_cli.config import CliConfig
+from keepassxc_cli.output import ensure_scheme, print_result
 
 logger = logging.getLogger(__name__)
 
 
-def add_parser(subparsers: argparse._SubParsersAction) -> None:
-    p = subparsers.add_parser("add", help="Add a new entry")
-    p.add_argument("--url", required=True, help="Entry URL")
-    p.add_argument("--username", required=True, help="Username")
+def add_parser(subparsers: argparse._SubParsersAction, fmt_parent: argparse.ArgumentParser | None = None) -> None:
+    parents = [fmt_parent] if fmt_parent else []
+    p = subparsers.add_parser("add", parents=parents, help="Add a new entry")
+    p.add_argument("url", help="Entry URL")
+    p.add_argument("username", help="Username")
     p.add_argument("--password", default=None, help="Password (prompted if omitted)")
     group = p.add_mutually_exclusive_group()
     group.add_argument("--group-uuid", default="", help="Target group UUID")
@@ -32,6 +34,7 @@ def run(
     *,
     fmt: str = "table",
 ) -> int:
+    url = ensure_scheme(args.url)
     password = args.password
     if password is None:
         password = getpass.getpass("Password: ")
@@ -53,10 +56,10 @@ def run(
         group_uuid = matched.uuid
 
     client.set_login(
-        url=args.url,
+        url=url,
         username=args.username,
         password=password,
         group_uuid=group_uuid,
     )
-    print("Entry added successfully.")
+    print_result("Entry added.", fmt)
     return 0

{keepassxc_cli-1.6.0 → keepassxc_cli-2.0.0}/keepassxc_cli/commands/clip.py

@@ -7,18 +7,20 @@ from pathlib import Path
 from keepassxc_browser_api import BrowserClient, BrowserConfig
 
 from keepassxc_cli.config import CliConfig
+from keepassxc_cli.output import ensure_scheme
 
 logger = logging.getLogger(__name__)
 
 
-def add_parser(subparsers: argparse._SubParsersAction) -> None:
-    p = subparsers.add_parser("clip", help="Copy a field to clipboard")
+def add_parser(subparsers: argparse._SubParsersAction, fmt_parent: argparse.ArgumentParser | None = None) -> None:
+    parents = [fmt_parent] if fmt_parent else []
+    p = subparsers.add_parser("clip", parents=parents, help="Copy a field to clipboard")
+    p.add_argument("url", help="URL to look up")
     p.add_argument(
         "field",
         choices=["password", "username", "totp"],
         help="Field to copy: password, username, or totp",
     )
-    p.add_argument("url", help="URL to look up")
     p.set_defaults(func=run)
 
 
@@ -37,7 +39,7 @@ def run(
         logger.error("pyperclip is required for clipboard support. Install it with: pip install pyperclip")
         return 1
 
-    entries = client.get_logins(args.url)
+    entries = client.get_logins(ensure_scheme(args.url))
     if not entries:
         logger.warning("No entries found for: %s", args.url)
         return 1

{keepassxc_cli-1.6.0 → keepassxc_cli-2.0.0}/keepassxc_cli/commands/edit.py

@@ -7,20 +7,23 @@ from pathlib import Path
 from keepassxc_browser_api import BrowserClient, BrowserConfig
 
 from keepassxc_cli.config import CliConfig
+from keepassxc_cli.output import ensure_scheme, print_result
 
 logger = logging.getLogger(__name__)
 
 
-def add_parser(subparsers: argparse._SubParsersAction) -> None:
+def add_parser(subparsers: argparse._SubParsersAction, fmt_parent: argparse.ArgumentParser | None = None) -> None:
+    parents = [fmt_parent] if fmt_parent else []
     p = subparsers.add_parser(
         "edit",
+        parents=parents,
         help="Edit an existing entry",
         description=(
-            "Edit an existing entry. Provide --url to look up the entry; omitted fields are\n"
-            "left unchanged. If the URL matches multiple entries, specify --uuid to disambiguate."
+            "Edit an existing entry by URL. Omitted fields are left unchanged.\n"
+            "If the URL matches multiple entries, specify --uuid to disambiguate."
         ),
     )
-    p.add_argument("--url", required=True, help="URL of the entry")
+    p.add_argument("url", help="URL of the entry")
     p.add_argument("--uuid", default=None, help="UUID of the entry (required when URL matches multiple entries)")
     p.add_argument("--username", default=None, help="New username")
     p.add_argument("--password", default=None, help="New password")
@@ -36,7 +39,8 @@ def run(
     *,
     fmt: str = "table",
 ) -> int:
-    entries = client.get_logins(args.url)
+    url = ensure_scheme(args.url)
+    entries = client.get_logins(url)
 
     if not entries:
         logger.error("No entries found for: %s", args.url)
@@ -62,11 +66,11 @@ def run(
         return 1
 
     client.set_login(
-        url=args.url,
+        url=url,
         username=args.username if args.username is not None else entry.login,
         password=args.password if args.password is not None else entry.password,
         uuid=entry.uuid,
         group_uuid=entry.group_uuid,
     )
-    print("Entry updated successfully.")
+    print_result("Entry updated.", fmt)
     return 0

{keepassxc_cli-1.6.0 → keepassxc_cli-2.0.0}/keepassxc_cli/commands/lock.py

@@ -7,12 +7,14 @@ from pathlib import Path
 from keepassxc_browser_api import BrowserClient, BrowserConfig
 
 from keepassxc_cli.config import CliConfig
+from keepassxc_cli.output import print_result
 
 logger = logging.getLogger(__name__)
 
 
-def add_parser(subparsers: argparse._SubParsersAction) -> None:
-    p = subparsers.add_parser("lock", help="Lock the KeePassXC database")
+def add_parser(subparsers: argparse._SubParsersAction, fmt_parent: argparse.ArgumentParser | None = None) -> None:
+    parents = [fmt_parent] if fmt_parent else []
+    p = subparsers.add_parser("lock", parents=parents, help="Lock the KeePassXC database")
     p.set_defaults(func=run)
 
 
@@ -27,7 +29,7 @@ def run(
 ) -> int:
     success = client.lock_database()
     if success:
-        print("Database locked.")
+        print_result("Database locked.", fmt)
         return 0
     else:
         logger.error("Failed to lock database.")

{keepassxc_cli-1.6.0 → keepassxc_cli-2.0.0}/keepassxc_cli/commands/mkdir.py

@@ -1,18 +1,21 @@
 from __future__ import annotations
 
 import argparse
+import json
 import logging
 from pathlib import Path
 
 from keepassxc_browser_api import BrowserClient, BrowserConfig
 
 from keepassxc_cli.config import CliConfig
+from keepassxc_cli.output import print_result
 
 logger = logging.getLogger(__name__)
 
 
-def add_parser(subparsers: argparse._SubParsersAction) -> None:
-    p = subparsers.add_parser("mkdir", help="Create a new group")
+def add_parser(subparsers: argparse._SubParsersAction, fmt_parent: argparse.ArgumentParser | None = None) -> None:
+    parents = [fmt_parent] if fmt_parent else []
+    p = subparsers.add_parser("mkdir", parents=parents, help="Create a new group")
     p.add_argument(
         "name",
         help="Group name or path. Use '/' to create nested groups (e.g. 'Work/Projects').",
@@ -30,5 +33,8 @@ def run(
     fmt: str = "table",
 ) -> int:
     group = client.create_group(args.name)
-    print(f"Group created: {group.name} [{group.uuid}]")
+    if fmt == "json":
+        print(json.dumps({"name": group.name, "uuid": group.uuid}, indent=2))
+    else:
+        print_result(f"Group created: {group.name} [{group.uuid}]", fmt)
     return 0

keepassxc_cli-2.0.0/keepassxc_cli/commands/rm.py

@@ -0,0 +1,63 @@
+from __future__ import annotations
+
+import argparse
+import logging
+from pathlib import Path
+
+from keepassxc_browser_api import BrowserClient, BrowserConfig
+
+from keepassxc_cli.config import CliConfig
+from keepassxc_cli.output import ensure_scheme, print_result
+
+logger = logging.getLogger(__name__)
+
+
+def add_parser(subparsers: argparse._SubParsersAction, fmt_parent: argparse.ArgumentParser | None = None) -> None:
+    parents = [fmt_parent] if fmt_parent else []
+    p = subparsers.add_parser("rm", parents=parents, help="Delete an entry")
+    p.add_argument("url", help="URL of the entry to delete")
+    p.add_argument("--uuid", default=None, help="UUID to disambiguate when URL matches multiple entries")
+    p.add_argument("-y", "--yes", action="store_true", help="Skip confirmation prompt")
+    p.set_defaults(func=run)
+
+
+def run(
+    client: BrowserClient,
+    args: argparse.Namespace,
+    cli_config: CliConfig,
+    browser_config: BrowserConfig,
+    browser_config_path: Path,
+    *,
+    fmt: str = "table",
+) -> int:
+    entries = client.get_logins(ensure_scheme(args.url))
+    if not entries:
+        logger.error("No entries found for: %s", args.url)
+        return 1
+
+    if args.uuid is not None:
+        entry = next((e for e in entries if e.uuid == args.uuid), None)
+        if entry is None:
+            logger.error("Entry %s not found for URL: %s", args.uuid, args.url)
+            return 1
+    elif len(entries) == 1:
+        entry = entries[0]
+    else:
+        logger.error(
+            "Multiple entries found for %s \u2014 specify --uuid to disambiguate:",
+            args.url,
+        )
+        for e in entries:
+            print(f"  {e.uuid}  {e.login}  ({e.name})")
+        return 1
+
+    label = f"{entry.name} ({args.url})"
+    if not args.yes:
+        answer = input(f"Delete entry {label}? [y/N] ").strip().lower()
+        if answer != "y":
+            print("Aborted.")
+            return 1
+
+    client.delete_entry(entry.uuid)
+    print_result("Entry deleted.", fmt)
+    return 0

{keepassxc_cli-1.6.0 → keepassxc_cli-2.0.0}/keepassxc_cli/commands/show.py

@@ -7,7 +7,7 @@ from pathlib import Path
 from keepassxc_browser_api import BrowserClient, BrowserConfig
 
 from keepassxc_cli.config import CliConfig
-from keepassxc_cli.output import print_entry_detail
+from keepassxc_cli.output import ensure_scheme, print_entry_detail
 
 logger = logging.getLogger(__name__)
 
@@ -30,9 +30,10 @@ def run(
     *,
     fmt: str = "table",
 ) -> int:
-    entries = client.get_logins(args.url)
+    url = ensure_scheme(args.url)
+    entries = client.get_logins(url)
     if not entries:
-        logger.warning("No entries found for: %s", args.url)
+        logger.warning("No entries found for: %s", url)
         return 1
     for entry in entries:
         print_entry_detail(entry, fmt, show_password=args.show_password, show_kph_prefix=getattr(args, "show_kph_prefix", False))

{keepassxc_cli-1.6.0 → keepassxc_cli-2.0.0}/keepassxc_cli/commands/totp.py

@@ -7,7 +7,7 @@ from pathlib import Path
 from keepassxc_browser_api import BrowserClient, BrowserConfig
 
 from keepassxc_cli.config import CliConfig
-from keepassxc_cli.output import print_totp
+from keepassxc_cli.output import ensure_scheme, print_totp
 
 logger = logging.getLogger(__name__)
 
@@ -28,7 +28,7 @@ def run(
     *,
     fmt: str = "table",
 ) -> int:
-    entries = client.get_logins(args.url)
+    entries = client.get_logins(ensure_scheme(args.url))
     if not entries:
         logger.warning("No entries found for: %s", args.url)
         return 1

{keepassxc_cli-1.6.0 → keepassxc_cli-2.0.0}/keepassxc_cli/output.py

@@ -1,11 +1,22 @@
 from __future__ import annotations
 
 import json
+import logging
 
 from keepassxc_browser_api import Entry
 
 _KPH_PREFIX = "KPH: "
 
+logger = logging.getLogger(__name__)
+
+
+def ensure_scheme(url: str) -> str:
+    """Return url with a scheme. Prepends https:// with a warning if none is present."""
+    if url.startswith("http://") or url.startswith("https://"):
+        return url
+    logger.warning("URL %r has no scheme, assuming https://", url)
+    return "https://" + url
+
 
 def _strip_kph(key: str) -> str:
     return key[len(_KPH_PREFIX):] if key.startswith(_KPH_PREFIX) else key
@@ -64,6 +75,13 @@ def print_totp(totp: str, fmt: str = "table") -> None:
     print(totp)
 
 
+def print_result(message: str, fmt: str = "table") -> None:
+    if fmt == "json":
+        print(json.dumps({"status": "ok", "message": message}, indent=2))
+        return
+    print(message)
+
+
 def print_status(info: dict, fmt: str = "table") -> None:
     if fmt == "json":
         print(json.dumps(info, indent=2))

{keepassxc_cli-1.6.0 → keepassxc_cli-2.0.0/keepassxc_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: keepassxc-cli
-Version: 1.6.0
+Version: 2.0.0
 Summary: CLI for KeePassXC using the browser extension protocol with biometric unlock
 License-Expression: MIT
 Requires-Python: >=3.10
@@ -86,6 +86,8 @@ keepassxc-cli status -j
 
 ### Commands
 
+> **URL scheme**: All commands that accept a URL argument require a scheme (`https://` or `http://`). If you pass a bare hostname (e.g. `example.com`), the CLI will automatically prepend `https://` and emit a warning. KeePassXC derives the entry title from `QUrl(url).host()`, which returns an empty string for URLs without a scheme.
+
 #### `setup` — Associate with KeePassXC
 
 ```bash
@@ -119,19 +121,20 @@ keepassxc-cli totp https://github.com -j
 #### `clip` — Copy a field to clipboard
 
 ```bash
-keepassxc-cli clip password https://github.com
-keepassxc-cli clip username https://github.com
-keepassxc-cli clip totp     https://github.com
+keepassxc-cli clip https://github.com password
+keepassxc-cli clip https://github.com username
+keepassxc-cli clip https://github.com totp
 ```
 
 #### `add` — Add a new entry
 
 ```bash
 # Password is prompted securely if --password is not given
-keepassxc-cli add --url https://example.com --username user@example.com
-keepassxc-cli add --url https://example.com --username user --password mypass
-# Place the entry in a specific group by UUID
-keepassxc-cli add --url https://example.com --username user --group-uuid <group-uuid>
+keepassxc-cli add https://example.com user@example.com
+keepassxc-cli add https://example.com user --password mypass
+# Place the entry in a specific group by UUID or by path
+keepassxc-cli add https://example.com user --group-uuid <group-uuid>
+keepassxc-cli add https://example.com user --group "Work/Projects"
 ```
 
 > **Note**: The entry title is always derived from the URL hostname by KeePassXC. The protocol has no field to set a custom title.
@@ -139,19 +142,20 @@ keepassxc-cli add --url https://example.com --username user --group-uuid <group-
 #### `edit` — Edit an entry
 
 ```bash
-# Get the UUID first
-keepassxc-cli show https://github.com -p
-
-# Then edit — --url is required to resolve the current entry
-keepassxc-cli edit <uuid> --url https://github.com --username newuser
-keepassxc-cli edit <uuid> --url https://github.com --password newpass --title "New Title"
+# URL is positional; --uuid is optional when the URL matches exactly one entry
+keepassxc-cli edit https://github.com --username newuser
+keepassxc-cli edit https://github.com --password newpass
+# Specify --uuid explicitly when the URL matches multiple entries
+keepassxc-cli edit https://github.com --uuid <uuid> --username newuser
 ```
 
 #### `rm` — Delete an entry
 
 ```bash
-keepassxc-cli rm <uuid>        # prompts for confirmation
-keepassxc-cli rm <uuid> --yes  # skip confirmation
+keepassxc-cli rm https://example.com         # prompts for confirmation
+keepassxc-cli rm https://example.com --yes   # skip confirmation
+# Specify --uuid when URL matches multiple entries
+keepassxc-cli rm https://example.com --uuid <uuid> --yes
 ```
 
 #### `lock` — Lock the database

{keepassxc_cli-1.6.0 → keepassxc_cli-2.0.0}/tests/test_commands.py

@@ -44,6 +44,7 @@ def make_args(**kwargs) -> argparse.Namespace:
         "uuid": "abcdef12-0000-0000-0000-000000000000",
         "name": "NewGroup",
         "path": "Work",
+        "json_output": False,
     }
     defaults.update(kwargs)
     return argparse.Namespace(**defaults)
@@ -136,6 +137,15 @@ class TestShowCommand:
         assert rc == 1
         assert any("No entries" in r.message for r in caplog.records)
 
+    def test_url_no_scheme_prefixed(self, mock_client, cli_config, browser_config, browser_config_path, caplog, mock_entry):
+        entry = mock_entry()
+        mock_client.get_logins.return_value = [entry]
+        args = make_args(url="example.com", show_password=False)
+        rc = show.run(mock_client, args, cli_config, browser_config, browser_config_path)
+        assert rc == 0
+        mock_client.get_logins.assert_called_once_with("https://example.com")
+        assert any("no scheme" in r.message.lower() for r in caplog.records)
+
 
 # --- add ---
 
@@ -169,6 +179,15 @@ class TestAddCommand:
         assert rc == 1
         assert any("not found" in r.message.lower() for r in caplog.records)
 
+    def test_url_no_scheme_prefixed(self, mock_client, cli_config, browser_config, browser_config_path, caplog):
+        mock_client.set_login.return_value = True
+        args = make_args(url="example.com", username="u", password="p", group_uuid="", group=None)
+        rc = add.run(mock_client, args, cli_config, browser_config, browser_config_path)
+        assert rc == 0
+        call_kwargs = mock_client.set_login.call_args.kwargs
+        assert call_kwargs["url"] == "https://example.com"
+        assert any("no scheme" in r.message.lower() for r in caplog.records)
+
     def test_failure_propagates(self, mock_client, cli_config, browser_config, browser_config_path):
         mock_client.set_login.side_effect = ProtocolError("access denied", error_code=6)
         args = make_args(url="https://example.com", username="u", password="p", group_uuid="", group=None)
@@ -228,22 +247,25 @@ class TestEditCommand:
 # --- rm ---
 
 class TestRmCommand:
-    def test_uuid_with_yes_flag(self, mock_client, cli_config, browser_config, browser_config_path, capsys):
+    def test_url_single_match_auto_deletes(self, mock_client, cli_config, browser_config, browser_config_path, capsys, mock_entry):
+        entry = mock_entry(uuid="url-resolved-uuid")
+        mock_client.get_logins.return_value = [entry]
         mock_client.delete_entry.return_value = True
-        args = make_args(uuid="some-uuid", url=None, yes=True)
+        args = make_args(url="https://example.com", uuid=None, yes=True)
         rc = rm.run(mock_client, args, cli_config, browser_config, browser_config_path)
         assert rc == 0
-        mock_client.delete_entry.assert_called_once_with("some-uuid")
+        mock_client.delete_entry.assert_called_once_with("url-resolved-uuid")
         assert "deleted" in capsys.readouterr().out.lower()
 
-    def test_url_single_match_deletes(self, mock_client, cli_config, browser_config, browser_config_path, capsys, mock_entry):
-        entry = mock_entry(uuid="url-resolved-uuid")
-        mock_client.get_logins.return_value = [entry]
+    def test_url_with_uuid_disambiguates(self, mock_client, cli_config, browser_config, browser_config_path, capsys, mock_entry):
+        e1 = mock_entry(uuid="uuid-1", login="alice")
+        e2 = mock_entry(uuid="uuid-2", login="bob")
+        mock_client.get_logins.return_value = [e1, e2]
         mock_client.delete_entry.return_value = True
-        args = make_args(uuid=None, url="https://example.com", yes=True)
+        args = make_args(url="https://example.com", uuid="uuid-2", yes=True)
         rc = rm.run(mock_client, args, cli_config, browser_config, browser_config_path)
         assert rc == 0
-        mock_client.delete_entry.assert_called_once_with("url-resolved-uuid")
+        mock_client.delete_entry.assert_called_once_with("uuid-2")
 
     def test_url_multiple_matches_error(self, mock_client, cli_config, browser_config, browser_config_path, caplog, mock_entry):
         e1 = mock_entry(uuid="uuid-1", login="alice")
@@ -261,9 +283,19 @@ class TestRmCommand:
         assert rc == 1
         assert any("no entries" in r.message.lower() for r in caplog.records)
 
-    def test_failure_propagates(self, mock_client, cli_config, browser_config, browser_config_path):
+    def test_uuid_not_in_results_error(self, mock_client, cli_config, browser_config, browser_config_path, caplog, mock_entry):
+        entry = mock_entry(uuid="uuid-1")
+        mock_client.get_logins.return_value = [entry]
+        args = make_args(url="https://example.com", uuid="nonexistent-uuid", yes=True)
+        rc = rm.run(mock_client, args, cli_config, browser_config, browser_config_path)
+        assert rc == 1
+        assert any("not found" in r.message.lower() for r in caplog.records)
+
+    def test_failure_propagates(self, mock_client, cli_config, browser_config, browser_config_path, mock_entry):
+        entry = mock_entry(uuid="some-uuid")
+        mock_client.get_logins.return_value = [entry]
         mock_client.delete_entry.side_effect = ProtocolError("access denied", error_code=6)
-        args = make_args(uuid="some-uuid", url=None, yes=True)
+        args = make_args(url="https://example.com", uuid=None, yes=True)
         with pytest.raises(ProtocolError):
             rm.run(mock_client, args, cli_config, browser_config, browser_config_path)
 

keepassxc_cli-1.6.0/keepassxc_cli/commands/rm.py

@@ -1,59 +0,0 @@
-from __future__ import annotations
-
-import argparse
-import logging
-from pathlib import Path
-
-from keepassxc_browser_api import BrowserClient, BrowserConfig
-
-from keepassxc_cli.config import CliConfig
-
-logger = logging.getLogger(__name__)
-
-
-def add_parser(subparsers: argparse._SubParsersAction) -> None:
-    p = subparsers.add_parser("rm", help="Delete an entry")
-    group = p.add_mutually_exclusive_group(required=True)
-    group.add_argument("--uuid", default=None, help="UUID of the entry to delete")
-    group.add_argument("--url", default=None, help="URL of the entry to delete (must match exactly one entry)")
-    p.add_argument("-y", "--yes", action="store_true", help="Skip confirmation prompt")
-    p.set_defaults(func=run)
-
-
-def run(
-    client: BrowserClient,
-    args: argparse.Namespace,
-    cli_config: CliConfig,
-    browser_config: BrowserConfig,
-    browser_config_path: Path,
-    *,
-    fmt: str = "table",
-) -> int:
-    if args.uuid is not None:
-        target_uuid = args.uuid
-        label = args.uuid
-    else:
-        entries = client.get_logins(args.url)
-        if not entries:
-            logger.error("No entries found for: %s", args.url)
-            return 1
-        if len(entries) > 1:
-            logger.error(
-                "Multiple entries found for %s \u2014 specify --uuid to disambiguate:",
-                args.url,
-            )
-            for e in entries:
-                print(f"  {e.uuid}  {e.login}  ({e.name})")
-            return 1
-        target_uuid = entries[0].uuid
-        label = f"{entries[0].name} ({args.url})"
-
-    if not args.yes:
-        answer = input(f"Delete entry {label}? [y/N] ").strip().lower()
-        if answer != "y":
-            print("Aborted.")
-            return 1
-
-    client.delete_entry(target_uuid)
-    print("Entry deleted.")
-    return 0