@canonmsg/claude-code-plugin 0.12.7 → 0.13.0

package/dist/host.js

@@ -26,11 +26,11 @@ import { execFileSync } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import { query, } from '@anthropic-ai/claude-agent-sdk';
 import { isAnthropicImageAttachment, materializeMessageMedia, toAnthropicImageBlock, } from '@canonmsg/agent-sdk';
-import { CLAUDE_PERMISSION_MODE_OPTIONS, buildCanonHostPrompt, buildConfiguredWorkspaceOptionsWithRoots, buildConversationEnvironmentKey, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, buildPlanApprovalRequest, buildQuestionRequest, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, createConversationMetadataLoader, createRuntimeStatePublisher, EXECUTION_ENVIRONMENT_MODES, CanonClient, CanonStream, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, HOST_ADMISSION_ACTIONS_DISABLED, ExecutionEnvironmentError, FINAL_MESSAGE_HANDOFF_MS, buildLocalRuntimeId, getActiveProfileLock, heartbeatLocalRuntimeEntry, normalizeTurnMetadata, prepareConversationEnvironment, resolveCanonAgent, initRTDBAuth, rtdbRead, rtdbWrite, loadHostSessionConfig, loadRuntimeSessionState, markLocalRuntimeStopped, releaseConversationEnvironment, saveRuntimeSessionState, clearRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, resolveHostWorkspaceCwd, upsertLocalRuntimeEntry, } from '@canonmsg/core';
+import { CLAUDE_PERMISSION_MODE_OPTIONS, RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildCanonHostPrompt, buildConfiguredWorkspaceOptionsWithRoots, buildConversationEnvironmentKey, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, buildPlanApprovalRequest, buildQuestionRequest, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, createConversationMetadataLoader, createRuntimeStatePublisher, EXECUTION_ENVIRONMENT_MODES, CanonClient, CanonStream, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, HOST_ADMISSION_ACTIONS_DISABLED, ExecutionEnvironmentError, FINAL_MESSAGE_HANDOFF_MS, buildLocalRuntimeId, getActiveProfileLock, heartbeatLocalRuntimeEntry, normalizeTurnMetadata, prepareConversationEnvironment, resolveCanonAgent, initRTDBAuth, rtdbRead, rtdbWrite, loadHostSessionConfig, loadRuntimeSessionState, markLocalRuntimeStopped, releaseConversationEnvironment, saveRuntimeSessionState, clearRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, resolveHostWorkspaceCwd, upsertLocalRuntimeEntry, } from '@canonmsg/core';
 import { buildInboundContextLines, decideAutoReply, } from './inbound-policy.js';
 import { createStreamingBuffer } from './streaming-buffer.js';
 import { runCli } from './cli-entry.js';
-import { buildClaudeFinalMessageId, createClaudeInputEnvelope, formatClaudeControlError, mergeClaudeModelOptions, shouldDeliverClaudeFinal, } from './session-state.js';
+import { buildClaudeFinalMessageId, createClaudeInputEnvelope, formatClaudeControlError, mergeClaudeModelOptions, resetClaudeCompletedTurnState, shouldDeliverClaudeFinal, } from './session-state.js';
 const HELP = `canon-claude — run a local Claude Code agent host for Canon
 
 USAGE
@@ -154,26 +154,9 @@ function buildClaudeRuntimeDescriptor(input) {
                 availability: ['always'],
                 dispatch: { kind: 'open_details', target: 'effort' },
             },
-            {
-                id: 'stop',
-                label: 'Stop',
-                description: 'Interrupt the current Claude turn.',
-                aliases: ['stop'],
-                category: 'turn',
-                placements: ['composer_slash', 'command_palette'],
-                availability: ['busy'],
-                dispatch: { kind: 'signal', signal: 'interrupt' },
-            },
-            {
-                id: 'stop-and-clear-queue',
-                label: 'Stop & clear queue',
-                description: 'Interrupt the current Claude turn and drop queued Canon messages.',
-                aliases: ['stop-clear', 'clear-queue'],
-                category: 'turn',
-                placements: ['composer_slash', 'command_palette', 'session_strip'],
-                availability: ['busy_with_queue'],
-                dispatch: { kind: 'signal', signal: 'stop_and_drop' },
-            },
+            RUNTIME_STOP_ACTION,
+            RUNTIME_STOP_AND_DROP_ACTION,
+            RUNTIME_NEW_SESSION_ACTION,
         ],
     });
 }
@@ -654,6 +637,9 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
                     const questions = input.questions ?? [];
                     const questionCard = buildQuestionRequest(questionId, questions);
                     await client.sendMessage(conversationId, questionCard.text, {
+                        ...(session.activeSelfContextId
+                            ? { selfContextId: session.activeSelfContextId }
+                            : {}),
                         metadata: {
                             ...questionCard.metadata,
                             turnSemantics: 'control',
@@ -699,6 +685,9 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
                         summary: 'Claude has prepared a plan and is asking permission to continue.',
                     });
                     await client.sendMessage(conversationId, planApproval.text, {
+                        ...(session.activeSelfContextId
+                            ? { selfContextId: session.activeSelfContextId }
+                            : {}),
                         metadata: {
                             ...planApproval.metadata,
                             turnSemantics: 'control',
@@ -760,6 +749,7 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
         turnState: 'idle',
         currentTurnId: null,
         currentTurnOpenedAt: null,
+        activeSelfContextId: null,
         lastAcceptedIntent: null,
         lastActivity: Date.now(),
         typingKeepaliveTimer: null,
@@ -815,15 +805,9 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
         if (session.closed)
             return;
         clearFinalDeliveryTimer();
-        session.currentTurnId = null;
-        session.currentTurnOpenedAt = null;
-        session.lastAcceptedIntent = null;
-        session.pendingFinalText = null;
-        session.pendingFinalDelivery = null;
-        session.activeInput = null;
-        session.toolInProgress = false;
-        session.turnState = 'idle';
+        resetClaudeCompletedTurnState(session);
         stopVisibleWorkSignal();
+        writeState();
         writeTurn();
         drainPendingInput();
     }
@@ -875,6 +859,9 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
         try {
             await client.sendMessage(conversationId, finalText, {
                 messageId: finalMessageId,
+                ...(session.activeSelfContextId
+                    ? { selfContextId: session.activeSelfContextId }
+                    : {}),
                 metadata: {
                     turnId: session.currentTurnId,
                     turnKey: deliverTurn.turnKey,
@@ -1560,19 +1547,20 @@ export async function main() {
             isOwner: input.isOwner,
         });
     }
-    function closeSession(conversationId) {
+    function closeSession(conversationId, options = {}) {
         const session = sessions.get(conversationId);
         if (!session)
             return;
+        const saveResume = options.saveResume !== false;
         session.closed = true;
         if (session.typingKeepaliveTimer) {
             clearInterval(session.typingKeepaliveTimer);
             session.typingKeepaliveTimer = null;
         }
         releaseConversationEnvironment(session.environment);
-        // Save SDK session ID for future resume
-        if (session.sdkSessionId) {
-            savedSessionIds.set(buildConversationEnvironmentKey(conversationId, session.environment.baseCwd), session.sdkSessionId);
+        const resumeKey = buildConversationEnvironmentKey(conversationId, session.environment.baseCwd);
+        if (saveResume && session.sdkSessionId) {
+            savedSessionIds.set(resumeKey, session.sdkSessionId);
             saveRuntimeSessionState(runtimeId, {
                 conversationId,
                 baseCwd: session.environment.baseCwd,
@@ -1580,6 +1568,27 @@ export async function main() {
                 claudeSessionId: session.sdkSessionId,
             });
         }
+        else {
+            const existingState = loadRuntimeSessionState(runtimeId, {
+                conversationId,
+                baseCwd: session.environment.baseCwd,
+                executionMode: session.environment.mode,
+            });
+            savedSessionIds.delete(resumeKey);
+            clearRuntimeSessionState(runtimeId, {
+                conversationId,
+                baseCwd: session.environment.baseCwd,
+                executionMode: session.environment.mode,
+            });
+            if (existingState?.lastInboundMessageId) {
+                saveRuntimeSessionState(runtimeId, {
+                    conversationId,
+                    baseCwd: session.environment.baseCwd,
+                    executionMode: session.environment.mode,
+                    lastInboundMessageId: existingState.lastInboundMessageId,
+                });
+            }
+        }
         if (session.streamingTimer)
             clearTimeout(session.streamingTimer);
         session.streamingText = '';
@@ -1600,7 +1609,22 @@ export async function main() {
         }
         catch { }
         sessions.delete(conversationId);
-        console.error(`[canon-host] [${conversationId.slice(0, 8)}] Session suspended (sessionId saved for resume)`);
+        console.error(`[canon-host] [${conversationId.slice(0, 8)}] Session ${options.reason ?? (saveResume ? 'suspended (sessionId saved for resume)' : 'cleared')}`);
+    }
+    async function resetRuntimeSession(session) {
+        const conversationId = session.conversationId;
+        const droppedInputs = session.pendingInputs.splice(0);
+        await markSessionPendingInputsRejected(conversationId, droppedInputs);
+        if (session.activeInput) {
+            session.interruptedTurnKeys.add(session.activeInput.turnKey);
+        }
+        session.pendingFinalText = null;
+        session.pendingFinalDelivery = null;
+        session.turnState = 'interrupted';
+        if (session.state.state === 'running') {
+            await session.query.interrupt().catch(() => { });
+        }
+        closeSession(conversationId, { saveResume: false, reason: 'reset for new Canon session' });
     }
     async function markSessionPendingInputsRejected(conversationId, inputs) {
         await Promise.all(inputs.map((input) => {
@@ -1757,7 +1781,7 @@ export async function main() {
             isOwner,
         });
         const behavior = input.hydratedPage?.behavior ?? hydrated.behavior;
-        const workSessions = input.hydratedPage?.workSessions ?? hydrated.workSessions;
+        const selfContexts = input.hydratedPage?.selfContexts ?? hydrated.selfContexts;
         const participantContext = hydrated.participantContext;
         const autoReply = decideAutoReply(participantContext, behavior);
         if (!autoReply.allow) {
@@ -1773,6 +1797,7 @@ export async function main() {
             const userMessage = error instanceof ExecutionEnvironmentError ? error.userMessage : message;
             console.error(`[canon-host] [${input.conversationId.slice(0, 8)}] Failed to create recovered session: ${message}`);
             await client.sendMessage(input.conversationId, `I couldn't start a coding session for this workspace: ${userMessage}`, {
+                ...(selfContexts[0]?.id ? { selfContextId: selfContexts[0].id } : {}),
                 metadata: {
                     turnSemantics: 'turn_complete',
                     turnComplete: true,
@@ -1782,6 +1807,7 @@ export async function main() {
             return;
         }
         const turnMetadata = normalizeTurnMetadata(m.metadata);
+        session.activeSelfContextId = selfContexts[0]?.id ?? null;
         const deliveryIntent = turnMetadata?.deliveryIntent ?? 'queue';
         const shouldMarkAccepted = turnMetadata?.inboundDisposition === 'queued';
         const promptText = buildCanonPrompt({
@@ -1789,8 +1815,7 @@ export async function main() {
             conversationId: input.conversationId,
             participantContext,
             behavior,
-            workSession: m.workSession,
-            workSessions,
+            selfContexts,
             session,
         });
         const messageContent = await buildCanonUserContent({ promptText, materialized });
@@ -1902,11 +1927,11 @@ export async function main() {
                         isOwner,
                     });
                     const behavior = payload.behavior ?? hydrated.behavior;
-                    const workSessions = hydrated.hydratedFromPage
-                        ? hydrated.workSessions
-                        : Array.isArray(payload.workSessions)
-                            ? payload.workSessions
-                            : hydrated.workSessions;
+                    const selfContexts = hydrated.hydratedFromPage
+                        ? hydrated.selfContexts
+                        : Array.isArray(payload.selfContexts)
+                            ? payload.selfContexts
+                            : hydrated.selfContexts;
                     const participantContext = hydrated.participantContext;
                     const autoReply = decideAutoReply(participantContext, behavior);
                     if (!autoReply.allow) {
@@ -1923,6 +1948,7 @@ export async function main() {
                         const userMessage = error instanceof ExecutionEnvironmentError ? error.userMessage : message;
                         console.error(`[canon-host] [${convoId.slice(0, 8)}] Failed to create session: ${message}`);
                         await client.sendMessage(convoId, `I couldn't start a coding session for this workspace: ${userMessage}`, {
+                            ...(selfContexts[0]?.id ? { selfContextId: selfContexts[0].id } : {}),
                             metadata: {
                                 turnSemantics: 'turn_complete',
                                 turnComplete: true,
@@ -1932,6 +1958,7 @@ export async function main() {
                         return;
                     }
                     const turnMetadata = normalizeTurnMetadata(m.metadata);
+                    session.activeSelfContextId = selfContexts[0]?.id ?? null;
                     const deliveryIntent = turnMetadata?.deliveryIntent ?? 'queue';
                     const shouldMarkAccepted = turnMetadata?.inboundDisposition === 'queued';
                     const promptText = buildCanonPrompt({
@@ -1939,8 +1966,7 @@ export async function main() {
                         conversationId: convoId,
                         participantContext,
                         behavior,
-                        workSession: m.workSession,
-                        workSessions,
+                        selfContexts,
                         session,
                     });
                     const messageContent = await buildCanonUserContent({ promptText, materialized });
@@ -2042,10 +2068,17 @@ export async function main() {
                     if (sig && typeof sig === 'object') {
                         const s = sig;
                         const ts = s.updatedAt ?? 0;
-                        if ((s.type === 'interrupt' || s.type === 'stop_and_drop') && ts > (lastSeenSignal.get(convoId) ?? 0)) {
+                        if ((s.type === 'interrupt' || s.type === 'stop_and_drop' || s.type === 'new_session')
+                            && ts > (lastSeenSignal.get(convoId) ?? 0)) {
                             lastSeenSignal.set(convoId, ts);
                             const session = sessions.get(convoId);
                             if (session && !session.closed) {
+                                if (s.type === 'new_session') {
+                                    console.error(`[canon-host] [${convoId.slice(0, 8)}] new_session signal`);
+                                    await resetRuntimeSession(session);
+                                    await rtdbWrite(`/control/${convoId}/${agentId}/signal`, null).catch(() => { });
+                                    continue;
+                                }
                                 const isActive = session.state.state === 'running';
                                 if (!isActive && (s.type !== 'stop_and_drop' || session.pendingInputs.length === 0)) {
                                     await rtdbWrite(`/control/${convoId}/${agentId}/signal`, null).catch(() => { });

package/dist/server.js

@@ -10,7 +10,8 @@ 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, getActiveProfile, releaseLock, upsertLocalRuntimeEntry, initRTDBAuth, writeSessionState, clearSessionState, } from '@canonmsg/core';
+import { CanonClient, CanonStream, ApprovalManager, buildLocalRuntimeId, getActiveProfileLock, markLocalRuntimeStopped, loadProfiles, isProfileLocked, resolveCanonAgent, getActiveProfile, releaseLock, upsertLocalRuntimeEntry, initRTDBAuth, writeSessionState, clearSessionState, renderCanonHostInboundContent, } from '@canonmsg/core';
+import { materializeMessageMedia, sendMediaFileMessage, } from '@canonmsg/agent-sdk';
 import { ApprovalHttpServer } from './approval-server.js';
 import { runCli } from './cli-entry.js';
 const HELP = `canon-channel-server — Claude Code MCP channel server for Canon
@@ -49,31 +50,8 @@ function getPrimaryAttachment(message) {
         return attachment;
     return null;
 }
-function renderInboundContent(message) {
-    const content = message.text || '';
-    const attachment = getPrimaryAttachment(message);
-    // MCP channel mode does not yet materialize media into local files. Surface
-    // a placeholder that tells the model media *was* attached without inlining a
-    // Firebase Storage URL: the model cannot fetch it, and reasoning about a
-    // URL-as-string leads to hallucinated image descriptions. The `attachment_*`
-    // fields on the structured `meta` sidechannel still carry the URL for UI /
-    // telemetry consumers.
-    let placeholder = null;
-    if (attachment?.kind === 'audio') {
-        const duration = attachment.durationMs ? ` (${Math.round(attachment.durationMs / 1000)}s)` : '';
-        placeholder = `[Voice message${duration} — ask sender to resend if you need the audio]`;
-    }
-    else if (attachment?.kind === 'image') {
-        placeholder = '[Image attached — not yet materialized into this session; ask sender to describe if needed]';
-    }
-    else if (attachment?.kind === 'file') {
-        const label = attachment.fileName || 'File';
-        placeholder = `[File: ${label} — not yet materialized into this session]`;
-    }
-    if (placeholder) {
-        return content ? `${placeholder}\n${content}` : placeholder;
-    }
-    return content;
+function renderInboundContent(message, materialized) {
+    return renderCanonHostInboundContent(message, materialized);
 }
 // ── Tool definitions ───────────────────────────────────────────────────
 server.setRequestHandler(ListToolsRequestSchema, async () => ({
@@ -127,54 +105,58 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
                         type: 'string',
                         description: 'File URL (when content_type is file)',
                     },
+                    media_path: {
+                        type: 'string',
+                        description: 'Local image/audio/file path to upload and send',
+                    },
                     file_name: {
                         type: 'string',
                         description: 'Optional display filename for file attachments',
                     },
+                    mime_type: {
+                        type: 'string',
+                        description: 'Optional MIME type for media_path uploads',
+                    },
+                    duration_ms: {
+                        type: 'number',
+                        description: 'Optional audio duration in milliseconds for media_path uploads',
+                    },
                 },
                 required: ['conversation_id'],
             },
         },
         {
-            name: 'send_linked_message',
-            description: 'Send a message into another Canon conversation under an existing or lazily created shared work session',
+            name: 'send_contextual_message',
+            description: 'Send a message into another Canon conversation or contact with private cross-session self-context',
             inputSchema: {
                 type: 'object',
                 properties: {
                     source_conversation_id: {
                         type: 'string',
-                        description: 'The originating conversation for the shared task',
+                        description: 'The Canon conversation where this cross-session intent originated',
                     },
                     target_conversation_id: {
                         type: 'string',
-                        description: 'The destination conversation to send into',
+                        description: 'The destination Canon conversation to send into',
                     },
-                    text: {
+                    target_user_id: {
                         type: 'string',
-                        description: 'Message text to send',
+                        description: 'The destination Canon user/contact to reach out to',
                     },
-                    work_session_id: {
+                    text: {
                         type: 'string',
-                        description: 'Reuse an existing Canon work session when known',
-                    },
-                    create_work_session: {
-                        type: 'object',
-                        description: 'Optional initial work-session fields when creating a new shared task',
-                    },
-                    source_context: {
-                        type: 'object',
-                        description: 'Optional scoped context patch for the source conversation',
+                        description: 'Message text to send',
                     },
-                    target_context: {
+                    self_context: {
                         type: 'object',
-                        description: 'Optional scoped context patch for the target conversation',
+                        description: 'Required { type: "cross_session", context: "why I am saying this here" }',
                     },
                     message_options: {
                         type: 'object',
-                        description: 'Optional Canon send options for the linked outbound message',
+                        description: 'Optional Canon send options for the contextual outbound message',
                     },
                 },
-                required: ['source_conversation_id', 'target_conversation_id', 'text'],
+                required: ['source_conversation_id', 'text', 'self_context'],
             },
         },
         {
@@ -256,14 +238,39 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             const imageUrl = typeof args.image_url === 'string' ? args.image_url : null;
             const audioUrl = typeof args.audio_url === 'string' ? args.audio_url : null;
             const fileUrl = typeof args.file_url === 'string' ? args.file_url : null;
+            const mediaPath = typeof args.media_path === 'string' ? args.media_path : null;
             const fileName = typeof args.file_name === 'string' ? args.file_name : null;
+            const mimeType = typeof args.mime_type === 'string' ? args.mime_type : null;
+            const durationMs = typeof args.duration_ms === 'number' ? args.duration_ms : null;
+            const metadata = TURN_COMPLETE_METADATA;
+            if (mediaPath) {
+                const result = await sendMediaFileMessage(client, conversationId, mediaPath, text, {
+                    ...(fileName ? { fileName } : {}),
+                    ...(mimeType ? { mimeType } : {}),
+                    ...(durationMs != null ? { durationMs } : {}),
+                    metadata,
+                });
+                return {
+                    content: [
+                        {
+                            type: 'text',
+                            text: `Message sent (${result.messageId})`,
+                        },
+                    ],
+                };
+            }
             if (contentType === 'image' && imageUrl) {
                 opts.contentType = 'image';
                 opts.attachments = [{ kind: 'image', url: imageUrl }];
             }
             else if (contentType === 'audio' && audioUrl) {
                 opts.contentType = 'audio';
-                opts.attachments = [{ kind: 'audio', url: audioUrl }];
+                opts.attachments = [{
+                        kind: 'audio',
+                        url: audioUrl,
+                        ...(durationMs != null ? { durationMs } : {}),
+                        ...(mimeType ? { mimeType } : {}),
+                    }];
             }
             else if (contentType === 'file' || fileUrl) {
                 opts.contentType = 'file';
@@ -272,6 +279,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                             kind: 'file',
                             url: fileUrl,
                             ...(fileName ? { fileName } : {}),
+                            ...(mimeType ? { mimeType } : {}),
                         }];
                 }
             }
@@ -280,7 +288,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             }
             opts.metadata = {
                 ...(opts.metadata ?? {}),
-                ...TURN_COMPLETE_METADATA,
+                ...metadata,
             };
             const result = await client.sendMessage(conversationId, text, opts);
             return {
@@ -292,50 +300,32 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 ],
             };
         }
-        case 'send_linked_message': {
+        case 'send_contextual_message': {
             const sourceConversationId = args.source_conversation_id;
-            const targetConversationId = args.target_conversation_id;
-            const text = args.text;
-            const workSessionId = typeof args.work_session_id === 'string' ? args.work_session_id : undefined;
-            const createWorkSession = typeof args.create_work_session === 'object' && args.create_work_session != null
-                ? args.create_work_session
-                : undefined;
-            const sourceContext = typeof args.source_context === 'object' && args.source_context != null
-                ? args.source_context
+            const targetConversationId = typeof args.target_conversation_id === 'string'
+                ? args.target_conversation_id
                 : undefined;
-            const targetContext = typeof args.target_context === 'object' && args.target_context != null
-                ? args.target_context
+            const targetUserId = typeof args.target_user_id === 'string' ? args.target_user_id : undefined;
+            const text = args.text;
+            const selfContext = typeof args.self_context === 'object' && args.self_context != null
+                ? args.self_context
                 : undefined;
             const messageOptions = typeof args.message_options === 'object' && args.message_options != null
                 ? args.message_options
                 : undefined;
-            const linkedMessageOptions = messageOptions;
-            const result = await client.sendLinkedMessage({
+            const contextualMessageOptions = messageOptions;
+            const result = await client.sendContextualMessage({
                 sourceConversationId,
-                targetConversationId,
+                ...(targetConversationId ? { targetConversationId } : {}),
+                ...(targetUserId ? { targetUserId } : {}),
                 text,
-                ...(workSessionId ? { workSessionId } : {}),
-                ...(createWorkSession
-                    ? {
-                        createWorkSession: createWorkSession,
-                    }
-                    : {}),
-                ...(sourceContext
-                    ? {
-                        sourceContext: sourceContext,
-                    }
-                    : {}),
-                ...(targetContext
-                    ? {
-                        targetContext: targetContext,
-                    }
-                    : {}),
-                ...(linkedMessageOptions
+                selfContext: selfContext,
+                ...(contextualMessageOptions
                     ? {
                         messageOptions: {
-                            ...linkedMessageOptions,
+                            ...contextualMessageOptions,
                             metadata: {
-                                ...(linkedMessageOptions.metadata ?? {}),
+                                ...(contextualMessageOptions.metadata ?? {}),
                                 ...TURN_COMPLETE_METADATA,
                             },
                         },
@@ -346,7 +336,9 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 content: [
                     {
                         type: 'text',
-                        text: `Linked message sent (${result.messageId}) via work session ${result.workSessionId}${result.workSessionCreated ? ' [created]' : ''}`,
+                        text: result.status === 'messaged'
+                            ? `Contextual message sent (${result.messageId}) via self-context ${result.selfContextId}`
+                            : `Contextual message not sent: ${result.status}`,
                     },
                 ],
             };
@@ -454,58 +446,30 @@ async function handleInboundMessage(payload) {
             meta.behavior_instructions = payload.behavior.instructions.join('\n\n');
         }
     }
-    if (m.workSession) {
-        meta.work_session_id = m.workSession.id;
-        if (m.workSession.title)
-            meta.work_session_title = m.workSession.title;
-        if (m.workSession.objective)
-            meta.work_session_objective = m.workSession.objective;
-        if (m.workSession.status)
-            meta.work_session_status = m.workSession.status;
-        if (m.workSession.currentConversationRole) {
-            meta.work_session_role = m.workSession.currentConversationRole;
-        }
-        if (m.workSession.representation) {
-            meta.work_session_representation = m.workSession.representation;
-        }
-        if (m.workSession.disclosure) {
-            meta.work_session_disclosure = m.workSession.disclosure;
-        }
-        if (m.workSession.summary)
-            meta.work_session_summary = m.workSession.summary;
-        if (m.workSession.sourceConversationLabel) {
-            meta.work_session_source_conversation = m.workSession.sourceConversationLabel;
-        }
-        else if (m.workSession.sourceConversationId) {
-            meta.work_session_source_conversation = m.workSession.sourceConversationId;
-        }
-        if (m.workSession.sourceParticipantLabel) {
-            meta.work_session_source_participant = m.workSession.sourceParticipantLabel;
-        }
-        else if (m.workSession.sourceParticipantId) {
-            meta.work_session_source_participant = m.workSession.sourceParticipantId;
-        }
-        if (Array.isArray(m.workSession.visibleFacts) && m.workSession.visibleFacts.length > 0) {
-            meta.work_session_visible_facts = m.workSession.visibleFacts.join('\n\n');
-        }
-        if (Array.isArray(m.workSession.pendingQuestions)
-            && m.workSession.pendingQuestions.length > 0) {
-            meta.work_session_pending_questions = m.workSession.pendingQuestions.join('\n\n');
-        }
-        if (Array.isArray(m.workSession.disclosureNotes)
-            && m.workSession.disclosureNotes.length > 0) {
-            meta.work_session_disclosure_notes = m.workSession.disclosureNotes.join('\n\n');
-        }
-    }
-    if (Array.isArray(payload.workSessions) && payload.workSessions.length > 0) {
-        meta.active_work_session_ids = payload.workSessions
-            .map((workSession) => workSession.id)
+    if (Array.isArray(payload.selfContexts) && payload.selfContexts.length > 0) {
+        meta.self_context_ids = payload.selfContexts
+            .map((selfContext) => selfContext.id)
             .join('\n');
-        const titled = payload.workSessions
-            .map((workSession) => workSession.title || workSession.id)
-            .filter((value) => value.length > 0);
-        if (titled.length > 0) {
-            meta.active_work_session_titles = titled.join('\n');
+        meta.self_context_types = payload.selfContexts
+            .map((selfContext) => selfContext.type)
+            .join('\n');
+        meta.self_context = payload.selfContexts
+            .map((selfContext) => selfContext.context)
+            .join('\n\n');
+    }
+    let materialized = [];
+    if (m.id && m.attachments?.length) {
+        try {
+            materialized = await materializeMessageMedia({
+                id: m.id,
+                attachments: m.attachments ?? [],
+            }, {
+                agentId: agentContext?.agentId ?? 'claude-code',
+                conversationId: payload.conversationId,
+            });
+        }
+        catch (error) {
+            console.error(`[canon] Failed to materialize inbound media: ${error instanceof Error ? error.message : error}`);
         }
     }
     const primaryAttachment = getPrimaryAttachment(m);
@@ -515,7 +479,14 @@ async function handleInboundMessage(payload) {
     }
     if (primaryAttachment?.fileName)
         meta.attachment_file_name = primaryAttachment.fileName;
-    const renderedContent = renderInboundContent(m);
+    if (primaryAttachment?.mimeType)
+        meta.attachment_mime_type = primaryAttachment.mimeType;
+    if (primaryAttachment?.durationMs != null)
+        meta.attachment_duration_ms = String(primaryAttachment.durationMs);
+    const primaryMaterialized = materialized.find((attachment) => attachment.index === 0);
+    if (primaryMaterialized?.path)
+        meta.attachment_path = primaryMaterialized.path;
+    const renderedContent = renderInboundContent(m, materialized);
     console.error(`[canon] Inbound message from ${meta.sender_name}: "${renderedContent}"`);
     try {
         await server.notification({

package/dist/session-state.d.ts

@@ -1,5 +1,5 @@
 import type { SDKUserMessage } from '@anthropic-ai/claude-agent-sdk';
-import type { DeliveryIntent, ModelOption } from '@canonmsg/core';
+import type { DeliveryIntent, ModelOption, TurnLifecycleState } from '@canonmsg/core';
 export type ClaudeInputKind = 'seed' | 'canon';
 export interface ClaudeInputEnvelope {
     kind: ClaudeInputKind;
@@ -19,6 +19,19 @@ export interface ClaudePendingFinalDelivery {
     text: string;
     messageId: string;
 }
+export interface ClaudeCompletedTurnState {
+    state: {
+        state?: 'idle' | 'running' | 'requires_action';
+    };
+    pendingFinalText: string | null;
+    pendingFinalDelivery: ClaudePendingFinalDelivery | null;
+    activeInput: ClaudeInputEnvelope | null;
+    toolInProgress: boolean;
+    turnState: TurnLifecycleState;
+    currentTurnId: string | null;
+    currentTurnOpenedAt: number | null;
+    lastAcceptedIntent: DeliveryIntent | null;
+}
 export declare function createClaudeInputEnvelope(input: {
     kind: ClaudeInputKind;
     msg: SDKUserMessage;
@@ -36,6 +49,7 @@ export declare function shouldDeliverClaudeFinal(input: {
     finalizedTurnKeys: ReadonlySet<string>;
     interruptedTurnKeys: ReadonlySet<string>;
 }): boolean;
+export declare function resetClaudeCompletedTurnState(session: ClaudeCompletedTurnState): void;
 export declare function mergeClaudeModelOptions(input: {
     previous: ReadonlyArray<ModelOption>;
     next: ReadonlyArray<ModelOption>;

package/dist/session-state.js

@@ -29,6 +29,17 @@ export function shouldDeliverClaudeFinal(input) {
         return false;
     return true;
 }
+export function resetClaudeCompletedTurnState(session) {
+    session.state.state = 'idle';
+    session.currentTurnId = null;
+    session.currentTurnOpenedAt = null;
+    session.lastAcceptedIntent = null;
+    session.pendingFinalText = null;
+    session.pendingFinalDelivery = null;
+    session.activeInput = null;
+    session.toolInProgress = false;
+    session.turnState = 'idle';
+}
 export function mergeClaudeModelOptions(input) {
     const byValue = new Map();
     for (const option of input.previous) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.12.7",
+  "version": "0.13.0",
   "description": "Canon channel plugin for Claude Code — messaging where AI agents are first-class citizens",
   "type": "module",
   "main": "dist/index.js",
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.101",
-    "@canonmsg/agent-sdk": "^1.1.2",
-    "@canonmsg/core": "^0.15.4",
+    "@canonmsg/agent-sdk": "^1.2.0",
+    "@canonmsg/core": "^0.16.0",
     "@modelcontextprotocol/sdk": "^1.12.0"
   },
   "engines": {