diff options
| author | Claude <noreply@anthropic.com> | 2026-11-06 00:54:48 +0000 |
|---|---|---|
| committer | Claude <noreply@anthropic.com> | 2026-11-06 00:54:48 +0000 |
| commit | 7aba3deae3ff17d032c37e07d2929d1426b34278 (patch) | |
| tree | 9c482f9acda1599bd2f9bed95a6a46b75e634e80 /external_plugins/imessage | |
| parent | 5472f5f56e0070feeeb464318b316714fe3e9105 (diff) | |
| parent | b8331dd69ab3e132bbf8cd6e89b5d8c1747e21b1 (diff) | |
Merge remote-tracking branch 'origin/main' into add-plugin/xcodeadd-plugin/xcode
Diffstat (limited to 'external_plugins/imessage')
| -rw-r--r-- | external_plugins/imessage/.claude-plugin/plugin.json | 2 | ||||
| -rw-r--r-- | external_plugins/imessage/README.md | 2 | ||||
| -rw-r--r-- | external_plugins/imessage/package.json | 2 | ||||
| -rw-r--r-- | external_plugins/imessage/server.ts | 22 |
4 files changed, 17 insertions, 11 deletions
diff --git a/external_plugins/imessage/.claude-plugin/plugin.json b/external_plugins/imessage/.claude-plugin/plugin.json index 22ad96c6..94e8740f 100644 --- a/external_plugins/imessage/.claude-plugin/plugin.json +++ b/external_plugins/imessage/.claude-plugin/plugin.json @@ -1,7 +1,7 @@ { "name": "imessage", "description": "iMessage channel for Claude Code \u2014 reads chat.db directly, sends via AppleScript. Built-in access control; manage pairing, allowlists, and policy via /imessage:access.", - "version": "0.1.0", + "version": "0.2.0", "keywords": [ "imessage", "messaging", diff --git a/external_plugins/imessage/README.md b/external_plugins/imessage/README.md index 53f66669..d512dd65 100644 --- a/external_plugins/imessage/README.md +++ b/external_plugins/imessage/README.md @@ -55,7 +55,7 @@ Handles are phone numbers (`+15551234567`) or Apple ID emails (`them@icloud.com` | **Inbound** | Polls `chat.db` once a second for `ROWID > watermark`. Watermark initializes to `MAX(ROWID)` at boot — old messages aren't replayed on restart. | | **Outbound** | `osascript` with `tell application "Messages" to send …`. Text and chat GUID pass through argv so there's no escaping footgun. | | **History & search** | Direct SQLite queries against `chat.db`. Full history — not just messages since the server started. | -| **Attachments** | `chat.db` stores absolute filesystem paths. The first inbound image per message is surfaced to the assistant as a local path it can `Read`. Outbound attachments send as separate messages after the text. | +| **Attachments** | `chat.db` stores absolute filesystem paths. Every inbound image in a message is surfaced to the assistant as a local path it can `Read` (`image_path`, `image_path_2`, …). Outbound attachments send as separate messages after the text. | ## Environment variables diff --git a/external_plugins/imessage/package.json b/external_plugins/imessage/package.json index e0588791..bc44eac4 100644 --- a/external_plugins/imessage/package.json +++ b/external_plugins/imessage/package.json @@ -1,6 +1,6 @@ { "name": "claude-channel-imessage", - "version": "0.1.0", + "version": "0.2.0", "license": "Apache-2.0", "type": "module", "bin": "./server.ts", diff --git a/external_plugins/imessage/server.ts b/external_plugins/imessage/server.ts index 9d095e3a..f7bb49ed 100644 --- a/external_plugins/imessage/server.ts +++ b/external_plugins/imessage/server.ts @@ -168,6 +168,7 @@ const qAttachments = db.query<AttRow, [number]>(` FROM attachment a JOIN message_attachment_join maj ON maj.attachment_id = a.ROWID WHERE maj.message_id = ? + ORDER BY a.ROWID `) // Your own addresses, from message.account ("E:you@icloud.com" / "p:+1555...") @@ -557,7 +558,7 @@ const mcp = new Server( instructions: [ 'The sender reads iMessage, not this session. Anything you want them to see must go through the reply tool — your transcript output never reaches their chat.', '', - 'Messages from iMessage arrive as <channel source="imessage" chat_id="..." message_id="..." user="..." ts="...">. If the tag has an image_path attribute, Read that file — it is an image the sender attached. Reply with the reply tool — pass chat_id back.', + 'Messages from iMessage arrive as <channel source="imessage" chat_id="..." message_id="..." user="..." ts="...">. If the tag has image_path attributes (image_path, image_path_2, ...), Read each file in order — they are images the sender attached. Reply with the reply tool — pass chat_id back.', '', 'reply accepts file paths (files: ["/abs/path.png"]) for attachments.', '', @@ -844,20 +845,25 @@ function handleInbound(r: Row): void { } // attachment.filename is an absolute path (sometimes tilde-prefixed) — - // already on disk, no download. Include the first image inline. - let imagePath: string | undefined + // already on disk, no download. Collect every image, in attachment ROWID order. + const imagePaths: string[] = [] if (hasAttachments) { for (const att of qAttachments.all(r.rowid)) { if (!att.filename) continue if (att.mime_type && !att.mime_type.startsWith('image/')) continue - imagePath = expandTilde(att.filename) - break + imagePaths.push(expandTilde(att.filename)) } } - // image_path goes in meta only — an in-content "[image attached — read: PATH]" + // Image paths go in meta only — an in-content "[image attached — read: PATH]" // annotation is forgeable by any allowlisted sender typing that string. - const content = text || (imagePath ? '(image)' : '') + // One key per image: image_path, image_path_2, image_path_3, ... (Claude + // Code accepts only string meta values, so no array). + const imageMeta: Record<string, string> = {} + imagePaths.forEach((p, i) => { + imageMeta[i === 0 ? 'image_path' : `image_path_${i + 1}`] = p + }) + const content = text || (imagePaths.length ? '(image)' : '') void mcp.notification({ method: 'notifications/claude/channel', @@ -868,7 +874,7 @@ function handleInbound(r: Row): void { message_id: r.guid, user: sender, ts: appleDate(r.date).toISOString(), - ...(imagePath ? { image_path: imagePath } : {}), + ...imageMeta, }, }, }) |
