proton-drive-mcp 1.0.35 → 1.0.37

package/CHANGELOG.md

@@ -1,5 +1,60 @@
 # Changelog
 
+## 1.0.37 — 2026-09-20
+
+A parallel review of the whole project (security, live testing of every tool group, reliability, token cost, CI/supply chain, test-suite gaps — modelled on the Proton Mail Bridge MCP review rounds), then every finding fixed. Every behaviour change was checked live against a real account (39 end-to-end checks on scratch data) besides the automated tests. 1.0.36 was folded into this release.
+
+**Behaviour changes to be aware of:** destructive and outward-facing tools now require `confirmed: true`; long lists return `{total, offset, limit, hasMore, items}` instead of a bare array; responses are compact JSON; tool arguments are validated against the published schema (unknown/mistyped arguments are rejected).
+
+### Critical
+- **`npx proton-drive-mcp` never served MCP.** The entry-point check compared `import.meta.url` with `process.argv[1]`, which under `npx`, a global install or `node_modules/.bin` is the bin *symlink* — so the published server started, printed nothing and exited 0. Now compares real paths. CI gained a pack-and-install smoke test that launches the real bin symlink (the previous tests imported `dist/` directly and could not see this).
+- **A failing call leaked its full command line to the client**, including the `--password` of `drive_share_set_url` and the binary path (`e.message` from Node's exec). Errors are now built from the CLI's own output; secrets are never echoed. The same change surfaces the real cause when the CLI writes it to stdout behind an `=====` banner (e.g. a missing local file), truncates huge output, tolerates ANSI noise before the JSON, and recognises more "session expired" wording.
+- **`drive_rename` accepted `.` and `..`**, after which `drive_list` returned a path that resolves to the *parent* folder — a follow-up `drive_trash` on it would have trashed the wrong node. Rejected now; `list()` also builds paths by concatenation instead of `posix.join`.
+
+### Security
+- `drive_download` with `remove` (deletes the existing local file/folder), `drive_upload` with `replace` (trashes the remote item), `photos_download` with `remove`, and overwriting a sync-folder file via `drive_write_file` now need `confirmed: true` (CLI: `--confirm`).
+- Also gated: `drive_auth_logout`, `drive_share_invite`, `drive_share_revoke`, `drive_share_set_url` (public links), `drive_share_remove_url`, `drive_share_leave`, `drive_invitation_reject`, `photos_remove_from_album`.
+- `drive_read_file` / `drive_write_file` no longer follow symlinks out of `PROTON_DRIVE_SYNC_PATH` (containment by realpath, `O_NOFOLLOW`), read size is checked before loading, writes are capped at 5 MB.
+- Local paths given to upload/download/photos tools are checked: credential locations (`~/.ssh`, `~/.aws`, `~/.gnupg`, `~/.claude*`, keychains, `.env`, keys, …) are refused (`PROTON_DRIVE_LOCAL_ROOT` allowlist, `PROTON_DRIVE_ALLOW_SENSITIVE_PATHS=1` to opt out).
+- Arguments are validated against the tool schema (unknown keys, wrong types, enums, integer bounds); validators reject non-strings (an array used to coerce into a path).
+
+### Fixed (data correctness)
+- **`drive_share_set_url` silently turned a password-protected link into an open one** when re-run without a password (same URL). It now says so in a `warning`; `drive_share_status` reports `sharePasswordProtected`, `shareUrlExpiresAt` and `editorsCanShare`.
+- **`photos_create_album` created duplicate names**, after which `update`/`delete` acted on an arbitrary one of them. Duplicates are refused, and album operations refuse an ambiguous `/albums/<name>`; `photos_list_albums` returns `uid`.
+- **`drive_share_revoke` reported success for a non-member**, and for a wrong-case address the real member kept access (the CLI matches case-sensitively and exits 0 either way). Now verified against the current members, matched case-insensitively, canonical address sent. `drive_share_remove_all` on an unshared item reports "Nothing to remove".
+- **`drive_list "/"` returned ten `[unnamed]` entries**; it now lists the real roots.
+- **Names with a trailing space were unusable** (paths were trimmed: `list` returned `…/tsp ` but `info` then said "Node not found"; `mkdir "trail "` created `trail`). Paths, names and passwords are no longer trimmed; trailing `/` is stripped from remote paths.
+- **`drive_move` across folders with a rename** could fail with a bogus collision or leave the item half-moved. It now checks the destination first, renames-first when the source's own name is taken there, rolls back on failure and reports partial state explicitly; a `X → X` no-op on a missing source now fails.
+- `mkdir`/`move` split paths on the last *unescaped* slash (items created by other clients can contain `\/`).
+- `{ok:false}` results are also checked for `share_leave`, invitation accept/reject and album add/remove-photo; the "name collision" hint is only added for real collisions (move-into-itself etc. get their own message).
+- `drive_list_trash` returns `uid` (and trash time when the CLI reports it) — names are not unique in trash, so two items could share one path.
+
+### Reliability
+- Cancelling a request (`notifications/cancelled`) now kills the running CLI process; SIGTERM/SIGINT, a closed stdout (EPIPE) and client disconnect kill running CLI children instead of orphaning them; a timeout kills the whole process group (grandchildren too); stdin closing mid-call no longer leaves the server lingering for up to 30 minutes.
+- The startup CLI probe runs after the connection is up, so a slow `proton-drive version` can no longer delay `initialize` (hosts time out at ~5 s).
+
+### Token cost
+- `drive_list`, `drive_list_trash`, `photos_list_timeline`, `photos_list_album_photos` take `limit`/`offset` and return `{total, offset, limit, hasMore, items}` (defaults 200 / 100 / 50 / 100). Measured on a real account before the change: the trash list alone was ~54k tokens, the photo timeline ~15.6k.
+- Compact JSON (−14–16 % bytes on large lists); `drive_info` unwraps the `{ok,value}` wrappers and drops duplicate fields (`verbose: true` for the raw node).
+
+### Added
+- `drive_copy`: `newName` (CLI `--name`) — copy under a new name or duplicate inside the same folder. CLI: `copy --name`, `info --verbose`, `album photos --load-details`.
+- `photos_list_album_photos`: `loadDetails`.
+
+### CI / supply chain / packaging
+- Actions pinned to commit SHAs, least-privilege `permissions`, concurrency group, `npm audit --audit-level=high` gate, pack-and-install smoke test, Dependabot for npm and Actions (majors of `typescript` / `@types/node` ignored).
+- Publish: `id-token: write`, `npm publish --provenance`, `npm-publish` environment, tag must be reachable from `main`.
+- Lockfile refreshed (6 advisories → 0), SDK range raised to `^1.29.0`.
+- Dockerfile: multi-stage, non-root, production deps only, `.dockerignore`; `SECURITY.md`; `.code-review-graph/` ignored.
+
+### Tests and docs
+- ~230 unit tests plus real-process tests that spawn the server/CLI against a fake `PROTON_DRIVE_BIN` over stdio (gates, schema enforcement, error sanitization, lifecycle, symlink launch, tool/README/glama/smithery parity) and an opt-in read-only live smoke test. The old integration test probed a nonexistent `auth status` command and never ran in CI; it is removed.
+- Tool descriptions corrected where they contradicted behaviour (`photos_create_album`, `share_revoke`, `share_set_url`, `photos_delete_album`, `drive_read_file` / `drive_write_file` "requires authentication", timeline shapes). README no longer claims `--skip-thumbnails` (removed in 1.0.34) or full CLI parity; SPEC.md rewritten (it described 11 tools and a layout that never existed).
+
+### Investigated, not bugs
+- CLI role `inherited` is rejected by the CLI itself despite its help text — the three roles offered are correct.
+- Stdout hygiene, concurrent calls, the 60 s / 50 MB limits, a missing CLI and unicode/emoji/backslash names all behaved correctly.
+
 ## 1.0.35 — 2026-09-03
 
 Continued the live-testing bug sweep. This round found a serious silent-data-corruption bug in `drive_move`, confirmed by a full live reproduction against the real account, plus the same root cause in `drive_copy`. The same fix hardens three more structurally identical code paths (`trash`, `restore`, `delete`) against the same failure mode.

package/Dockerfile

@@ -1,7 +1,19 @@
-FROM node:24-slim
+# syntax=docker/dockerfile:1
+FROM node:24-slim AS build
 WORKDIR /app
-COPY package*.json ./
+COPY package.json package-lock.json tsconfig.json ./
 RUN npm ci --ignore-scripts
-COPY . .
+COPY src ./src
 RUN npm run build
+
+FROM node:24-slim
+ENV NODE_ENV=production
+WORKDIR /app
+COPY package.json package-lock.json ./
+RUN npm ci --omit=dev --ignore-scripts && npm cache clean --force
+COPY --from=build /app/dist ./dist
+# NOTE: this image does NOT include the official `proton-drive` CLI, which the
+# server shells out to. Provide it separately: bind-mount the binary and set
+# PROTON_DRIVE_BIN, or extend this image with a layer that installs it.
+USER node
 CMD ["node", "dist/index.js"]

package/README.md

@@ -222,7 +222,7 @@ proton-drive-cli upload ./dist /my-files/Releases/$(date +%Y-%m-%d) --file-confl
 proton-drive-cli download /my-files/Contracts ./audit/contracts
 
 # Nightly backup via cron
-0 2 * * * proton-drive-cli upload ~/Documents /my-files/Backups/$(date +%Y-%m-%d) --conflict skip
+0 2 * * * proton-drive-cli upload ~/Documents /my-files/Backups/$(date +%Y-%m-%d) --file-conflict skip --folder-conflict skip
 
 # Check who has access before a team change
 proton-drive-cli share status /my-files/Projects
@@ -263,45 +263,45 @@ proton-drive-cli share status /my-files/Projects
 | Tool | Description | Key parameters |
 |------|-------------|----------------|
 | `drive_auth_status` | Check if authenticated (probes `/my-files` — no native status command) | — |
-| `drive_auth_logout` | Log out (clear session) | — |
+| `drive_auth_logout` | Log out (clear session) ⚠️ | `confirmed: true` |
 | `drive_version` | CLI and SDK version info | — |
-| `drive_list` | List files and folders at a path | `path` |
-| `drive_info` | Get full metadata for one file/folder, including revision details | `path` |
+| `drive_list` | List files and folders at a path (paginated, default 200; `/` lists the roots) | `path`, `limit?`, `offset?` |
+| `drive_info` | Get metadata for one file/folder, including revision details (noise trimmed) | `path`, `verbose?` (raw CLI node) |
 | `drive_mkdir` | Create a new empty folder | `path` |
-| `drive_upload` | Upload local file or folder | `localPath`, `remotePath`, `fileConflictStrategy?` (skip/create-new-revision/rename/replace), `folderConflictStrategy?` (skip/merge/rename/replace) |
-| `drive_download` | Download to local path | `remotePath`, `localPath`, `fileConflictStrategy?` (skip/rename/remove), `folderConflictStrategy?` (skip/merge/rename/remove) |
+| `drive_upload` | Upload local file or folder | `localPath`, `remotePath`, `fileConflictStrategy?` (skip/create-new-revision/rename/replace), `folderConflictStrategy?` (skip/merge/rename/replace), `confirmed?` (**required for `replace`** — it trashes the existing remote item) |
+| `drive_download` | Download to local path | `remotePath`, `localPath`, `fileConflictStrategy?` (skip/rename/remove), `folderConflictStrategy?` (skip/merge/rename/remove), `confirmed?` (**required for `remove`** — it deletes the existing local item) |
 | `drive_rename` | Rename in place, no move | `path`, `newName` |
 | `drive_move` | Move and/or rename | `sourcePath`, `destinationPath` |
-| `drive_copy` | Copy file or folder to another Drive location | `sourcePath`, `destinationPath` |
+| `drive_copy` | Copy file or folder into another Drive folder | `sourcePath`, `destinationPath` (target *parent folder*), `newName?` |
 | `drive_delete` | Permanently delete an item already in trash ⚠️ | `path`, `confirmed: true` |
-| `drive_list_trash` | List items currently in trash | — |
+| `drive_list_trash` | List items currently in trash (paginated, default 100; includes `uid` — names are not unique in trash) | `limit?`, `offset?` |
 | `drive_share_status` | Get sharing members and URL | `path` |
-| `drive_share_invite` | Invite a user | `path`, `email`, `role` (viewer/editor/admin), `message?` |
-| `drive_share_revoke` | Revoke one person's access | `path`, `email` |
+| `drive_share_invite` | Invite a user (sends an email) ⚠️ | `path`, `email`, `role` (viewer/editor/admin), `message?`, `confirmed: true` |
+| `drive_share_revoke` | Revoke one person's access (fails if not a member) ⚠️ | `path`, `email`, `confirmed: true` |
 | `drive_share_remove_all` | Remove every member + pending invitation at once ⚠️ | `path`, `confirmed: true` |
-| `drive_share_set_url` | Create/update a public share link | `path`, `role?` (viewer/editor), `password?`, `expiration?` |
-| `drive_share_remove_url` | Remove the public share link ⚠️ | `path` |
+| `drive_share_set_url` | Create/replace a public share link ⚠️ (re-running without `password`/`expiration` removes them; expiry max ~90 days) | `path`, `role?` (viewer/editor), `password?`, `expiration?`, `confirmed: true` |
+| `drive_share_remove_url` | Remove the public share link ⚠️ | `path`, `confirmed: true` |
 | `drive_trash` | Move to trash | `path` |
 | `drive_restore` | Restore from trash | `path` |
 | `drive_empty_trash` | Permanently delete all trash ⚠️ | `confirmed: true` |
 | `drive_read_file` | Read text file from local sync folder | `path` |
-| `drive_write_file` | Write text file to local sync folder ⚠️ | `path`, `content` |
+| `drive_write_file` | Write text file to local sync folder ⚠️ (overwriting an existing file needs confirmation; max 5 MB) | `path`, `content`, `confirmed?` |
 | `drive_list_invitations` | List pending sharing invitations received | — |
 | `drive_invitation_accept` | Accept a pending invitation | `uid` (from `drive_list_invitations`) |
-| `drive_invitation_reject` | Reject a pending invitation ⚠️ | `uid` (from `drive_list_invitations`) |
-| `drive_share_leave` | Leave a shared folder shared with you ⚠️ | `path` |
+| `drive_invitation_reject` | Reject a pending invitation ⚠️ | `uid` (from `drive_list_invitations`), `confirmed: true` |
+| `drive_share_leave` | Leave a shared folder shared with you ⚠️ | `path`, `confirmed: true` |
 | `photos_list_albums` | List all Proton Photos albums | — |
 | `photos_create_album` | Create a new empty album | `name` |
 | `photos_update_album` | Rename an album or change its cover photo | `albumPath`, `name?`, `coverPhotoUid?` |
 | `photos_delete_album` | Delete an album ⚠️ | `albumPath`, `confirmed: true`, `force?`, `save?` |
-| `photos_list_album_photos` | List photos in an album | `albumPath` |
+| `photos_list_album_photos` | List photos in an album (paginated, default 100) | `albumPath`, `loadDetails?`, `limit?`, `offset?` |
 | `photos_add_to_album` | Add a photo from your library to an album | `albumPath`, `photoPath` |
-| `photos_remove_from_album` | Remove a photo from an album (keeps it in library) ⚠️ | `albumPath`, `photoPath` |
-| `photos_list_timeline` | List photos in your full library timeline | `loadDetails?` |
-| `photos_download` | Download photos to a local folder | `photoPaths`, `localFolder`, `conflictStrategy?` (skip/rename/remove) |
+| `photos_remove_from_album` | Remove a photo from an album (keeps it in library) ⚠️ | `albumPath`, `photoPath`, `confirmed: true` |
+| `photos_list_timeline` | List photos in your full library timeline (paginated, default 50) | `loadDetails?`, `limit?`, `offset?` |
+| `photos_download` | Download photos to a local folder | `photoPaths`, `localFolder`, `conflictStrategy?` (skip/rename/remove), `confirmed?` (**required for `remove`**) |
 | `photos_upload` | Upload local files directly into your Photos library | `localPaths`, `conflictStrategy?` (skip/rename) |
 
-> ⚠️ **Destructive tools** require `confirmed: true`. Use `drive_list_trash` first so you know what will be deleted, then pass `confirmed: true` to proceed.
+> ⚠️ **Destructive and outward-facing tools** (deleting, sharing, public links, logout, and the `replace`/`remove` conflict strategies) require `confirmed: true`, and the CLI requires `--confirm` for the destructive ones. Describe the action to the user first, then pass `confirmed: true`. Tool arguments are validated against the published schema — unknown or mistyped arguments are rejected.
 
 ---
 
@@ -313,14 +313,17 @@ proton-drive-cli share status /my-files/Projects
 | Credential exposure | API keys in config | Zero — OS keychain only |
 | Sharing & invitations | Rarely | Full (invite, revoke, status) |
 | Trash & restore | Rarely | Full |
-| CLI parity | No | Full CLI mirrors all MCP tools |
+| CLI parity | No | The CLI mirrors every MCP tool except `drive_read_file` / `drive_write_file` |
 | Shell injection safe | Varies | Yes — `execFile` only |
 
 ---
 
 ## Operational notes
 
-- `drive_upload` passes `--skip-thumbnails` by default. Remove it from the subprocess args if you want WebP preview generation (requires Bun 1.3.14+ installed).
+- Long listings are paginated (`limit` / `offset`, response `{total, offset, limit, hasMore, items}`) to keep responses small. Responses are compact JSON.
+- Local paths passed to upload/download/photos tools are checked: credential locations (`~/.ssh`, `~/.aws`, `~/.gnupg`, `~/.claude*`, keychains, `.env` files, …) are refused. Set `PROTON_DRIVE_LOCAL_ROOT` to allow only specific directories.
+- The sync-folder tools (`drive_read_file` / `drive_write_file`) refuse to follow symlinks out of `PROTON_DRIVE_SYNC_PATH`.
+- Error messages come from the CLI's own output; the command line (and therefore any `--password`) is never echoed back.
 - `drive_move` accepts a full destination path (parent + new name) for a familiar interface, but the underlying CLI only has separate `move` (change parent) and `rename` (change name) commands — this MCP translates automatically, issuing one or both as needed.
 - `drive_delete` only works on items already in `/trash` or `/photos-trash` — the CLI rejects live paths. Trash an item first with `drive_trash`, or use `drive_empty_trash` to clear everything at once.
 - `drive_auth_status` has no native CLI equivalent — it probes by resolving `/my-files` and reports authenticated based on whether that succeeds.
@@ -335,6 +338,8 @@ proton-drive-cli share status /my-files/Projects
 |---|---|---|
 | `PROTON_DRIVE_SYNC_PATH` | Optional | Absolute path to your local Proton Drive sync folder root (e.g. `/Users/you/Proton Drive`). Required only for `drive_read_file` and `drive_write_file`. The Proton Drive desktop app must be running to sync written files to the cloud. |
 | `PROTON_DRIVE_BIN` | Optional | Override the `proton-drive` binary name or path (default: `proton-drive`). Useful for non-standard installations. |
+| `PROTON_DRIVE_LOCAL_ROOT` | Optional | Path-delimiter-separated list of local directories that upload/download/photos tools may touch. Unset = any path except the built-in credential denylist. |
+| `PROTON_DRIVE_ALLOW_SENSITIVE_PATHS` | Optional | Set to `1` to disable the built-in credential-location denylist (not recommended). |
 
 ---
 

package/dist/cli.js

@@ -22,12 +22,14 @@ Commands:
   auth logout                              Log out
   version                                  Show CLI/SDK version
   list <path>                              List files at path
-  info <path>                              Show full node metadata for one path
+  info <path> [--verbose]                  Show node metadata (--verbose = raw CLI node)
   mkdir <path>                             Create a new folder
-  upload <local> <remote> [--file-conflict X] [--folder-conflict X]
-                                           Upload file/folder (files: skip/create-new-revision/rename/replace; folders: skip/merge/rename/replace)
-  download <remote> <local> [--file-conflict X] [--folder-conflict X]
-                                           Download file/folder (files: skip/rename/remove; folders: skip/merge/rename/remove)
+  upload <local> <remote> [--file-conflict X] [--folder-conflict X] [--confirm]
+                                           Upload file/folder (files: skip/create-new-revision/rename/replace; folders: skip/merge/rename/replace;
+                                           'replace' trashes the existing remote item and needs --confirm)
+  download <remote> <local> [--file-conflict X] [--folder-conflict X] [--confirm]
+                                           Download file/folder (files: skip/rename/remove; folders: skip/merge/rename/remove;
+                                           'remove' deletes the existing LOCAL item and needs --confirm)
   rename <path> <new-name>                 Rename in place, no move
   move <src> <dst>                         Move and/or rename
   delete <path> --confirm                  Delete a file/folder already in trash, permanently
@@ -38,7 +40,7 @@ Commands:
   share set-url <path> [--role] [--password] [--expiration]  Create/update public link
   share remove-url <path>                  Remove public link
   share leave <path>                       Leave a folder shared with you
-  copy <src> <dst>                         Copy file/folder
+  copy <src> <dst-parent-folder> [--name N]  Copy file/folder into a folder (optionally under a new name)
   trash <path>                             Move to trash
   trash list                               List trash contents
   trash empty --confirm                    Permanently delete all trash
@@ -50,11 +52,11 @@ Commands:
   album create <name>                      Create a new album
   album update <path> [--name] [--cover-photo-uid]  Rename/update album cover
   album delete <path> --confirm [--force] [--save]  Delete an album
-  album photos <path>                      List photos in an album
+  album photos <path> [--load-details]     List photos in an album
   album add-photo <album> <photo>          Add a photo to an album
   album remove-photo <album> <photo>       Remove a photo from an album
   photo timeline [--load-details]          List photos in your timeline
-  photo download <photo>... <local> [--conflict X]  Download photos (skip/rename/remove)
+  photo download <photo>... <local> [--conflict X] [--confirm]  Download photos (skip/rename/remove; 'remove' needs --confirm)
   photo upload <local>... [--conflict X]   Upload photos to your library (skip/rename)
 
 Flags:
@@ -142,7 +144,7 @@ async function run() {
             print(await drive.list(requirePath(sub, "list <path>")));
             break;
         case "info":
-            print(await drive.info(requirePath(sub, "info <path>")));
+            print(await drive.info(requirePath(sub, "info <path> [--verbose]"), args.includes("--verbose")));
             break;
         case "upload": {
             const rawLocal = sub;
@@ -170,6 +172,10 @@ async function run() {
                 console.error(`Invalid --folder-conflict value: ${folderConflictRaw}. Must be skip, merge, rename, or replace.`);
                 process.exit(1);
             }
+            if ((fileConflictRaw === "replace" || folderConflictRaw === "replace") && !args.includes("--confirm")) {
+                console.error("Strategy 'replace' trashes the existing remote item.\nPass --confirm to proceed.");
+                process.exit(1);
+            }
             print(await drive.upload(local, remote, fileConflictRaw, folderConflictRaw));
             break;
         }
@@ -200,6 +206,10 @@ async function run() {
                 console.error(`Invalid --folder-conflict value: ${folderConflictRaw}. Must be skip, merge, rename, or remove.`);
                 process.exit(1);
             }
+            if ((fileConflictRaw === "remove" || folderConflictRaw === "remove") && !args.includes("--confirm")) {
+                console.error("Strategy 'remove' deletes the existing LOCAL file or folder before downloading.\nPass --confirm to proceed.");
+                process.exit(1);
+            }
             print(await drive.download(remote, local, fileConflictRaw, folderConflictRaw));
             break;
         }
@@ -278,8 +288,10 @@ async function run() {
                     console.error(`This removes everyone's access to: ${removeAllPath}\nPass --confirm to proceed.`);
                     process.exit(1);
                 }
-                await drive.shareRemove(removeAllPath, [], true);
-                console.log(`Removed all access to: ${removeAllPath}`);
+                const removedCount = await drive.shareRemoveAll(removeAllPath);
+                console.log(removedCount === 0
+                    ? `Nothing to remove: ${removeAllPath} has no members or pending invitations.`
+                    : `Removed all access (${removedCount} member/invitation(s)) to: ${removeAllPath}`);
             }
             else if (sub === "set-url") {
                 const setUrlPath = requirePath(rest[0], "share set-url <path> [--role] [--password] [--expiration]");
@@ -337,8 +349,18 @@ async function run() {
         case "copy": {
             const copySrc = requirePath(sub, "copy <src> <dst>");
             const copyDst = requirePath(rest[0], "copy <src> <dst>");
-            await drive.copy(copySrc, copyDst);
-            console.log(`Copied: ${copySrc} → ${copyDst}`);
+            const rawCopyName = getFlag("--name");
+            let copyName;
+            try {
+                copyName = rawCopyName !== undefined ? validateName(rawCopyName) : undefined;
+            }
+            catch (e) {
+                console.error(e instanceof Error ? e.message : String(e));
+                process.exit(1);
+                return;
+            }
+            await drive.copy(copySrc, copyDst, copyName);
+            console.log(`Copied: ${copySrc} → ${copyDst}${copyName ? ` as '${copyName}'` : ""}`);
             break;
         }
         case "invitation":
@@ -443,7 +465,7 @@ async function run() {
             }
             else if (sub === "photos") {
                 const albumPath = requirePath(rest[0], "album photos <path>");
-                print(await drive.listAlbumPhotos(albumPath));
+                print(await drive.listAlbumPhotos(albumPath, args.includes("--load-details")));
             }
             else if (sub === "add-photo") {
                 const albumPath = requirePath(rest[0], "album add-photo <album-path> <photo-path>");
@@ -465,9 +487,9 @@ async function run() {
         case "photo": {
             // Strip --conflict <value> out of a variadic positional list.
             const conflictFlagIdx = rest.indexOf("--conflict");
-            const positionals = conflictFlagIdx === -1
+            const positionals = (conflictFlagIdx === -1
                 ? rest
-                : [...rest.slice(0, conflictFlagIdx), ...rest.slice(conflictFlagIdx + 2)];
+                : [...rest.slice(0, conflictFlagIdx), ...rest.slice(conflictFlagIdx + 2)]).filter((x) => x !== "--confirm" && x !== "--load-details");
             const conflictRaw = getFlag("--conflict") ?? "skip";
             if (sub === "timeline") {
                 print(await drive.photoTimeline(args.includes("--load-details")));
@@ -493,6 +515,10 @@ async function run() {
                     console.error(`Invalid --conflict value: ${conflictRaw}. Must be skip, rename, or remove.`);
                     process.exit(1);
                 }
+                if (conflictRaw === "remove" && !args.includes("--confirm")) {
+                    console.error("Strategy 'remove' deletes the existing LOCAL file before downloading.\nPass --confirm to proceed.");
+                    process.exit(1);
+                }
                 print(await drive.photoDownload(photoPaths, localFolderValidated, conflictRaw));
             }
             else if (sub === "upload") {