@canonmsg/claude-code-plugin 0.14.11 → 0.14.13

package/dist/host.js

@@ -26,9 +26,8 @@ import { execFileSync } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import { query, } from '@anthropic-ai/claude-agent-sdk';
 import { isAnthropicImageAttachment, materializeMessageMedia, materializeReplyContextMedia, toAnthropicImageBlock, } from '@canonmsg/agent-sdk';
-import { CLAUDE_PERMISSION_MODE_OPTIONS, RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildCanonHostPrompt, buildConfiguredWorkspaceOptionsWithRoots, buildConversationEnvironmentKey, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, diffCanonMemberIds, buildPlanApprovalRequest, buildQuestionRequest, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, DEFAULT_FIRST_PARTY_RUNTIME_PRESENTATION, createConversationMetadataLoader, createRuntimeStatePublisher, EXECUTION_ENVIRONMENT_MODES, CanonClient, CanonStream, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, HOST_ADMISSION_ACTIONS_DISABLED, ApprovalManager, 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, diffCanonMemberIds, buildPlanApprovalRequest, buildQuestionRequest, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, DEFAULT_FIRST_PARTY_RUNTIME_PRESENTATION, createConversationMetadataLoader, createTurnOutputController, createRuntimeStatePublisher, EXECUTION_ENVIRONMENT_MODES, CanonClient, CanonStream, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, HOST_ADMISSION_ACTIONS_DISABLED, ApprovalManager, 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 { decideClaudeToolPermissionForMode, parseAllowedNonOwnerClaudeTools, } from './tool-policy.js';
 import { buildClaudeFinalMessageId, createClaudeInputEnvelope, formatClaudeControlError, mergeClaudeModelOptions, resetClaudeCompletedTurnState, shouldDeliverClaudeFinal, } from './session-state.js';
@@ -183,6 +182,8 @@ function buildClaudeRuntimeDescriptor(input) {
             ...RUNTIME_NEW_SESSION_ACTION,
             primitive: 'session.new',
         },
+        RUNTIME_STOP_ACTION,
+        RUNTIME_STOP_AND_DROP_ACTION,
     ];
     return buildFirstPartyCodingRuntimeDescriptor({
         clientType: 'claude-code',
@@ -196,86 +197,6 @@ function buildClaudeRuntimeDescriptor(input) {
         admissionActions: HOST_ADMISSION_ACTIONS_DISABLED,
         presentation: input.presentation,
         commands,
-        actions: [
-            {
-                id: 'plan',
-                label: 'Plan first',
-                description: 'Switch Claude into Plan mode. Text after /plan is kept as a ready prompt while the mode applies.',
-                aliases: ['plan'],
-                category: 'plan',
-                placements: ['composer_slash', 'command_palette'],
-                availability: ['always'],
-                trailingTextBehavior: 'send_as_prompt',
-                dispatch: {
-                    kind: 'control',
-                    controlId: 'permissionMode',
-                    value: 'plan',
-                },
-            },
-            {
-                id: 'runtime-status',
-                label: 'Runtime status',
-                description: 'Open Claude runtime details, including account, project, and policy status.',
-                aliases: ['status'],
-                category: 'details',
-                placements: ['composer_slash', 'command_palette'],
-                availability: ['always'],
-                dispatch: { kind: 'open_details', target: 'status' },
-            },
-            {
-                id: 'mcp-inventory',
-                label: 'MCP servers',
-                description: 'Open the Claude MCP inventory published by the host.',
-                aliases: ['mcp'],
-                category: 'details',
-                placements: ['composer_slash', 'command_palette'],
-                availability: ['always'],
-                dispatch: { kind: 'open_details', target: 'mcp' },
-            },
-            {
-                id: 'plugin-inventory',
-                label: 'Plugins',
-                description: 'Open the Claude plugin and command inventory published by the host.',
-                aliases: ['plugins'],
-                category: 'details',
-                placements: ['composer_slash', 'command_palette'],
-                availability: ['always'],
-                dispatch: { kind: 'open_details', target: 'plugins' },
-            },
-            {
-                id: 'model-details',
-                label: 'Model control',
-                description: 'Open runtime details and use the live Model control.',
-                aliases: ['model'],
-                category: 'details',
-                placements: ['composer_slash', 'command_palette'],
-                availability: ['always'],
-                dispatch: { kind: 'open_details', target: 'model' },
-            },
-            {
-                id: 'permission-details',
-                label: 'Permission mode',
-                description: 'Open runtime details and use the live Permission mode control.',
-                aliases: ['permission'],
-                category: 'details',
-                placements: ['composer_slash', 'command_palette'],
-                availability: ['always'],
-                dispatch: { kind: 'open_details', target: 'permissionMode' },
-            },
-            {
-                id: 'effort-details',
-                label: 'Thinking level',
-                description: 'Open runtime details and use the live Thinking level control.',
-                aliases: ['effort'],
-                category: 'details',
-                placements: ['composer_slash', 'command_palette'],
-                availability: ['always'],
-                dispatch: { kind: 'open_details', target: 'effort' },
-            },
-            RUNTIME_STOP_ACTION,
-            RUNTIME_STOP_AND_DROP_ACTION,
-            RUNTIME_NEW_SESSION_ACTION,
-        ],
     });
 }
 function parseClaudePermissionMode(value) {
@@ -923,40 +844,50 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
         pendingReply: null,
         writeState: () => writeState(),
         writeTurn: () => writeTurn(),
+        clearStreaming: () => clearStreaming(),
         setRuntimeControlError: (controlId, value, error) => setRuntimeControlError(controlId, value, error),
         clearRuntimeControlError: (controlId) => clearRuntimeControlError(controlId),
     };
-    const streamingBuffer = createStreamingBuffer({
+    const streamingOutput = createTurnOutputController({
+        turnId: `claude-${conversationId}`,
+        mode: 'delta',
         throttleMs: STREAMING_THROTTLE_MS,
-        getText: () => session.streamingText,
-        setText: (text) => {
-            session.streamingText = text;
-        },
-        getTimer: () => session.streamingTimer,
-        setTimer: (timer) => {
-            session.streamingTimer = timer;
+        writeSnapshot: (snapshot) => {
+            if (session.closed)
+                return Promise.resolve();
+            const turnId = session.currentTurnId ?? snapshot.turnId;
+            session.streamingText = snapshot.text;
+            const blocks = snapshot.blocks?.map((block) => ({ ...block, turnId }));
+            return runtimeState.writeStreaming(conversationId, {
+                text: snapshot.text,
+                status: snapshot.status,
+                messageId: turnId,
+                turnId,
+                blocks,
+            });
         },
-        onWrite: (text) => {
-            runtimeState.writeStreaming(conversationId, {
-                text,
-                status: 'streaming',
-            }).catch(() => { });
+        clearSnapshot: () => {
+            session.streamingText = '';
+            return runtimeState.clearStreaming(conversationId);
         },
     });
     // ── Per-session streaming helpers ──
     function flushStreaming() {
-        streamingBuffer.flush();
+        streamingOutput.flush().catch(() => { });
     }
     function onStreamDelta(text) {
-        streamingBuffer.append(text);
+        streamingOutput.appendDelta(text);
     }
     function isActiveTurnInterrupted() {
         const turnKey = session.activeInput?.turnKey;
         return Boolean(turnKey && session.interruptedTurnKeys.has(turnKey));
     }
     function clearStreaming() {
-        streamingBuffer.clear();
-        runtimeState.clearStreaming(conversationId).catch(() => { });
+        return streamingOutput.clear().catch(() => { });
+    }
+    function getFinalTurnTrail() {
+        const turnId = session.currentTurnId ?? `claude-${conversationId}`;
+        return streamingOutput.getFinalTrail().map((block) => ({ ...block, turnId }));
     }
     function clearIdleResetTimer() {
         if (!session.idleResetTimer)
@@ -1004,7 +935,7 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
         session.state.state = 'running';
         session.turnState = 'streaming';
         stopVisibleWorkSignal();
-        streamingBuffer.replace(finalText);
+        streamingOutput.replaceSnapshot(finalText, 'streaming').catch(() => { });
         writeState();
         writeTurn();
         client.setTyping(conversationId, true, 'typing').catch(() => { });
@@ -1036,8 +967,10 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
                     turnKey: deliverTurn.turnKey,
                     sourceMessageId: deliverTurn.sourceMessageId ?? undefined,
                     turnSemantics: 'turn_complete',
-                    turnComplete: true,
                     deliveryIntent: session.lastAcceptedIntent ?? undefined,
+                    ...(getFinalTurnTrail().length > 0
+                        ? { turnTrail: getFinalTurnTrail() }
+                        : {}),
                 },
             });
             session.finalizedTurnKeys.add(deliverTurn.turnKey);
@@ -1218,6 +1151,8 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
             session.pendingInputs.unshift(input);
             session.turnState = 'interrupted';
             stopVisibleWorkSignal();
+            clearStreaming().catch(() => { });
+            client.setTyping(conversationId, false).catch(() => { });
             writeTurn();
             void session.query.interrupt().catch(() => { });
             return;
@@ -1263,11 +1198,20 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
                         if (event?.type === 'content_block_start' && event.content_block?.type === 'tool_use') {
                             session.toolInProgress = true;
                             session.turnState = 'tool';
+                            streamingOutput.addBlock({
+                                id: `tool:${session.currentTurnId ?? conversationId}`,
+                                kind: 'tool',
+                                status: 'running',
+                                title: typeof event.content_block?.name === 'string'
+                                    ? event.content_block.name
+                                    : 'Claude tool use',
+                            }).catch(() => { });
                             startVisibleWorkSignal();
                             writeTurn();
                         }
                         else if (event?.type === 'content_block_stop' && session.toolInProgress) {
                             session.toolInProgress = false;
+                            streamingOutput.completeBlock(`tool:${session.currentTurnId ?? conversationId}`).catch(() => { });
                             if (session.state.state === 'running') {
                                 session.turnState = 'thinking';
                                 startVisibleWorkSignal();
@@ -1851,10 +1795,7 @@ export async function main() {
                 });
             }
         }
-        if (session.streamingTimer)
-            clearTimeout(session.streamingTimer);
-        session.streamingText = '';
-        runtimeState.clearStreaming(conversationId).catch(() => { });
+        session.clearStreaming().catch(() => { });
         if (session.idleResetTimer) {
             clearTimeout(session.idleResetTimer);
             session.idleResetTimer = null;
@@ -1883,6 +1824,8 @@ export async function main() {
         session.pendingFinalText = null;
         session.pendingFinalDelivery = null;
         session.turnState = 'interrupted';
+        session.clearStreaming().catch(() => { });
+        client.setTyping(conversationId, false).catch(() => { });
         if (session.state.state === 'running') {
             await session.query.interrupt().catch(() => { });
         }
@@ -1972,6 +1915,7 @@ export async function main() {
                             });
                         }
                     }
+                    existing?.clearStreaming().catch(() => { });
                     sessions.delete(convoId);
                     runtimeState.clearSessionState(convoId).catch(() => { });
                     runtimeState.clearTurnState(convoId).catch(() => { });
@@ -2091,7 +2035,6 @@ export async function main() {
                 ...(activeSelfContextId ? { selfContextId: activeSelfContextId } : {}),
                 metadata: {
                     turnSemantics: 'turn_complete',
-                    turnComplete: true,
                     replyBehavior: 'suppress_auto_reply',
                 },
             }).catch(() => { });
@@ -2170,7 +2113,6 @@ export async function main() {
                 if (m.metadata?.type === 'approval_reply' || (approvalManager?.pendingCount ?? 0) > 0) {
                     const consumed = approvalManager?.handleMessage(convoId, {
                         senderId: m.senderId,
-                        text: m.text ?? undefined,
                         metadata: m.metadata,
                     }) ?? false;
                     if (m.metadata?.type === 'approval_reply') {
@@ -2270,7 +2212,6 @@ export async function main() {
                             ...(activeSelfContextId ? { selfContextId: activeSelfContextId } : {}),
                             metadata: {
                                 turnSemantics: 'turn_complete',
-                                turnComplete: true,
                                 replyBehavior: 'suppress_auto_reply',
                             },
                         }).catch(() => { });
@@ -2426,6 +2367,8 @@ export async function main() {
                                     }
                                     session.pendingFinalText = null;
                                     session.turnState = 'interrupted';
+                                    session.clearStreaming().catch(() => { });
+                                    client.setTyping(convoId, false).catch(() => { });
                                     runtimeState.writeTurnState(convoId, {
                                         turnId: session.currentTurnId,
                                         state: 'interrupted',
@@ -2439,13 +2382,6 @@ export async function main() {
                                     if (isActive) {
                                         await session.query.interrupt();
                                     }
-                                    if (session.streamingTimer) {
-                                        clearTimeout(session.streamingTimer);
-                                        session.streamingTimer = null;
-                                    }
-                                    session.streamingText = '';
-                                    runtimeState.clearStreaming(convoId).catch(() => { });
-                                    client.setTyping(convoId, false).catch(() => { });
                                     await rtdbWrite(`/control/${convoId}/${agentId}/signal`, null).catch(() => { });
                                 }
                                 catch (err) {

package/dist/server.js

@@ -41,7 +41,6 @@ let approvalServer = null;
 const conversationCache = new Map();
 const TURN_COMPLETE_METADATA = {
     turnSemantics: 'turn_complete',
-    turnComplete: true,
 };
 /** Last owner-visible conversation to route approval cards into. */
 let approvalConversationId = null;
@@ -419,7 +418,6 @@ async function handleInboundMessage(payload) {
     if (approvalManager) {
         const consumed = approvalManager.handleMessage(payload.conversationId, {
             senderId: m.senderId,
-            text: m.text ?? undefined,
             metadata: m.metadata,
         });
         if (consumed) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.14.11",
+  "version": "0.14.13",
   "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.6.1",
-    "@canonmsg/core": "^0.23.0",
+    "@canonmsg/agent-sdk": "^2.0.0",
+    "@canonmsg/core": "^1.0.0",
     "@modelcontextprotocol/sdk": "^1.12.0"
   },
   "engines": {