proton-drive-mcp 1.0.28 → 1.0.30

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## 1.0.30 — 2026-08-21
+
+**Root cause of this release:** every prior "verification" of this package (v1.0.24 through v1.0.29) diffed the CLI's *command source* against GitHub tags — confirming the right argv gets built — but never actually ran the CLI and inspected its *response* JSON. This release does that, live, against a real authenticated account. It found that several response-shape assumptions were wrong from day one, in ways no amount of source-reading would have caught, because the exact wire format (Result-wrapped names, nested fields, a CLI-side `undefined`-text quirk) isn't visible from the command classes — it only shows up in the actual output.
+
+### Fixed — confirmed live against CLI v0.8.0 + a real Proton Drive account
+
+- **`drive_list` (and `drive_list_trash`, which reuses it) — most severe.** Every item's `name` rendered as the literal string `"[object Object]"`, and every item's `path` showed the *same* value (the parent folder) regardless of the actual file. Root cause: the CLI wraps `name` in a cryptographic-verification result (`{ok, value}`), not a plain string, and doesn't return a `path` field at all. Now unwraps the name correctly and computes the path by joining the listed folder with the (correct) name. Also fixed: `size` was always `undefined` (real field is `totalStorageSize`, not `size`), `modifiedAt` was always `undefined` (real field is `modificationTime`), `mimeType` was always `undefined` (real field is `mediaType`).
+- **`drive_share_status` — most severe.** Threw `DriveParseError` on any item with no sharing at all — extremely common — because the CLI prints the literal 5 characters `undefined` (not valid JSON) when there's no share record, and `JSON.parse("undefined")` throws. Fixed at the subprocess layer: that literal text is now treated the same as empty output. Also fixed, for the case where an item *is* shared: `members[].email` and `members[].addedAt` read from fields that don't exist (real names: `inviteeEmail`, `invitationTime`); `isShared` and `shareUrl` were read from fields that don't exist on the real `ShareResult` type at all (`shareUrl` is nested under `urlAccess.url`; `isShared` must be computed from whether any members/invitations/urlAccess exist).
+- **`drive_share_remove_url` — threw on success.** Same literal-`undefined` CLI quirk as above; a successful removal was reported as a parse error. Fixed by the same subprocess-layer change.
+- **`drive_upload` / `drive_download` — silently misreported failures.** Parsed `{uploaded, skipped, failed}`/`{downloaded}` field names that don't exist on the real response (`TransferSummary`: `transferredItems`, `transferredBytes`, `skippedItems`, `failedItems`). Because `failed`/`downloaded` always read as `0`, a genuinely failed upload or download could be reported as a full success — the worst kind of bug for these two tools. Now reads the real fields.
+- **`photos_list_albums`** — `name` had the same `{ok,value}` unwrap bug as `drive_list`. `photoCount` was always `0` regardless of how many photos an album actually had — real field is nested under `album.photoCount`, not top-level.
+- **`drive_list_invitations`** — `invitedByEmail` had the same unwrap bug (`addedByEmail` is also a verified `{ok,value}` result, not a plain string).
+- **`drive_version`** — returned the raw token straight from CLI output, e.g. `cli-drive@0.8.0+06e8c605`, instead of a clean `0.8.0`. Any comparison against a plain semver string would never match. Now strips the package-name prefix and build hash, the same way the CLI's own update-check does internally.
+
+### Verified correct, no change needed
+`drive_auth_status`, `drive_info`, `drive_rename`, `photos_list_timeline`, `photos_list_album_photos`, `photos_download`, `photos_upload`, `drive_share_set_url`, `drive_copy`, `drive_move` (including its move+rename composition), `drive_mkdir`, `drive_trash`/`restore`/`delete`/`empty_trash`, `photos_create_album`/`update_album`/`delete_album`/`add_to_album`/`remove_from_album` — all exercised live end-to-end (create → verify → clean up) against the real account, no discrepancies found.
+
+### Testing
+120 tests passing (up from 113). Every rewritten test now uses JSON fixtures captured verbatim from real CLI output, not hand-written guesses — the exact class of mistake that caused this release.
+
+## 1.0.29 — 2026-08-13
+
+Tracks the Proton Drive CLI v0.8.0 release, which reworked upload/download conflict strategies for clarity (per Proton's release notes: general terms like "overwrite" were leading to confusion, so strategies are now explicit and set separately per file/folder). Verified against the `cli/v0.8.0` tag — a full tree diff against `cli/v0.7.0` (what 1.0.27/1.0.28 were built against) confirmed this is the *only* functional change; every other command this package wraps is untouched.
+
+### Fixed — breaking upstream change, adapted
+- **`drive_upload`** — the CLI removed the unified `--conflict-strategy` flag entirely. It's now `fileConflictStrategy` (skip/create-new-revision/rename/replace) and `folderConflictStrategy` (skip/merge/rename/replace), set independently. `create-new-revision` is new — uploads as a new version of the existing file instead of forcing a choice between overwrite and skip.
+- **`drive_download`** — same split: `fileConflictStrategy` (skip/rename/remove) and `folderConflictStrategy` (skip/merge/rename/remove). `remove` replaces the old `replace`/`overwrite` naming — it deletes the local copy and downloads the remote one in its place.
+- **`photos_upload`** — flag name (`--conflict-strategy`) unchanged, but `keep-both` was renamed to `rename`; `merge` was never valid here (photos have no folder concept) and remains excluded.
+- **`photos_download`** — flag name unchanged; values changed from skip/replace/keep-both to skip/remove/rename (folder handling is auto-merged internally by the CLI, not user-settable, since a photo download's only folder is the root).
+
+### Unaffected
+`drive_version`'s plain-text output format is unchanged (verified against the new dedicated `version.ts`, which also added the "you're up to date" / update-available check — no parsing changes needed on this end). Every other tool — filesystem, trash, sharing, invitations, albums — calls commands untouched by v0.8.0.
+
 ## 1.0.28 — 2026-08-11
 
 Closes the last 2 gaps found in the full CLI command audit — every scriptable Proton Drive CLI command now has a matching tool.

package/README.md

@@ -163,10 +163,10 @@ proton-drive-cli info /my-files/report.pdf       # full metadata, incl. revision
 proton-drive-cli mkdir /my-files/NewFolder
 
 proton-drive-cli upload ./report.pdf /my-files/Reports
-proton-drive-cli upload ./dist /my-files/Releases --conflict replace
+proton-drive-cli upload ./dist /my-files/Releases --file-conflict replace --folder-conflict merge
 
 proton-drive-cli download /my-files/report.pdf ./local/report.pdf
-proton-drive-cli download /my-files/Reports ./local/Reports --conflict keep-both
+proton-drive-cli download /my-files/Reports ./local/Reports --file-conflict rename --folder-conflict merge
 
 proton-drive-cli rename /my-files/old-name.pdf new-name.pdf   # in place, no move
 proton-drive-cli move /my-files/old-name.pdf /my-files/new-name.pdf
@@ -208,7 +208,7 @@ proton-drive-cli album update /albums/Summer2026 --name "Summer Trip"
 proton-drive-cli album add-photo /albums/Summer2026 /photos/IMG_001.jpg
 
 proton-drive-cli photo timeline
-proton-drive-cli photo download /photos/IMG_001.jpg ./local/photos --conflict keep-both
+proton-drive-cli photo download /photos/IMG_001.jpg ./local/photos --conflict rename
 proton-drive-cli photo upload ./camera-roll --conflict skip
 ```
 
@@ -216,7 +216,7 @@ proton-drive-cli photo upload ./camera-roll --conflict skip
 
 ```bash
 # Backup build output after CI
-proton-drive-cli upload ./dist /my-files/Releases/$(date +%Y-%m-%d) --conflict keep-both
+proton-drive-cli upload ./dist /my-files/Releases/$(date +%Y-%m-%d) --file-conflict rename --folder-conflict rename
 
 # Download all contracts for audit
 proton-drive-cli download /my-files/Contracts ./audit/contracts
@@ -268,8 +268,8 @@ proton-drive-cli share status /my-files/Projects
 | `drive_list` | List files and folders at a path | `path` |
 | `drive_info` | Get full metadata for one file/folder, including revision details | `path` |
 | `drive_mkdir` | Create a new empty folder | `path` |
-| `drive_upload` | Upload local file or folder | `localPath`, `remotePath`, `conflictStrategy` (skip/replace/keep-both/merge) |
-| `drive_download` | Download to local path | `remotePath`, `localPath`, `conflictStrategy` (skip/replace/keep-both) |
+| `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_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` |
@@ -298,8 +298,8 @@ proton-drive-cli share status /my-files/Projects
 | `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/replace/keep-both) |
-| `photos_upload` | Upload local files directly into your Photos library | `localPaths`, `conflictStrategy?` (skip/keep-both) |
+| `photos_download` | Download photos to a local folder | `photoPaths`, `localFolder`, `conflictStrategy?` (skip/rename/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.
 

package/dist/cli.js

@@ -6,7 +6,7 @@
  * Usage: proton-drive-cli <command> [args]
  * Run with --help (or see usage() below) for the full command list.
  */
-import { DriveService } from "./services/drive.js";
+import { DriveService, } from "./services/drive.js";
 import { DriveCliError, DriveCliNotFoundError, DriveNotAuthenticatedError, DriveParseError } from "./utils/errors.js";
 import { checkCliAvailable } from "./utils/subprocess.js";
 import { validateRemotePath, validateLocalPath, validateEmail, validateMessage, validateName } from "./utils/validation.js";
@@ -24,8 +24,10 @@ Commands:
   list <path>                              List files at path
   info <path>                              Show full node metadata for one path
   mkdir <path>                             Create a new folder
-  upload <local> <remote> [--conflict X]  Upload file/folder (skip/replace/keep-both/merge)
-  download <remote> <local> [--conflict X] Download file/folder (skip/replace/keep-both)
+  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)
   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
@@ -52,8 +54,8 @@ Commands:
   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/replace/keep-both)
-  photo upload <local>... [--conflict X]   Upload photos to your library (skip/keep-both)
+  photo download <photo>... <local> [--conflict X]  Download photos (skip/rename/remove)
+  photo upload <local>... [--conflict X]   Upload photos to your library (skip/rename)
 
 Flags:
   --json                                   Machine-readable JSON output (one line)
@@ -145,7 +147,7 @@ async function run() {
         case "upload": {
             const rawLocal = sub;
             if (!rawLocal) {
-                console.error("Usage: upload <local> <remote>");
+                console.error("Usage: upload <local> <remote> [--file-conflict X] [--folder-conflict X]");
                 process.exit(1);
             }
             let local;
@@ -158,17 +160,21 @@ async function run() {
                 return;
             }
             const remote = requirePath(rest[0], "upload <local> <remote>");
-            const conflictRaw = getFlag("--conflict") ?? "skip";
-            if (!["skip", "replace", "keep-both", "merge"].includes(conflictRaw)) {
-                console.error(`Invalid --conflict value: ${conflictRaw}. Must be skip, replace, keep-both, or merge.`);
+            const fileConflictRaw = getFlag("--file-conflict") ?? "skip";
+            if (!["skip", "create-new-revision", "rename", "replace"].includes(fileConflictRaw)) {
+                console.error(`Invalid --file-conflict value: ${fileConflictRaw}. Must be skip, create-new-revision, rename, or replace.`);
+                process.exit(1);
+            }
+            const folderConflictRaw = getFlag("--folder-conflict") ?? "skip";
+            if (!["skip", "merge", "rename", "replace"].includes(folderConflictRaw)) {
+                console.error(`Invalid --folder-conflict value: ${folderConflictRaw}. Must be skip, merge, rename, or replace.`);
                 process.exit(1);
             }
-            const conflict = conflictRaw;
-            print(await drive.upload(local, remote, conflict));
+            print(await drive.upload(local, remote, fileConflictRaw, folderConflictRaw));
             break;
         }
         case "download": {
-            const remote = requirePath(sub, "download <remote> <local>");
+            const remote = requirePath(sub, "download <remote> <local> [--file-conflict X] [--folder-conflict X]");
             const rawLocal2 = rest[0];
             if (!rawLocal2) {
                 console.error("Usage: download <remote> <local>");
@@ -184,12 +190,17 @@ async function run() {
                 process.exit(1);
                 return;
             }
-            const dConflictRaw = getFlag("--conflict") ?? "skip";
-            if (!["skip", "replace", "keep-both"].includes(dConflictRaw)) {
-                console.error(`Invalid --conflict value: ${dConflictRaw}. Must be skip, replace, or keep-both.`);
+            const fileConflictRaw = getFlag("--file-conflict") ?? "skip";
+            if (!["skip", "rename", "remove"].includes(fileConflictRaw)) {
+                console.error(`Invalid --file-conflict value: ${fileConflictRaw}. Must be skip, rename, or remove.`);
+                process.exit(1);
+            }
+            const folderConflictRaw = getFlag("--folder-conflict") ?? "skip";
+            if (!["skip", "merge", "rename", "remove"].includes(folderConflictRaw)) {
+                console.error(`Invalid --folder-conflict value: ${folderConflictRaw}. Must be skip, merge, rename, or remove.`);
                 process.exit(1);
             }
-            print(await drive.download(remote, local, dConflictRaw));
+            print(await drive.download(remote, local, fileConflictRaw, folderConflictRaw));
             break;
         }
         case "rename": {
@@ -436,8 +447,8 @@ async function run() {
                     process.exit(1);
                     return;
                 }
-                if (!["skip", "replace", "keep-both"].includes(conflictRaw)) {
-                    console.error(`Invalid --conflict value: ${conflictRaw}. Must be skip, replace, or keep-both.`);
+                if (!["skip", "rename", "remove"].includes(conflictRaw)) {
+                    console.error(`Invalid --conflict value: ${conflictRaw}. Must be skip, rename, or remove.`);
                     process.exit(1);
                 }
                 print(await drive.photoDownload(photoPaths, localFolderValidated, conflictRaw));
@@ -459,8 +470,8 @@ async function run() {
                         return;
                     }
                 }
-                if (!["skip", "keep-both"].includes(conflictRaw)) {
-                    console.error(`Invalid --conflict value: ${conflictRaw}. Must be skip or keep-both.`);
+                if (!["skip", "rename"].includes(conflictRaw)) {
+                    console.error(`Invalid --conflict value: ${conflictRaw}. Must be skip or rename.`);
                     process.exit(1);
                 }
                 print(await drive.photoUpload(localPaths, conflictRaw));

package/dist/index.js

@@ -3,7 +3,7 @@ import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { CallToolRequestSchema, ErrorCode, ListToolsRequestSchema, McpError, } from "@modelcontextprotocol/sdk/types.js";
 import { createRequire } from "node:module";
-import { DriveService } from "./services/drive.js";
+import { DriveService, } from "./services/drive.js";
 import { isMainModule } from "./utils/isMainModule.js";
 import { checkCliAvailable } from "./utils/subprocess.js";
 import { DriveCliNotFoundError, DriveCliError, DriveNotAuthenticatedError, DriveParseError, } from "./utils/errors.js";
@@ -115,7 +115,7 @@ const TOOLS = [
         description: "Upload a local file or folder to Proton Drive with end-to-end encryption. Requires authentication. " +
             "For folders, uploads recursively and preserves directory structure. " +
             "Returns {uploaded, skipped, failed} counts — fails the call if failed > 0 (common causes: quota exceeded, destination path not found, permission denied). " +
-            "conflictStrategy defaults to 'skip'. Values: 'skip' (leave existing remote file unchanged), 'replace' (permanently overwrite — confirm with user first), 'keep-both' (upload with a unique name), 'merge' (folders only — merge contents instead of failing). " +
+            "Conflict strategies are set separately for files and folders (CLI v0.8.0+) — both default to 'skip'. " +
             "Do not use to move files already on Drive (use drive_move) or to write text content directly (use drive_write_file if PROTON_DRIVE_SYNC_PATH is set). " +
             "Ensure destination folder exists first with drive_list; create it with drive_mkdir if needed.",
         annotations: { openWorldHint: true },
@@ -130,13 +130,21 @@ const TOOLS = [
                     type: "string",
                     description: "Absolute remote Drive destination folder path (must start with '/'). E.g. /my-files/Reports",
                 },
-                conflictStrategy: {
+                fileConflictStrategy: {
+                    type: "string",
+                    enum: ["skip", "create-new-revision", "rename", "replace"],
+                    description: "'skip' leaves an existing remote file unchanged (default). " +
+                        "'create-new-revision' uploads as a new version of the existing file, keeping history. " +
+                        "'rename' adds a unique suffix to the uploaded file's name. " +
+                        "'replace' trashes the remote file and uploads the local copy in its place — confirm with user first.",
+                },
+                folderConflictStrategy: {
                     type: "string",
-                    enum: ["skip", "replace", "keep-both", "merge"],
-                    description: "'skip' leaves existing remote files unchanged (default). " +
-                        "'replace' permanently overwrites the remote file — confirm with user first. " +
-                        "'keep-both' uploads with a unique name to avoid conflicts. " +
-                        "'merge' merges folder contents instead of failing (folders only).",
+                    enum: ["skip", "merge", "rename", "replace"],
+                    description: "'skip' leaves an existing remote folder unchanged (default). " +
+                        "'merge' merges the uploaded folder's contents into the existing one. " +
+                        "'rename' adds a unique suffix to the uploaded folder's name. " +
+                        "'replace' trashes the remote folder and uploads the local copy in its place — confirm with user first.",
                 },
             },
             required: ["localPath", "remotePath"],
@@ -147,7 +155,7 @@ const TOOLS = [
         name: "drive_download",
         description: "Download a file or folder from Proton Drive to the local filesystem. Requires authentication. " +
             "For folders, downloads recursively. " +
-            "conflictStrategy defaults to 'skip' — pass 'replace' to overwrite an existing local file, or 'keep-both' to save under a unique name. " +
+            "Conflict strategies are set separately for files and folders (CLI v0.8.0+) — both default to 'skip'. " +
             "Fails if the local parent directory does not exist. " +
             "Returns {downloaded} count. " +
             "Do not use to move files within Drive (use drive_move) or to read a small text file's contents (use drive_read_file if PROTON_DRIVE_SYNC_PATH is set).",
@@ -163,12 +171,20 @@ const TOOLS = [
                     type: "string",
                     description: "Absolute local destination path (must start with '/'). Parent directory must already exist.",
                 },
-                conflictStrategy: {
+                fileConflictStrategy: {
                     type: "string",
-                    enum: ["skip", "replace", "keep-both"],
+                    enum: ["skip", "rename", "remove"],
                     description: "'skip' leaves an existing local file unchanged (default). " +
-                        "'replace' overwrites it — confirm with user first. " +
-                        "'keep-both' downloads under a unique name.",
+                        "'rename' downloads under a unique name. " +
+                        "'remove' deletes the local file and downloads the remote copy in its place — confirm with user first.",
+                },
+                folderConflictStrategy: {
+                    type: "string",
+                    enum: ["skip", "merge", "rename", "remove"],
+                    description: "'skip' leaves an existing local folder unchanged (default). " +
+                        "'merge' merges the downloaded folder's contents into the existing one. " +
+                        "'rename' downloads under a unique name. " +
+                        "'remove' deletes the local folder and downloads the remote copy in its place — confirm with user first.",
                 },
             },
             required: ["remotePath", "localPath"],
@@ -743,7 +759,7 @@ const TOOLS = [
     {
         name: "photos_download",
         description: "Download one or more photos from Proton Photos (timeline, an album, or shared-with-me) to a local folder. Requires authentication. " +
-            "Multiple timeline photos can share the same filename — with conflictStrategy 'replace' or 'skip' only one copy survives locally; use 'keep-both' to keep all. " +
+            "Multiple timeline photos can share the same filename — with conflictStrategy 'remove' or 'skip' only one copy survives locally; use 'rename' to keep all. " +
             "Fails if any item fails to download. " +
             "Do not use for regular Drive files — use drive_download instead.",
         annotations: { openWorldHint: true },
@@ -761,8 +777,10 @@ const TOOLS = [
                 },
                 conflictStrategy: {
                     type: "string",
-                    enum: ["skip", "replace", "keep-both"],
-                    description: "How to handle local filename collisions. Defaults to 'skip'.",
+                    enum: ["skip", "rename", "remove"],
+                    description: "'skip' leaves an existing local file unchanged (default). " +
+                        "'rename' downloads under a unique name. " +
+                        "'remove' deletes the local file and downloads the remote copy in its place — confirm with user first.",
                 },
             },
             required: ["photoPaths", "localFolder"],
@@ -773,7 +791,7 @@ const TOOLS = [
         name: "photos_upload",
         description: "Upload one or more local photo or video files directly into your Proton Photos library (My Photos timeline). Requires authentication. " +
             "Non-photo/video files are silently skipped. Folders are recursed but flattened into My Photos — folder structure is not preserved. " +
-            "Never overwrites — duplicates (matched by name + content hash) resolve to 'keep-both' or 'skip' only. " +
+            "Never overwrites — duplicates (matched by name + content hash) resolve to 'rename' or 'skip' only. " +
             "Do not use for regular Drive files — use drive_upload instead.",
         annotations: { openWorldHint: true },
         inputSchema: {
@@ -786,8 +804,8 @@ const TOOLS = [
                 },
                 conflictStrategy: {
                     type: "string",
-                    enum: ["skip", "keep-both"],
-                    description: "How to handle duplicate photos (matched by name + content hash). Defaults to 'skip'.",
+                    enum: ["skip", "rename"],
+                    description: "How to handle duplicate photos (matched by name + content hash). 'skip' leaves the existing photo unchanged (default); 'rename' uploads under a unique name.",
                 },
             },
             required: ["localPaths"],
@@ -883,22 +901,30 @@ export async function main() {
                     return ok({ message: `Folder created: ${mkdirPath}` });
                 }
                 case "drive_upload": {
-                    const cs = typeof a.conflictStrategy === "string" ? a.conflictStrategy : "skip";
-                    if (!["skip", "replace", "keep-both", "merge"].includes(cs)) {
-                        return fail(`conflictStrategy must be skip, replace, keep-both, or merge`);
+                    const fcs = typeof a.fileConflictStrategy === "string" ? a.fileConflictStrategy : "skip";
+                    if (!["skip", "create-new-revision", "rename", "replace"].includes(fcs)) {
+                        return fail(`fileConflictStrategy must be skip, create-new-revision, rename, or replace`);
                     }
-                    const uploadResult = await drive.upload(validateLocalPath(a.localPath), validateRemotePath(a.remotePath), cs);
+                    const dcs2 = typeof a.folderConflictStrategy === "string" ? a.folderConflictStrategy : "skip";
+                    if (!["skip", "merge", "rename", "replace"].includes(dcs2)) {
+                        return fail(`folderConflictStrategy must be skip, merge, rename, or replace`);
+                    }
+                    const uploadResult = await drive.upload(validateLocalPath(a.localPath), validateRemotePath(a.remotePath), fcs, dcs2);
                     if (uploadResult.failed > 0) {
                         return fail(`Upload completed with ${uploadResult.failed} failed file(s). uploaded=${uploadResult.uploaded} skipped=${uploadResult.skipped}`);
                     }
                     return ok(uploadResult);
                 }
                 case "drive_download": {
-                    const dcs = typeof a.conflictStrategy === "string" ? a.conflictStrategy : "skip";
-                    if (!["skip", "replace", "keep-both"].includes(dcs)) {
-                        return fail(`conflictStrategy must be skip, replace, or keep-both`);
+                    const fdcs = typeof a.fileConflictStrategy === "string" ? a.fileConflictStrategy : "skip";
+                    if (!["skip", "rename", "remove"].includes(fdcs)) {
+                        return fail(`fileConflictStrategy must be skip, rename, or remove`);
+                    }
+                    const fodcs = typeof a.folderConflictStrategy === "string" ? a.folderConflictStrategy : "skip";
+                    if (!["skip", "merge", "rename", "remove"].includes(fodcs)) {
+                        return fail(`folderConflictStrategy must be skip, merge, rename, or remove`);
                     }
-                    return ok(await drive.download(validateRemotePath(a.remotePath), validateLocalPath(a.localPath), dcs));
+                    return ok(await drive.download(validateRemotePath(a.remotePath), validateLocalPath(a.localPath), fdcs, fodcs));
                 }
                 case "drive_rename": {
                     const renamePath = validateRemotePath(a.path);
@@ -1070,8 +1096,8 @@ export async function main() {
                     const downloadPaths = a.photoPaths.map((p) => validateRemotePath(p));
                     const downloadFolder = validateLocalPath(a.localFolder);
                     const pdcs = typeof a.conflictStrategy === "string" ? a.conflictStrategy : "skip";
-                    if (!["skip", "replace", "keep-both"].includes(pdcs))
-                        return fail("conflictStrategy must be skip, replace, or keep-both");
+                    if (!["skip", "rename", "remove"].includes(pdcs))
+                        return fail("conflictStrategy must be skip, rename, or remove");
                     const downloadSummary = await drive.photoDownload(downloadPaths, downloadFolder, pdcs);
                     if (downloadSummary.failedItems > 0) {
                         return fail(`Download completed with ${downloadSummary.failedItems} failed item(s). transferred=${downloadSummary.transferredItems}`);
@@ -1083,8 +1109,8 @@ export async function main() {
                         return fail("localPaths must be a non-empty array of strings");
                     const uploadPaths = a.localPaths.map((p) => validateLocalPath(p));
                     const pucs = typeof a.conflictStrategy === "string" ? a.conflictStrategy : "skip";
-                    if (!["skip", "keep-both"].includes(pucs))
-                        return fail("conflictStrategy must be skip or keep-both");
+                    if (!["skip", "rename"].includes(pucs))
+                        return fail("conflictStrategy must be skip or rename");
                     const uploadSummary = await drive.photoUpload(uploadPaths, pucs);
                     if (uploadSummary.failedItems > 0) {
                         return fail(`Upload completed with ${uploadSummary.failedItems} failed item(s). transferred=${uploadSummary.transferredItems}`);

package/dist/services/drive.js

@@ -1,6 +1,33 @@
 import { posix as posixPath } from "node:path";
 import { runDrive as defaultRunDrive, runDriveRaw as defaultRunDriveRaw } from "../utils/subprocess.js";
 import { DriveNotAuthenticatedError, DriveParseError } from "../utils/errors.js";
+// The SDK verifies the author of every name (and several other fields)
+// cryptographically and returns a `Result<string, Error>`-shaped object —
+// {ok:true, value:"name"} on success, {ok:false, error:{...}} if the
+// signature couldn't be verified — never a plain string. Confirmed live
+// against the CLI's `filesystem list`, `filesystem info`, `album list`,
+// `invitation list` output. A naive `String(item.name)` on this object
+// produces the literal text "[object Object]".
+function unwrapResult(value, fallback = "") {
+    if (value && typeof value === "object" && "ok" in value) {
+        const r = value;
+        if (r.ok && typeof r.value === "string")
+            return r.value;
+        return fallback;
+    }
+    return typeof value === "string" ? value : fallback;
+}
+// Strips "<package-name>@" and "+<hash>" from a version token like
+// "cli-drive@0.8.0+06e8c605", leaving "0.8.0". Falls back to the raw
+// token if it doesn't match, so an unexpected future format still shows
+// something rather than silently becoming "unknown".
+function extractSemver(token) {
+    if (!token)
+        return "unknown";
+    const afterAt = token.includes("@") ? token.slice(token.indexOf("@") + 1) : token;
+    const semverMatch = afterAt.match(/^(\d+\.\d+\.\d+)/);
+    return semverMatch ? semverMatch[1] : token;
+}
 export class DriveService {
     run;
     runRaw;
@@ -29,62 +56,81 @@ export class DriveService {
         await this.run(["auth", "logout"]);
     }
     // `version` ignores --json entirely and always prints plain text:
-    //   Proton Drive CLI 1.2.3
-    //   Proton Drive SDK 4.5.6
+    //   Proton Drive CLI cli-drive@0.8.0+06e8c605
+    //   Proton Drive SDK js@0.21.0+06e8c605
     //   ...update-check line...
+    // Confirmed live: the token after "CLI"/"SDK" is <package-name>@<semver>+<hash>,
+    // not a bare semver — the CLI's own version.ts extracts semver the same way
+    // (slice after '@', match leading \d+.\d+.\d+) before comparing versions.
     async version() {
         const text = await this.runRaw(["version"]);
         const cliMatch = text.match(/Proton Drive CLI\s+(\S+)/);
         const sdkMatch = text.match(/Proton Drive SDK\s+(\S+)/);
         return {
-            cli: cliMatch ? cliMatch[1] : "unknown",
-            sdk: sdkMatch ? sdkMatch[1] : "unknown",
+            cli: extractSemver(cliMatch?.[1]),
+            sdk: extractSemver(sdkMatch?.[1]),
         };
     }
     // Filesystem
+    //
+    // The CLI's list output has no `path` field at all — only `uid`/`parentUid`.
+    // We compute a usable path by joining the listed folder with each item's
+    // (unwrapped) name; confirmed live that /parent/name round-trips correctly
+    // through the CLI's own name-based path resolver for every other command.
     async list(remotePath) {
         const result = await this.run(["filesystem", "list", remotePath]);
         if (result === null)
             return [];
         if (!Array.isArray(result))
             throw new DriveParseError(`Expected array from list, got: ${JSON.stringify(result).slice(0, 100)}`);
-        return result.map((item) => ({
-            name: String(item.name ?? ""),
-            path: String(item.path ?? remotePath),
-            type: item.type === "folder" ? "folder" : "file",
-            size: typeof item.size === "number" ? item.size : undefined,
-            modifiedAt: typeof item.modifiedAt === "string" ? item.modifiedAt : undefined,
-            mimeType: typeof item.mimeType === "string" ? item.mimeType : undefined,
-        }));
+        return result.map((item) => {
+            const name = unwrapResult(item.name, "[unnamed]");
+            return {
+                name,
+                path: posixPath.join(remotePath, name),
+                type: item.type === "folder" || item.type === "album" ? "folder" : "file",
+                size: typeof item.totalStorageSize === "number" ? item.totalStorageSize : undefined,
+                modifiedAt: typeof item.modificationTime === "string" ? item.modificationTime : undefined,
+                mimeType: typeof item.mediaType === "string" ? item.mediaType : undefined,
+            };
+        });
     }
-    async upload(localPath, remotePath, conflictStrategy = "skip") {
+    async upload(localPath, remotePath, fileConflictStrategy = "skip", folderConflictStrategy = "skip") {
         const result = await this.run([
             "filesystem",
             "upload",
             localPath,
             remotePath,
-            "--conflict-strategy",
-            conflictStrategy,
+            "--file-conflict-strategy",
+            fileConflictStrategy,
+            "--folder-conflict-strategy",
+            folderConflictStrategy,
             "--skip-thumbnails",
         ]);
-        const r = (result ?? {});
+        // Real shape is TransferSummary: {transferredItems, transferredBytes,
+        // skippedItems, failedItems, failures}. Confirmed live — the old
+        // {uploaded, skipped, failed} field names never existed, so failures
+        // were silently reported as 0 regardless of what actually happened.
+        const summary = this.parseTransferSummary(result);
         return {
             path: remotePath,
-            uploaded: typeof r?.uploaded === "number" ? r.uploaded : 0,
-            skipped: typeof r?.skipped === "number" ? r.skipped : 0,
-            failed: typeof r?.failed === "number" ? r.failed : 0,
+            uploaded: summary.transferredItems,
+            skipped: summary.skippedItems,
+            failed: summary.failedItems,
         };
     }
-    async download(remotePath, localPath, conflictStrategy = "skip") {
+    async download(remotePath, localPath, fileConflictStrategy = "skip", folderConflictStrategy = "skip") {
         const result = await this.run([
             "filesystem", "download", remotePath, localPath,
-            "--conflict-strategy", conflictStrategy,
+            "--file-conflict-strategy", fileConflictStrategy,
+            "--folder-conflict-strategy", folderConflictStrategy,
         ]);
-        const r = (result ?? {});
+        // Same real shape as upload — TransferSummary, not {downloaded}.
+        const summary = this.parseTransferSummary(result);
         return {
             path: remotePath,
             localPath,
-            downloaded: typeof r?.downloaded === "number" ? r.downloaded : 0,
+            downloaded: summary.transferredItems,
         };
     }
     // The CLI has no `mkdir` — it's `create-folder <parentPath> <name>`.
@@ -136,24 +182,31 @@ export class DriveService {
         await this.run(["filesystem", "delete", remotePath]);
     }
     // Sharing
+    //
+    // Real shape is the SDK's ShareResult: {protonInvitations, nonProtonInvitations,
+    // members, urlAccess?, editorsCanShare} — confirmed live. There is no
+    // isShared/email/addedAt/shareUrl field; those were all wrong names.
+    // When nothing is shared, the CLI prints literal "undefined" (see
+    // subprocess.ts) which now resolves to `result === null` here.
     async shareStatus(remotePath) {
         const result = await this.run(["sharing", "status", remotePath]);
-        if (result === null)
-            throw new DriveParseError("sharing status returned empty response");
-        const r = result;
+        const r = (result ?? {});
         const VALID_ROLES = new Set(["viewer", "editor", "admin"]);
-        const members = Array.isArray(r?.members)
+        const members = Array.isArray(r.members)
             ? r.members.map((m) => ({
-                email: String(m.email ?? ""),
+                email: String(m.inviteeEmail ?? ""),
                 role: (VALID_ROLES.has(String(m.role)) ? String(m.role) : "viewer"),
-                addedAt: typeof m.addedAt === "string" ? m.addedAt : undefined,
+                addedAt: typeof m.invitationTime === "string" ? m.invitationTime : undefined,
             }))
             : [];
+        const protonInvitationCount = Array.isArray(r.protonInvitations) ? r.protonInvitations.length : 0;
+        const nonProtonInvitationCount = Array.isArray(r.nonProtonInvitations) ? r.nonProtonInvitations.length : 0;
+        const urlAccess = (r.urlAccess ?? undefined);
         return {
             path: remotePath,
-            isShared: Boolean(r?.isShared ?? members.length > 0),
+            isShared: members.length > 0 || protonInvitationCount > 0 || nonProtonInvitationCount > 0 || !!urlAccess,
             members,
-            shareUrl: typeof r?.shareUrl === "string" ? r.shareUrl : undefined,
+            shareUrl: typeof urlAccess?.url === "string" ? urlAccess.url : undefined,
         };
     }
     async shareInvite(remotePath, email, role, message) {
@@ -228,14 +281,14 @@ export class DriveService {
             throw new DriveParseError(`Expected array from invitation list, got: ${JSON.stringify(result).slice(0, 100)}`);
         return result.map((item) => {
             const node = (item.node ?? {});
-            const nameVal = (node.name ?? {});
-            const nodeName = typeof nameVal.value === "string" ? nameVal.value : String(node.name ?? "");
+            // addedByEmail is also a verified Result<string,...>, same as name —
+            // confirmed via the SDK's Member type (client/js/src/interface/sharing.ts).
             return {
                 uid: String(item.uid ?? ""),
                 role: (["viewer", "editor", "admin"].includes(String(item.role)) ? String(item.role) : "viewer"),
-                invitedByEmail: String(item.addedByEmail ?? ""),
+                invitedByEmail: unwrapResult(item.addedByEmail),
                 invitedAt: typeof item.invitationTime === "string" ? item.invitationTime : undefined,
-                nodeName,
+                nodeName: unwrapResult(node.name, "[unnamed]"),
                 nodeType: node.type === "folder" ? "folder" : "file",
             };
         });
@@ -250,18 +303,25 @@ export class DriveService {
         await this.run(["sharing", "leave", remotePath]);
     }
     // Photos / Albums
+    //
+    // Albums are NodeEntity too — name needs the same {ok,value} unwrap as
+    // filesystem list(), and photoCount lives under a nested `album` object
+    // (`item.album.photoCount`), not top-level. Both confirmed live.
     async listAlbums() {
         const result = await this.run(["album", "list"]);
         if (result === null)
             return [];
         if (!Array.isArray(result))
             throw new DriveParseError(`Expected array from album list, got: ${JSON.stringify(result).slice(0, 100)}`);
-        return result.map((item) => ({
-            name: String(item.name ?? ""),
-            photoCount: typeof item.photoCount === "number" ? item.photoCount : 0,
-            isShared: Boolean(item.isShared ?? false),
-            creationTime: typeof item.creationTime === "string" ? item.creationTime : undefined,
-        }));
+        return result.map((item) => {
+            const albumInfo = (item.album ?? {});
+            return {
+                name: unwrapResult(item.name, "[unnamed]"),
+                photoCount: typeof albumInfo.photoCount === "number" ? albumInfo.photoCount : 0,
+                isShared: Boolean(item.isShared ?? false),
+                creationTime: typeof item.creationTime === "string" ? item.creationTime : undefined,
+            };
+        });
     }
     async createAlbum(name) {
         await this.run(["album", "create", name]);

package/dist/utils/subprocess.js

@@ -58,6 +58,15 @@ export async function runDrive(args) {
             }
             return null;
         }
+        // Some commands (e.g. `sharing status`/`sharing remove-url` on an item
+        // with no share record) call the CLI's own printObject(undefined, true)
+        // helper, which does console.log(JSON.stringify(undefined)) — and
+        // JSON.stringify(undefined) is the JS value undefined, so console.log
+        // prints the literal 5 characters "undefined", not valid JSON. Confirmed
+        // live against the real CLI (v0.8.0). Treat it the same as empty stdout.
+        if (raw === "undefined") {
+            return null;
+        }
         try {
             return JSON.parse(raw);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "proton-drive-mcp",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "description": "MCP server and CLI that gives Claude full access to Proton Drive — upload, download, share, and manage your end-to-end encrypted files without leaving the conversation.",
   "type": "module",
   "main": "dist/index.js",