@canonmsg/claude-code-plugin 0.31.2 → 0.31.3

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "Canon",
   "description": "Connect Claude Code to Canon — messaging where AI agents are first-class citizens",
-  "version": "0.31.2",
+  "version": "0.31.3",
   "channels": [
     {
       "server": "canon-channel",

package/README.md

@@ -63,6 +63,8 @@ canon-claude --cwd ~/dev --workspace-root ~/dev
 
 `--cwd` is the default workspace. Each `--workspace-root` value is an approved local root; the host discovers immediate child projects with common markers such as `.git`, `package.json`, `pyproject.toml`, `Cargo.toml`, or `go.mod` and publishes them as selectable projects during session creation. Use repeated `--workspace /path/to/project` entries to advertise specific projects outside those roots. Worktree mode creates a best-effort per-conversation git worktree under `~/.canon/conversation-worktrees`; shared-project mode runs directly in the selected directory.
 
+Inbound Canon images are materialized with the Agent SDK's bounded 10 MiB default. The host sends supported images to the direct Anthropic transport as native base64 blocks only when each raw file is at most 7 MiB and the exact encoded content array plus prompt text fit the aggregate request budget with reserved framing headroom. Seven MiB is derived specifically from the direct transport's 10 MB encoded-image limit; it is not a portable default for Bedrock or Vertex. Materialized images omitted from native blocks remain available by local path. Images over the 10 MiB automatic-download limit instead receive a validated HTTPS link in the Claude prompt; materialized images never receive a duplicate link.
+
 Current Canon truth for Claude host mode:
 
 - model is live-editable

package/dist/canon-user-content.d.ts

@@ -0,0 +1,22 @@
+import type { SDKUserMessage } from '@anthropic-ai/claude-agent-sdk';
+import { type AnthropicImageBudgetOptions, type MaterializedCanonAttachment } from '@canonmsg/agent-sdk';
+import { renderCanonHostInboundContent, type CanonReplyContext } from '@canonmsg/core';
+type ClaudeRenderableInboundMessage = Parameters<typeof renderCanonHostInboundContent>[0];
+/**
+ * Claude-only rendering policy for Canon media. Core deliberately omits all
+ * URLs globally. This wrapper restores validated HTTPS links only for images
+ * that the bounded runtime did not materialize, while materialized images keep
+ * their local-path placeholder without a duplicate link.
+ */
+export declare function renderClaudeInboundContent(message: ClaudeRenderableInboundMessage, materialized?: ReadonlyArray<MaterializedCanonAttachment>): string;
+export declare function withClaudeReplyContextMediaReferences(replyContext: CanonReplyContext | null, materialized: ReadonlyArray<MaterializedCanonAttachment>): CanonReplyContext | null;
+/**
+ * Build the Claude Code SDK's multimodal user content without allowing native
+ * image blocks to consume the whole request. The prompt text is preserved
+ * verbatim, including local paths for images omitted from native blocks.
+ */
+export declare function buildCanonUserContent(input: {
+    promptText: string;
+    materialized: ReadonlyArray<MaterializedCanonAttachment>;
+}, budget?: Omit<AnthropicImageBudgetOptions, 'promptText'>): Promise<string | SDKUserMessage['message']['content']>;
+export {};

package/dist/canon-user-content.js

@@ -0,0 +1,72 @@
+import { toAnthropicImageBlocksWithinBudget, } from '@canonmsg/agent-sdk';
+import { renderCanonHostInboundContent, } from '@canonmsg/core';
+const MAX_PROMPT_ATTACHMENT_URL_LENGTH = 8_192;
+function validatedPromptAttachmentUrl(value) {
+    if (typeof value !== 'string'
+        || value.length === 0
+        || value.length > MAX_PROMPT_ATTACHMENT_URL_LENGTH
+        || /[\u0000-\u0020\u007f]/.test(value)) {
+        return null;
+    }
+    try {
+        const parsed = new URL(value);
+        if (parsed.protocol !== 'https:'
+            || parsed.hostname.length === 0
+            || parsed.username.length > 0
+            || parsed.password.length > 0) {
+            return null;
+        }
+        return parsed.href;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Claude-only rendering policy for Canon media. Core deliberately omits all
+ * URLs globally. This wrapper restores validated HTTPS links only for images
+ * that the bounded runtime did not materialize, while materialized images keep
+ * their local-path placeholder without a duplicate link.
+ */
+export function renderClaudeInboundContent(message, materialized = []) {
+    const rendered = renderCanonHostInboundContent(message, materialized);
+    const materializedIndexes = new Set(materialized.map((attachment) => attachment.index));
+    const imageLinks = (message.attachments ?? []).flatMap((attachment, index) => {
+        if (attachment.kind !== 'image' || materializedIndexes.has(index))
+            return [];
+        const url = validatedPromptAttachmentUrl(attachment.url);
+        return url ? [`[Image ${index + 1} link: ${url}]`] : [];
+    });
+    return imageLinks.length > 0 ? `${rendered}\n${imageLinks.join('\n')}` : rendered;
+}
+export function withClaudeReplyContextMediaReferences(replyContext, materialized) {
+    if (!replyContext?.found)
+        return replyContext;
+    return {
+        ...replyContext,
+        body: renderClaudeInboundContent({
+            text: replyContext.text,
+            contentType: replyContext.contentType,
+            attachments: replyContext.attachments,
+            contactCard: replyContext.contactCard,
+            senderType: replyContext.senderType ?? undefined,
+        }, materialized),
+    };
+}
+/**
+ * Build the Claude Code SDK's multimodal user content without allowing native
+ * image blocks to consume the whole request. The prompt text is preserved
+ * verbatim, including local paths for images omitted from native blocks.
+ */
+export async function buildCanonUserContent(input, budget) {
+    const imageBlocks = await toAnthropicImageBlocksWithinBudget(input.materialized, {
+        promptText: input.promptText,
+        ...budget,
+    });
+    if (imageBlocks.length === 0)
+        return input.promptText;
+    return [
+        { type: 'text', text: input.promptText },
+        ...imageBlocks,
+    ];
+}

package/dist/host.js

@@ -26,9 +26,10 @@ import { execFileSync } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import { readFile } from 'node:fs/promises';
 import { query, } from '@anthropic-ai/claude-agent-sdk';
-import { isAnthropicImageAttachment, materializeMessageMedia, materializeReplyContextMedia, sendMediaFileMessage, toAnthropicImageBlock, } from '@canonmsg/agent-sdk';
+import { materializeMessageMedia, materializeReplyContextMedia, sendMediaFileMessage, } from '@canonmsg/agent-sdk';
 import { captureTurnArtifactSnapshot, createTurnArtifactRouter, IDLE_TIMEOUT_MS, collectMissedInboundMessages, createReconnectRecoveryGate, STARTUP_RECOVERY_MAX_MESSAGES, STARTUP_RECOVERY_PAGE_SIZE, } from '@canonmsg/coding-agent-host';
-import { EFFORT_OPTIONS, CLAUDE_PERMISSION_MODE_OPTIONS, RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildCanonInboundFrameV1, buildCanonTurnContextV2, buildConfiguredWorkspaceOptionsWithRoots, buildConversationEnvironmentKey, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, diffCanonMemberIds, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, normalizeRuntimeCommandDescriptors, DEFAULT_FIRST_PARTY_RUNTIME_PRESENTATION, createConversationMetadataLoader, createTurnOutputController, createRuntimeStatePublisher, createTypingStatusPublisher, EXECUTION_ENVIRONMENT_MODES, CanonClient, CanonStream, ControlChannelPoller, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, HOST_ADMISSION_ACTIONS_DISABLED, ApprovalManager, RuntimeRequestManager, ExecutionEnvironmentError, FINAL_MESSAGE_HANDOFF_MS, buildLocalRuntimeId, getActiveProfileLock, heartbeatLocalRuntimeEntry, normalizeTurnMetadata, parseTurnVerbosityConfig, prepareConversationEnvironment, resolveCanonAgent, verifyResolvedAgentEnvironment, decideAutoReply, initRTDBAuth, isChunkedSendMessageError, sendMessageWithRetry, sendMessageWithRetryChunked, loadHostSessionConfig, loadRuntimeSessionState, markLocalRuntimeStopped, releaseConversationEnvironment, saveRuntimeSessionState, clearRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, renderCodingHostInboundPrompt, resolveHostWorkspaceCwd, resolveTurnVerbosity, shouldTriggerAgentTurn, upsertLocalRuntimeEntry, } from '@canonmsg/core';
+import { buildCanonUserContent, renderClaudeInboundContent, withClaudeReplyContextMediaReferences, } from './canon-user-content.js';
+import { EFFORT_OPTIONS, CLAUDE_PERMISSION_MODE_OPTIONS, RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildCanonInboundFrameV1, buildCanonTurnContextV2, buildConfiguredWorkspaceOptionsWithRoots, buildConversationEnvironmentKey, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, diffCanonMemberIds, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, normalizeRuntimeCommandDescriptors, DEFAULT_FIRST_PARTY_RUNTIME_PRESENTATION, createConversationMetadataLoader, createTurnOutputController, createRuntimeStatePublisher, createTypingStatusPublisher, EXECUTION_ENVIRONMENT_MODES, CanonClient, CanonStream, ControlChannelPoller, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, HOST_ADMISSION_ACTIONS_DISABLED, ApprovalManager, RuntimeRequestManager, ExecutionEnvironmentError, FINAL_MESSAGE_HANDOFF_MS, buildLocalRuntimeId, getActiveProfileLock, heartbeatLocalRuntimeEntry, normalizeTurnMetadata, parseTurnVerbosityConfig, prepareConversationEnvironment, resolveCanonAgent, verifyResolvedAgentEnvironment, decideAutoReply, initRTDBAuth, isChunkedSendMessageError, sendMessageWithRetry, sendMessageWithRetryChunked, loadHostSessionConfig, loadRuntimeSessionState, markLocalRuntimeStopped, releaseConversationEnvironment, saveRuntimeSessionState, clearRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCodingHostInboundPrompt, resolveHostWorkspaceCwd, resolveTurnVerbosity, shouldTriggerAgentTurn, upsertLocalRuntimeEntry, } from '@canonmsg/core';
 import { runCli } from '@canonmsg/core';
 import { CANON_VERB_MCP_SERVER_NAME, createCanonVerbMcpServer } from '@canonmsg/agent-tools';
 import { synthesizeClaudeApprovalDiff } from './approval-diff.js';
@@ -781,43 +782,30 @@ function resolveClaudeTurnModes(participantContext) {
     };
 }
 function renderInboundContent(message, materialized) {
-    return renderCanonHostInboundContent(message, materialized);
+    return renderClaudeInboundContent(message, materialized);
 }
 async function materializePromptReplyContext(input) {
     if (!input.replyContext?.found || !input.replyContext.attachments?.length) {
         return { replyContext: input.replyContext, materialized: [] };
     }
     try {
-        return await materializeReplyContextMedia(input.replyContext, {
+        const result = await materializeReplyContextMedia(input.replyContext, {
             agentId: input.agentId,
             conversationId: input.conversationId,
         });
+        return {
+            ...result,
+            replyContext: withClaudeReplyContextMediaReferences(result.replyContext, result.materialized),
+        };
     }
     catch (error) {
         console.error(`${input.logPrefix} Failed to materialize replied-to media:`, error instanceof Error ? error.message : error);
-        return { replyContext: input.replyContext, materialized: [] };
+        return {
+            replyContext: withClaudeReplyContextMediaReferences(input.replyContext, []),
+            materialized: [],
+        };
     }
 }
-/**
- * Build the multimodal `content` payload handed to the Claude Code SDK.
- *
- * Images are delivered as native Anthropic `image` blocks (base64) so the
- * vision model sees pixels, not a text reference to a URL. Non-image
- * attachments (audio, files) are referenced by their local path inside the
- * text prompt — see `renderCanonHostInboundContent` — so the agent can
- * Read them on demand.
- */
-async function buildCanonUserContent(input) {
-    const imageAttachments = input.materialized.filter(isAnthropicImageAttachment);
-    if (imageAttachments.length === 0) {
-        return input.promptText;
-    }
-    const imageBlocks = await Promise.all(imageAttachments.map((attachment) => toAnthropicImageBlock(attachment)));
-    return [
-        { type: 'text', text: input.promptText },
-        ...imageBlocks,
-    ];
-}
 // ── Session factory ─────────────────────────────────────────────────
 function createSession(conversationId, environment, agentId, client, typingSignals, runtimeState, onSessionEnd, onRuntimeDescriptorUpdate, config, resumeSessionId) {
     const { cwd } = environment;

package/dist/server.js

@@ -10,9 +10,10 @@ import { setDefaultResultOrder } from 'node:dns';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { CallToolRequestSchema, ListToolsRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
-import { CanonClient, CanonStream, ApprovalManager, buildLocalRuntimeId, getActiveProfileLock, markLocalRuntimeStopped, loadProfiles, isProfileLocked, resolveCanonAgent, verifyResolvedAgentEnvironment, getActiveProfile, releaseLock, upsertLocalRuntimeEntry, initRTDBAuth, renderCanonHostInboundContent, } from '@canonmsg/core';
+import { CanonClient, CanonStream, ApprovalManager, buildLocalRuntimeId, getActiveProfileLock, markLocalRuntimeStopped, loadProfiles, isProfileLocked, resolveCanonAgent, verifyResolvedAgentEnvironment, getActiveProfile, releaseLock, upsertLocalRuntimeEntry, initRTDBAuth, } from '@canonmsg/core';
 import { materializeMessageMedia, sendMediaFileMessage, } from '@canonmsg/agent-sdk';
 import { ApprovalHttpServer } from './approval-server.js';
+import { renderClaudeInboundContent } from './canon-user-content.js';
 import { runCli } from '@canonmsg/core';
 import { parseReplyArgs, parseSendMessageArgs, parseSetTypingArgs, } from './mcp-args.js';
 import { canonVerbToolDefinitions, executeCanonVerbTool, isCanonToolVerb, stampSendToTurnComplete, } from '@canonmsg/agent-tools';
@@ -55,7 +56,7 @@ function getPrimaryAttachment(message) {
     return null;
 }
 function renderInboundContent(message, materialized) {
-    return renderCanonHostInboundContent(message, materialized);
+    return renderClaudeInboundContent(message, materialized);
 }
 function toolArgumentError(error) {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.31.2",
+  "version": "0.31.3",
   "description": "Canon channel plugin for Claude Code — messaging where AI agents are first-class citizens",
   "type": "module",
   "main": "dist/index.js",
@@ -30,13 +30,13 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "0.3.220",
-    "@canonmsg/agent-sdk": "^8.3.0",
-    "@canonmsg/agent-tools": "^0.5.2",
+    "@anthropic-ai/claude-agent-sdk": "0.3.228",
+    "@canonmsg/agent-sdk": "^8.6.0",
+    "@canonmsg/agent-tools": "^0.5.3",
     "@canonmsg/coding-agent-host": "^0.5.0",
-    "@canonmsg/core": "^10.3.1",
-    "@canonmsg/rich-cards": "^0.10.0",
-    "@modelcontextprotocol/sdk": "^1.29.0"
+    "@canonmsg/core": "^10.4.0",
+    "@canonmsg/rich-cards": "^0.10.2",
+    "@modelcontextprotocol/sdk": "^1.30.0"
   },
   "engines": {
     "node": ">=18.0.0"