@canonmsg/claude-code-plugin 0.31.3 → 0.31.4

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.3",
+  "version": "0.31.4",
   "channels": [
     {
       "server": "canon-channel",

package/README.md

@@ -89,6 +89,11 @@ canon-claude --cwd /path/to/project --turn-verbosity quiet
 | `verbose` | Live streaming text plus the margin activity rows on the final, everywhere |
 | `quiet` | The thinking indicator and the answer, nothing in between, everywhere |
 
+In verbose mode, authored text remains continual across tool use: text before a
+tool stays as its own speech bubble, the tool appears in the activity margin,
+and text after the result resumes in a new bubble. These are ephemeral streaming
+updates; only the final durable `turn_complete` message is notification-eligible.
+
 Quiet drops the live `/streaming` narration and the final's `turnTrail` activity rows. It does **not** drop the thinking indicator (which now stays up for the turn's whole working phase rather than handing over to a bubble that never appears; while the turn is parked on an approval the clients suppress an agent's dots and the header line carries the state), the turn state, the answer — including every part of a long chunked one — failure notices, generated files, or approval and question cards and their receipts.
 
 This is an agent-developer setting. Canon never changes it, and it is deliberately not part of the per-conversation session config a user can edit. `canon-necromance` replays a stored launch command verbatim, so add the flag at registration time if you want a non-default value.

package/dist/host.js

@@ -34,7 +34,7 @@ import { runCli } from '@canonmsg/core';
 import { CANON_VERB_MCP_SERVER_NAME, createCanonVerbMcpServer } from '@canonmsg/agent-tools';
 import { synthesizeClaudeApprovalDiff } from './approval-diff.js';
 import { decideClaudeToolPermissionForMode, parseAllowedNonOwnerClaudeTools, } from './tool-policy.js';
-import { applyClaudeSessionControl, boundClaudeFinalMetadata, buildClaudeFinalChunkingOptions, buildClaudeFinalMessageId, buildClaudeFinalTurnMetadata, buildClaudePendingFinalDelivery, buildClaudeTurnFailureNotice, buildTruncatedFinalText, buildUndeliverableFinalNotice, canDrainClaudeQueuedInput, claudeFinalWillChunk, classifyFinalDeliveryFailure, claudeInputOwnsTurnSlot, createClaudeTurnActivityState, decideClaudeControlSignalAction, decideClaudeInboundDispatch, dispatchClaudeInput, isClaudeTurnSlotReserved, readClaudeFinalDeliveryResume, releaseClaudeTurnSlot, runClaudeExhaustedFinalDelivery, shouldApplyClaudeEchoedSessionState, shouldReleaseClaudeTurnSlot, isClaudeMainTurnMessage, openClaudeTurn, planClaudeAssistantTrail, planClaudeStreamingWrite, planClaudeToolCallStart, planClaudeToolProgress, planClaudeToolResults, claudeFinalTurnTrail, publishedClaudeTurnState, rememberDispatchedClaudeInput, resetClaudeTurnActivityState, shouldOpenClaudeTurnOnRunning, shouldStopTypingDotsOnStreamedText, isOpenClaudeTurnState, takeClaudeResultOwner, takeClaudeToolBlockIdByIndex, claudeModelInfoToOption, claudeOriginForCanonSender, composeClaudeTurnFinal, describeUndeliveredClaudeFinal, confirmClaudeInterrupt, createClaudeInputEnvelope, deriveClaudeSupplementalModelProbes, formatClaudeCliVersion, formatClaudeControlError, isClaudeCustomModelOption, isSupportedClaudeCliVersion, mergeClaudeDiscoveredModelOptions, parseClaudeCliVersion, resolveClaudeTurnResponseRouting, resolveClaudeModelOptions, resetClaudeCompletedTurnState, shouldDeliverClaudeFinal, shouldRouteClaudeTurnArtifacts, MINIMUM_CLAUDE_CLI_VERSION, } from './session-state.js';
+import { applyClaudeSessionControl, boundClaudeFinalMetadata, buildClaudeFinalChunkingOptions, buildClaudeFinalMessageId, buildClaudeFinalTurnMetadata, buildClaudePendingFinalDelivery, buildClaudeTurnFailureNotice, buildTruncatedFinalText, buildUndeliverableFinalNotice, canDrainClaudeQueuedInput, beginClaudeAssistantResponse, claimClaudeTextSegmentId, claudeFinalWillChunk, classifyFinalDeliveryFailure, claudeInputOwnsTurnSlot, createClaudeTurnActivityState, decideClaudeControlSignalAction, decideClaudeInboundDispatch, dispatchClaudeInput, endClaudeAssistantResponse, isClaudeTurnSlotReserved, readClaudeFinalDeliveryResume, releaseClaudeTurnSlot, runClaudeExhaustedFinalDelivery, shouldApplyClaudeEchoedSessionState, shouldReleaseClaudeTurnSlot, isClaudeMainTurnMessage, openClaudeTurn, planClaudeAssistantTrail, planClaudeStreamingWrite, planClaudeToolCallStart, planClaudeToolProgress, planClaudeToolResults, claudeFinalTurnTrail, publishedClaudeTurnState, rememberDispatchedClaudeInput, resetClaudeTurnActivityState, shouldOpenClaudeTurnOnRunning, shouldStopTypingDotsOnStreamedText, isOpenClaudeTurnState, takeClaudeResultOwner, takeClaudeToolBlockIdByIndex, claudeModelInfoToOption, claudeOriginForCanonSender, composeClaudeTurnFinal, describeUndeliveredClaudeFinal, confirmClaudeInterrupt, createClaudeInputEnvelope, deriveClaudeSupplementalModelProbes, formatClaudeCliVersion, formatClaudeControlError, isClaudeCustomModelOption, isSupportedClaudeCliVersion, mergeClaudeDiscoveredModelOptions, parseClaudeCliVersion, resolveClaudeTurnResponseRouting, resolveClaudeModelOptions, resetClaudeCompletedTurnState, shouldDeliverClaudeFinal, shouldRouteClaudeTurnArtifacts, MINIMUM_CLAUDE_CLI_VERSION, } from './session-state.js';
 import { CLAUDE_SUPPORTED_DIALOG_KINDS, buildClaudeAskUserPermissionDenied, buildClaudeAskUserPermissionResult, createClaudeUserDialogCoordinator, parseClaudeAskUserDialog, parseClaudeAskUserToolInput, resolveClaudeUserDialogRequestId, } from './user-dialog.js';
 function parseRuntimeVisibilityPreset(value) {
     return value === 'normal' || value === 'minimal' || value === 'full' ? value : undefined;
@@ -2066,7 +2066,17 @@ function createSession(conversationId, environment, agentId, client, typingSigna
                         // being written.
                         if (!isClaudeMainTurnMessage(msg.parent_tool_use_id))
                             break;
-                        if (event?.type === 'content_block_start' && event.content_block?.type === 'tool_use') {
+                        if (event?.type === 'message_start') {
+                            beginClaudeAssistantResponse(session.turnActivity);
+                        }
+                        else if (event?.type === 'message_stop') {
+                            endClaudeAssistantResponse(session.turnActivity);
+                        }
+                        else if (event?.type === 'content_block_start' && event.content_block?.type === 'tool_use') {
+                            // A tool is also a response boundary for speech. This fallback
+                            // keeps continual streaming correct on SDK streams that omit raw
+                            // message_start/message_stop events.
+                            endClaudeAssistantResponse(session.turnActivity);
                             // Claimed per CALL, keyed by the SDK's tool_use id. The old id was
                             // the turn id, so every call in a turn wrote over the same row.
                             const commands = planClaudeToolCallStart(session.turnActivity, {
@@ -2104,8 +2114,10 @@ function createSession(conversationId, environment, agentId, client, typingSigna
                                 stopVisibleWorkSignal();
                             }
                             writeTurn();
-                            const blockIndex = typeof event.index === 'number' ? event.index : 'latest';
-                            onStreamDelta(event.delta.text, `text:${session.currentTurnId ?? conversationId}:${blockIndex}`);
+                            onStreamDelta(event.delta.text, claimClaudeTextSegmentId(session.turnActivity, {
+                                turnId: session.currentTurnId ?? conversationId,
+                                index: event.index,
+                            }));
                         }
                         break;
                     }

package/dist/session-state.d.ts

@@ -356,6 +356,10 @@ export interface ClaudeTurnActivityState {
     blockIdByToolUseId: Map<string, string>;
     /** This turn's plan block, once TodoWrite has produced one. */
     planBlockId: string | null;
+    /** Monotonic identity for assistant responses inside this turn. */
+    assistantResponseCount: number;
+    /** The response whose text deltas are currently being streamed. */
+    activeAssistantResponseKey: string | null;
 }
 /**
  * Whether an SDK message describes the agent's OWN work rather than a
@@ -367,6 +371,22 @@ export interface ClaudeTurnActivityState {
 export declare function isClaudeMainTurnMessage(parentToolUseId: unknown): boolean;
 export declare function createClaudeTurnActivityState(): ClaudeTurnActivityState;
 export declare function resetClaudeTurnActivityState(state: ClaudeTurnActivityState): void;
+/** Open a fresh assistant response, whose content-block indexes start at zero. */
+export declare function beginClaudeAssistantResponse(state: ClaudeTurnActivityState): string;
+/** Close the response so a later text delta cannot reuse its block identity. */
+export declare function endClaudeAssistantResponse(state: ClaudeTurnActivityState): void;
+/**
+ * Stable id for one text block inside one assistant response.
+ *
+ * Anthropic restarts `content_block.index` for every assistant response. The
+ * response key is therefore required to distinguish text before a tool from
+ * text emitted after its result. Lazily opening a response keeps older SDK
+ * streams that omit `message_start` safe as well.
+ */
+export declare function claimClaudeTextSegmentId(state: ClaudeTurnActivityState, input: {
+    turnId?: string | null;
+    index?: unknown;
+}): string;
 export declare function claudeToolBlockId(toolUseId: string): string;
 export declare function claudePlanBlockId(turnId: string | null | undefined): string;
 /**

package/dist/session-state.js

@@ -376,12 +376,42 @@ export function createClaudeTurnActivityState() {
         blockIdByIndex: new Map(),
         blockIdByToolUseId: new Map(),
         planBlockId: null,
+        assistantResponseCount: 0,
+        activeAssistantResponseKey: null,
     };
 }
 export function resetClaudeTurnActivityState(state) {
     state.blockIdByIndex.clear();
     state.blockIdByToolUseId.clear();
     state.planBlockId = null;
+    state.assistantResponseCount = 0;
+    state.activeAssistantResponseKey = null;
+}
+/** Open a fresh assistant response, whose content-block indexes start at zero. */
+export function beginClaudeAssistantResponse(state) {
+    state.assistantResponseCount += 1;
+    state.activeAssistantResponseKey = `response-${state.assistantResponseCount}`;
+    return state.activeAssistantResponseKey;
+}
+/** Close the response so a later text delta cannot reuse its block identity. */
+export function endClaudeAssistantResponse(state) {
+    state.activeAssistantResponseKey = null;
+}
+/**
+ * Stable id for one text block inside one assistant response.
+ *
+ * Anthropic restarts `content_block.index` for every assistant response. The
+ * response key is therefore required to distinguish text before a tool from
+ * text emitted after its result. Lazily opening a response keeps older SDK
+ * streams that omit `message_start` safe as well.
+ */
+export function claimClaudeTextSegmentId(state, input) {
+    const responseKey = state.activeAssistantResponseKey
+        ?? beginClaudeAssistantResponse(state);
+    const index = typeof input.index === 'number' && Number.isInteger(input.index)
+        ? input.index
+        : 'latest';
+    return buildTrailBlockId('text', input.turnId ?? 'turn', responseKey, index);
 }
 export function claudeToolBlockId(toolUseId) {
     return buildTrailBlockId('tool', toolUseId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.31.3",
+  "version": "0.31.4",
   "description": "Canon channel plugin for Claude Code — messaging where AI agents are first-class citizens",
   "type": "module",
   "main": "dist/index.js",