apple-icloud-mcp 0.3.3 → 0.3.5

package/.claude-plugin/marketplace.json

@@ -6,7 +6,7 @@
   },
   "metadata": {
     "description": "Unofficial Apple Music, iCloud Calendar/Contacts/Mail, Apple Maps and WeatherKit tools for Claude Code",
-    "version": "0.3.3"
+    "version": "0.3.5"
   },
   "plugins": [
     {
@@ -14,7 +14,7 @@
       "displayName": "Apple iCloud",
       "source": "./",
       "description": "Apple Music playlists and library, iCloud Calendar, Contacts and Mail, Apple Maps, WeatherKit and iTunes search for Claude via MCP — runs anywhere, no Mac required. Unofficial; not affiliated with Apple.",
-      "version": "0.3.3",
+      "version": "0.3.5",
       "author": {
         "name": "Chris Chall"
       },

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "apple-icloud",
   "displayName": "Apple iCloud",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Apple Music playlists and library, iCloud Calendar, Contacts and Mail, Apple Maps, WeatherKit and iTunes search for Claude via MCP — runs anywhere, no Mac required. Unofficial; not affiliated with Apple.",
   "author": {
     "name": "Chris Chall"
@@ -21,5 +21,5 @@
     "mcp"
   ],
   "skills": "./skills/",
-  "mcp": "./.mcp.json"
+  "mcpServers": "./.mcp.json"
 }

package/README.md

@@ -270,7 +270,7 @@ read in `DISPLAY_TZ` — so are calendar events stored without a time zone of th
 | `apple_music_get_ratings` | Whether you have loved or disliked songs, albums, playlists, music videos or stations — catalog or library ids — returning love, dislike or none per id. | read |  |
 | `apple_music_create_playlist` | Create a new playlist in your Apple Music library, optionally with tracks (up to 500 catalog or library song ids; added 100 at a time), a description, a folder and public visibility (not in APPLE_WRITE_MODE=additive). | additive |  |
 | `apple_music_add_playlist_tracks` | Append songs (up to 500 catalog or library ids) to the end of one of your library playlists. | additive |  |
-| `apple_music_create_folder` | Create a playlist folder in your Apple Music library, at the top level or inside another folder. | additive |  |
+| `apple_music_create_folder` | Create a playlist folder in your Apple Music library, at the top level or inside another folder. | all |  |
 | `apple_music_add_to_library` | Add catalog songs, albums, playlists or music videos to your Apple Music library by catalog id (up to 100 per type). | additive |  |
 | `apple_music_add_favorites` | Mark catalog songs, albums, playlists, artists or music videos as favorites (the star in Apple Music; favorite songs go to your Favorite Songs playlist), by catalog id, up to 100 per type. | additive |  |
 | `apple_music_set_rating` | Set your rating on a song, album, playlist, music video or station (catalog or library id): love, dislike, or none to clear it. | all |  |
@@ -351,7 +351,7 @@ read in `DISPLAY_TZ` — so are calendar events stored without a time zone of th
 | Value | What is registered |
 |---|---|
 | `none` | Read tools only. |
-| `additive` | Reads, plus writes that only **add** to your own account: create a (private) playlist or folder, append tracks, add to library/favorites, create an event (without attendees, and not in a calendar shared with other people) or a contact. Nothing existing is modified or removed and nothing is sent to anyone. |
+| `additive` | Reads, plus writes that only **add** to your own account: create a (private) playlist, append tracks, add to library/favorites, create an event (without attendees, and not in a calendar shared with other people) or a contact. Nothing existing is modified or removed and nothing is sent to anyone. |
 | `all` (default) | Everything. |
 
 Gated tools are not registered at all below their mode, so no prompt or injected instruction can call them.

package/THIRD_PARTY_NOTICES.md

@@ -22,7 +22,7 @@ MPL-2.0 is a file-level license: it covers ical.js's own files and does not exte
 
 | Package | Version | License | Source |
 |---|---|---|---|
-| @chrischall/mcp-utils | 2.15.0 | MIT | https://github.com/chrischall/mcp-utils |
+| @chrischall/mcp-utils | 3.0.0 | MIT | https://github.com/chrischall/mcp-utils |
 | @esbuild/aix-ppc64 | 0.28.2 | MIT | — |
 | @esbuild/android-arm | 0.28.2 | MIT | — |
 | @esbuild/android-arm64 | 0.28.2 | MIT | — |
@@ -49,8 +49,8 @@ MPL-2.0 is a file-level license: it covers ical.js's own files and does not exte
 | @esbuild/win32-arm64 | 0.28.2 | MIT | — |
 | @esbuild/win32-ia32 | 0.28.2 | MIT | — |
 | @esbuild/win32-x64 | 0.28.2 | MIT | — |
-| @modelcontextprotocol/core | 2.3.0 | Apache-2.0 | https://github.com/modelcontextprotocol/typescript-sdk |
-| @modelcontextprotocol/server | 2.3.0 | Apache-2.0 | https://github.com/modelcontextprotocol/typescript-sdk |
+| @modelcontextprotocol/core | 2.3.1 | Apache-2.0 | https://github.com/modelcontextprotocol/typescript-sdk |
+| @modelcontextprotocol/server | 2.3.1 | Apache-2.0 | https://github.com/modelcontextprotocol/typescript-sdk |
 | @pinojs/redact | 0.4.0 | MIT | https://github.com/pinojs/redact |
 | @rolldown/binding-android-arm-eabi | 1.2.12 | MIT | — |
 | @rolldown/binding-android-arm64 | 1.2.12 | MIT | — |
@@ -68,17 +68,17 @@ MPL-2.0 is a file-level license: it covers ical.js's own files and does not exte
 | @rolldown/binding-win32-arm64-msvc | 1.2.12 | MIT | — |
 | @rolldown/binding-win32-x64-msvc | 1.2.12 | MIT | — |
 | @xmldom/xmldom | 0.9.12 | MIT | https://github.com/xmldom/xmldom |
-| @zone-eu/mailsplit | 5.4.19 | (MIT OR EUPL-1.1+) | https://github.com/zone-eu/mailsplit |
+| @zone-eu/mailsplit | 5.4.20 | (MIT OR EUPL-1.1+) | https://github.com/zone-eu/mailsplit |
 | atomic-sleep | 1.0.0 | MIT | https://github.com/davidmarkclements/atomic-sleep |
-| dotenv | 18.0.5 | BSD-2-Clause | https://github.com/motdotla/dotenv |
+| dotenv | 18.0.6 | BSD-2-Clause | https://github.com/motdotla/dotenv |
 | encoding-japanese | 2.4.0 | MIT | https://github.com/polygonplanet/encoding.js |
 | fsevents | 2.3.3 | MIT | — |
 | ical.js | 2.2.1 | MPL-2.0 | https://github.com/kewisch/ical.js |
 | iconv-lite | 0.7.3 | MIT | https://github.com/pillarjs/iconv-lite |
-| imapflow | 2.1.2 | MIT | https://github.com/postalsys/imapflow |
+| imapflow | 2.2.10 | MIT | https://github.com/postalsys/imapflow |
 | ip-address | 10.7.2 | MIT | https://github.com/beaugunderson/ip-address |
-| libbase64 | 1.3.1 | MIT | https://github.com/nodemailer/libbase64 |
-| libmime | 5.4.6 | MIT | https://github.com/nodemailer/libmime |
+| libbase64 | 1.3.2 | MIT | https://github.com/nodemailer/libbase64 |
+| libmime | 5.4.7 | MIT | https://github.com/nodemailer/libmime |
 | libqp | 2.1.2 | MIT | https://github.com/nodemailer/libqp |
 | lightningcss-android-arm64 | 1.33.0 | MPL-2.0 | — |
 | lightningcss-darwin-arm64 | 1.33.0 | MPL-2.0 | — |
@@ -91,12 +91,12 @@ MPL-2.0 is a file-level license: it covers ical.js's own files and does not exte
 | lightningcss-linux-x64-musl | 1.33.0 | MPL-2.0 | — |
 | lightningcss-win32-arm64-msvc | 1.33.0 | MPL-2.0 | — |
 | lightningcss-win32-x64-msvc | 1.33.0 | MPL-2.0 | — |
-| nodemailer | 10.0.13 | MIT-0 | https://github.com/nodemailer/nodemailer |
+| nodemailer | 10.0.16 | MIT-0 | https://github.com/nodemailer/nodemailer |
 | on-exit-leak-free | 2.1.2 | MIT | https://github.com/mcollina/on-exit-or-gc |
 | pino | 10.3.1 | MIT | https://github.com/pinojs/pino |
 | pino-abstract-transport | 3.0.0 | MIT | https://github.com/pinojs/pino-abstract-transport |
 | pino-std-serializers | 7.1.0 | MIT | https://github.com/pinojs/pino-std-serializers |
-| postal-mime | 4.0.2 | MIT-0 | https://github.com/postalsys/postal-mime |
+| postal-mime | 4.0.5 | MIT-0 | https://github.com/postalsys/postal-mime |
 | process-warning | 5.1.0 | MIT | https://github.com/fastify/process-warning |
 | quick-format-unescaped | 4.0.4 | MIT | https://github.com/davidmarkclements/quick-format |
 | real-require | 0.2.0 | MIT | https://github.com/pinojs/real-require |
@@ -113,7 +113,7 @@ MPL-2.0 is a file-level license: it covers ical.js's own files and does not exte
 
 ## License and notice texts
 
-### @chrischall/mcp-utils@2.15.0
+### @chrischall/mcp-utils@3.0.0
 
 - License: MIT
 - Source: https://github.com/chrischall/mcp-utils
@@ -301,7 +301,7 @@ _An optional dependency that was not installed where this file was generated; se
 
 _An optional dependency that was not installed where this file was generated; see its package on npm._
 
-### @modelcontextprotocol/core@2.3.0
+### @modelcontextprotocol/core@2.3.1
 
 - License: Apache-2.0
 - Source: https://github.com/modelcontextprotocol/typescript-sdk
@@ -527,7 +527,7 @@ CC-BY-4.0. See https://creativecommons.org/licenses/by/4.0/legalcode for
 the full license text.
 ```
 
-### @modelcontextprotocol/server@2.3.0
+### @modelcontextprotocol/server@2.3.1
 
 - License: Apache-2.0
 - Source: https://github.com/modelcontextprotocol/typescript-sdk
@@ -893,7 +893,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ```
 
-### @zone-eu/mailsplit@5.4.19
+### @zone-eu/mailsplit@5.4.20
 
 - License: (MIT OR EUPL-1.1+)
 - Source: https://github.com/zone-eu/mailsplit
@@ -1113,7 +1113,7 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
 OR OTHER DEALINGS IN THE SOFTWARE.
 ```
 
-### dotenv@18.0.5
+### dotenv@18.0.6
 
 - License: BSD-2-Clause
 - Source: https://github.com/motdotla/dotenv
@@ -1620,7 +1620,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ```
 
-### imapflow@2.1.2
+### imapflow@2.2.10
 
 - License: MIT
 - Source: https://github.com/postalsys/imapflow
@@ -1675,7 +1675,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ```
 
-### libbase64@1.3.1
+### libbase64@1.3.2
 
 - License: MIT
 - Source: https://github.com/nodemailer/libbase64
@@ -1704,7 +1704,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ```
 
-### libmime@5.4.6
+### libmime@5.4.7
 
 - License: MIT
 - Source: https://github.com/nodemailer/libmime
@@ -2205,7 +2205,7 @@ _An optional dependency that was not installed where this file was generated; se
 
 _An optional dependency that was not installed where this file was generated; see its package on npm._
 
-### nodemailer@10.0.13
+### nodemailer@10.0.16
 
 - License: MIT-0
 - Source: https://github.com/nodemailer/nodemailer
@@ -2341,7 +2341,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ```
 
-### postal-mime@4.0.2
+### postal-mime@4.0.5
 
 - License: MIT-0
 - Source: https://github.com/postalsys/postal-mime

package/dist/apple-keys.js

@@ -2,10 +2,14 @@ import { createPrivateKey } from 'node:crypto';
 import { readFileSync } from 'node:fs';
 import { expandPath, readEnvVar, signEs256Jwt } from '@chrischall/mcp-utils';
 import { ConfigError, rememberSecret } from './errors.js';
-const PREFIX = {
-    music: 'APPLE_MUSIC',
-    maps: 'APPLE_MAPS',
-    weather: 'APPLE_WEATHERKIT',
+/**
+ * Each service's own key pair, spelled out in full (not built from a name
+ * stem) so every variable the server reads appears literally in the code.
+ */
+const OWN_VARS = {
+    music: { keyId: 'APPLE_MUSIC_KEY_ID', privateKey: 'APPLE_MUSIC_PRIVATE_KEY' },
+    maps: { keyId: 'APPLE_MAPS_KEY_ID', privateKey: 'APPLE_MAPS_PRIVATE_KEY' },
+    weather: { keyId: 'APPLE_WEATHERKIT_KEY_ID', privateKey: 'APPLE_WEATHERKIT_PRIVATE_KEY' },
 };
 /**
  * Accept the shapes a .p8 actually arrives in through an env block:
@@ -73,16 +77,16 @@ function readKeyFile(path, varName, service) {
  */
 export function resolveDeveloperKey(service, env = process.env) {
     const svcName = service;
-    const prefix = PREFIX[service];
+    const own = OWN_VARS[service];
     const teamId = readEnvVar('APPLE_TEAM_ID', { env });
-    const ownKeyId = readEnvVar(`${prefix}_KEY_ID`, { env });
-    const ownKey = readEnvVar(`${prefix}_PRIVATE_KEY`, { env });
+    const ownKeyId = readEnvVar(own.keyId, { env });
+    const ownKey = readEnvVar(own.privateKey, { env });
     const keyId = ownKeyId ?? readEnvVar('APPLE_KEY_ID', { env });
     let rawKey;
     let keyVar;
     if (ownKey !== undefined) {
         rawKey = ownKey;
-        keyVar = `${prefix}_PRIVATE_KEY`;
+        keyVar = own.privateKey;
     }
     else if (readEnvVar('APPLE_PRIVATE_KEY', { env }) !== undefined) {
         rawKey = readEnvVar('APPLE_PRIVATE_KEY', { env });
@@ -98,9 +102,9 @@ export function resolveDeveloperKey(service, env = process.env) {
     if (!teamId)
         missing.push('APPLE_TEAM_ID');
     if (!keyId)
-        missing.push(`APPLE_KEY_ID (or ${prefix}_KEY_ID)`);
+        missing.push(`APPLE_KEY_ID (or ${own.keyId})`);
     if (rawKey === undefined)
-        missing.push(`APPLE_PRIVATE_KEY (or ${prefix}_PRIVATE_KEY / APPLE_PRIVATE_KEY_PATH)`);
+        missing.push(`APPLE_PRIVATE_KEY (or ${own.privateKey} / APPLE_PRIVATE_KEY_PATH)`);
     if (missing.length === 0)
         assertPairMatches(service, env);
     if (missing.length > 0) {
@@ -116,7 +120,7 @@ export function resolveDeveloperKey(service, env = process.env) {
         teamId: teamId,
         keyId: keyId,
         privateKeyPem: pem,
-        source: `${ownKeyId ? `${prefix}_KEY_ID` : 'APPLE_KEY_ID'} + ${keyVar}`,
+        source: `${ownKeyId ? own.keyId : 'APPLE_KEY_ID'} + ${keyVar}`,
     };
 }
 /**
@@ -130,9 +134,9 @@ export function resolveDeveloperKey(service, env = process.env) {
  * APPLE_PRIVATE_KEY for one Music key) and is allowed.
  */
 function assertPairMatches(service, env) {
-    const prefix = PREFIX[service];
-    const ownKeyId = readEnvVar(`${prefix}_KEY_ID`, { env });
-    const ownKey = readEnvVar(`${prefix}_PRIVATE_KEY`, { env });
+    const own = OWN_VARS[service];
+    const ownKeyId = readEnvVar(own.keyId, { env });
+    const ownKey = readEnvVar(own.privateKey, { env });
     const sharedKeyId = readEnvVar('APPLE_KEY_ID', { env });
     const sharedKeyVar = readEnvVar('APPLE_PRIVATE_KEY', { env }) !== undefined
         ? 'APPLE_PRIVATE_KEY'
@@ -142,12 +146,12 @@ function assertPairMatches(service, env) {
     if (sharedKeyId === undefined || sharedKeyVar === undefined)
         return;
     if (ownKey !== undefined && ownKeyId === undefined) {
-        throw new ConfigError(service, `${prefix}_PRIVATE_KEY is set but ${prefix}_KEY_ID is not, and APPLE_KEY_ID belongs to the shared key in ${sharedKeyVar} — ` +
-            'a key id must name the key that signs the token.', [`${prefix}_KEY_ID`], `Set ${prefix}_KEY_ID to the Key ID of the key in ${prefix}_PRIVATE_KEY (Apple Developer portal → Keys), or unset ${prefix}_PRIVATE_KEY to use the shared key.`);
+        throw new ConfigError(service, `${own.privateKey} is set but ${own.keyId} is not, and APPLE_KEY_ID belongs to the shared key in ${sharedKeyVar} — ` +
+            'a key id must name the key that signs the token.', [own.keyId], `Set ${own.keyId} to the Key ID of the key in ${own.privateKey} (Apple Developer portal → Keys), or unset ${own.privateKey} to use the shared key.`);
     }
     if (ownKeyId !== undefined && ownKey === undefined && ownKeyId !== sharedKeyId) {
-        throw new ConfigError(service, `${prefix}_KEY_ID is set but ${prefix}_PRIVATE_KEY is not, and the shared key in ${sharedKeyVar} belongs to APPLE_KEY_ID — ` +
-            'a key id must name the key that signs the token.', [`${prefix}_PRIVATE_KEY`], `Set ${prefix}_PRIVATE_KEY to the .p8 contents of key ${prefix}_KEY_ID, or unset ${prefix}_KEY_ID to use the shared key.`);
+        throw new ConfigError(service, `${own.keyId} is set but ${own.privateKey} is not, and the shared key in ${sharedKeyVar} belongs to APPLE_KEY_ID — ` +
+            'a key id must name the key that signs the token.', [own.privateKey], `Set ${own.privateKey} to the .p8 contents of key ${own.keyId}, or unset ${own.keyId} to use the shared key.`);
     }
 }
 function serviceLabel(service) {