@canonmsg/claude-code-plugin 0.14.15 → 0.14.16

package/dist/host.js

@@ -26,7 +26,7 @@ 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_EFFORT_OPTIONS, 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 { CLAUDE_EFFORT_OPTIONS, 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, createTypingStatusPublisher, 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, sendMessageWithRetry, loadHostSessionConfig, loadRuntimeSessionState, markLocalRuntimeStopped, releaseConversationEnvironment, saveRuntimeSessionState, clearRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, resolveHostWorkspaceCwd, upsertLocalRuntimeEntry, } from '@canonmsg/core';
 import { buildInboundContextLines, decideAutoReply, } from './inbound-policy.js';
 import { runCli } from './cli-entry.js';
 import { decideClaudeToolPermissionForMode, parseAllowedNonOwnerClaudeTools, } from './tool-policy.js';
@@ -522,7 +522,10 @@ const STREAMING_THROTTLE_MS = 250;
 const HEARTBEAT_MS = 30_000;
 const IDLE_CHECK_MS = 60_000;
 const CONTROL_POLL_MS = 2000;
-const FINAL_DELIVERY_RETRY_MS = 2_000;
+const IDLE_CONTROL_POLL_MS = 10_000;
+const CONTROL_POLL_JITTER_MS = 1_000;
+const FINAL_DELIVERY_RETRY_MS = 30_000;
+const MAX_FINAL_DELIVERY_RETRIES = 1;
 const CLAUDE_RUNTIME_CAPABILITIES = {
     ...DEFAULT_RUNTIME_CAPABILITIES,
     supportsInterrupt: true,
@@ -532,6 +535,10 @@ const CLAUDE_RUNTIME_CAPABILITIES = {
     supportsRequiresAction: true,
     supportsNonFinalPermanentMessages: false,
 };
+function controlPollDelayMs(hasActiveWork) {
+    const base = hasActiveWork ? CONTROL_POLL_MS : IDLE_CONTROL_POLL_MS;
+    return base + Math.floor(Math.random() * CONTROL_POLL_JITTER_MS);
+}
 function buildCanonPrompt(input) {
     const { session, ...promptInput } = input;
     return buildCanonHostPrompt({
@@ -602,7 +609,7 @@ async function buildCanonUserContent(input) {
     ];
 }
 // ── Session factory ─────────────────────────────────────────────────
-function createSession(conversationId, environment, agentId, client, runtimeState, onSessionEnd, onRuntimeDescriptorUpdate, config, resumeSessionId) {
+function createSession(conversationId, environment, agentId, client, typingSignals, runtimeState, onSessionEnd, onRuntimeDescriptorUpdate, config, resumeSessionId) {
     const { cwd } = environment;
     const cardResponseUserId = config.ownerId ?? undefined;
     const cardResponseUser = cardResponseUserId ? { responseUserId: cardResponseUserId } : undefined;
@@ -704,7 +711,8 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
                     const questionId = randomUUID();
                     const questions = input.questions ?? [];
                     const questionCard = buildQuestionRequest(questionId, questions, cardResponseUser);
-                    await client.sendMessage(conversationId, questionCard.text, {
+                    await sendMessageWithRetry(client, conversationId, questionCard.text, {
+                        messageId: `claude-question-${questionId}`,
                         ...(session.activeSelfContextId
                             ? { selfContextId: session.activeSelfContextId }
                             : {}),
@@ -754,7 +762,8 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
                         summary: 'Claude has prepared a plan and is asking permission to continue.',
                         ...(cardResponseUser ?? {}),
                     });
-                    await client.sendMessage(conversationId, planApproval.text, {
+                    await sendMessageWithRetry(client, conversationId, planApproval.text, {
+                        messageId: `claude-plan-${planId}`,
                         ...(session.activeSelfContextId
                             ? { selfContextId: session.activeSelfContextId }
                             : {}),
@@ -912,17 +921,21 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
         clearIdleResetTimer();
         session.idleResetTimer = setTimeout(() => {
             session.idleResetTimer = null;
-            client.setTyping(conversationId, false).catch(() => { });
+            typingSignals.clear(conversationId).catch(() => { });
             clearStreaming();
             resetTurnToIdle();
         }, FINAL_MESSAGE_HANDOFF_MS);
     }
     function markPendingFinalDelivery(finalText, turn) {
         clearIdleResetTimer();
+        const retryCount = session.pendingFinalDelivery?.turnKey === turn.turnKey
+            ? session.pendingFinalDelivery.retryCount
+            : 0;
         session.pendingFinalText = finalText;
         session.pendingFinalDelivery = {
             turnKey: turn.turnKey,
             text: finalText,
+            retryCount,
             messageId: buildClaudeFinalMessageId({
                 agentId,
                 conversationId,
@@ -935,7 +948,7 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
         streamingOutput.replaceSnapshot(finalText, 'streaming').catch(() => { });
         writeState();
         writeTurn();
-        client.setTyping(conversationId, true, 'typing').catch(() => { });
+        typingSignals.start(conversationId, 'typing').catch(() => { });
     }
     async function deliverFinalReply(finalText, turn = session.activeInput) {
         if (!shouldDeliverClaudeFinal({
@@ -954,7 +967,7 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
             turnKey: deliverTurn.turnKey,
         });
         try {
-            await client.sendMessage(conversationId, finalText, {
+            await sendMessageWithRetry(client, conversationId, finalText, {
                 messageId: finalMessageId,
                 ...(session.activeSelfContextId
                     ? { selfContextId: session.activeSelfContextId }
@@ -987,6 +1000,14 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
     function scheduleFinalDeliveryRetry(pending = session.pendingFinalDelivery) {
         if (!pending || session.closed || session.pendingFinalDelivery?.turnKey !== pending.turnKey)
             return;
+        if (pending.retryCount >= MAX_FINAL_DELIVERY_RETRIES) {
+            console.error(`[canon-host] [${conversationId.slice(0, 8)}] Final reply delivery exhausted after bounded retries`);
+            session.pendingFinalDelivery = null;
+            resetTurnToIdle();
+            return;
+        }
+        pending.retryCount += 1;
+        session.pendingFinalDelivery = pending;
         clearFinalDeliveryTimer();
         session.finalDeliveryTimer = setTimeout(() => {
             session.finalDeliveryTimer = null;
@@ -1091,19 +1112,17 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
             return;
         if (session.turnState !== 'thinking' && session.turnState !== 'tool')
             return;
-        client.setTyping(conversationId, true, 'thinking').catch(() => { });
+        typingSignals.start(conversationId, 'thinking').catch(() => { });
     }
     function startVisibleWorkSignal() {
         refreshVisibleWorkSignal();
-        if (session.typingKeepaliveTimer)
-            return;
-        session.typingKeepaliveTimer = setInterval(refreshVisibleWorkSignal, 3500);
     }
     function stopVisibleWorkSignal() {
         if (session.typingKeepaliveTimer) {
             clearInterval(session.typingKeepaliveTimer);
             session.typingKeepaliveTimer = null;
         }
+        typingSignals.clear(conversationId).catch(() => { });
     }
     async function markQueuedMessageAccepted(sourceMessageId, markAccepted) {
         if (!markAccepted || !sourceMessageId)
@@ -1149,7 +1168,6 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
             session.turnState = 'interrupted';
             stopVisibleWorkSignal();
             clearStreaming().catch(() => { });
-            client.setTyping(conversationId, false).catch(() => { });
             writeTurn();
             void session.query.interrupt().catch(() => { });
             return;
@@ -1189,7 +1207,6 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
                         const event = msg.event;
                         if (isActiveTurnInterrupted()) {
                             stopVisibleWorkSignal();
-                            client.setTyping(conversationId, false).catch(() => { });
                             break;
                         }
                         if (event?.type === 'content_block_start' && event.content_block?.type === 'tool_use') {
@@ -1219,7 +1236,6 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
                             session.toolInProgress = false;
                             session.turnState = 'streaming';
                             stopVisibleWorkSignal();
-                            client.setTyping(conversationId, false).catch(() => { });
                             writeTurn();
                             onStreamDelta(event.delta.text);
                         }
@@ -1244,7 +1260,6 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
                             }
                             else if (state === 'idle') {
                                 stopVisibleWorkSignal();
-                                client.setTyping(conversationId, false).catch(() => { });
                             }
                             else if (state === 'requires_action') {
                                 clearIdleResetTimer();
@@ -1255,7 +1270,6 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
                                 session.toolInProgress = false;
                                 session.turnState = 'waiting_input';
                                 stopVisibleWorkSignal();
-                                client.setTyping(conversationId, false).catch(() => { });
                             }
                             writeState();
                             writeTurn();
@@ -1439,6 +1453,11 @@ export async function main() {
     // ── Canon API client + RTDB auth ──
     const client = new CanonClient(apiKey, baseUrl);
     initRTDBAuth(client);
+    const typingSignals = createTypingStatusPublisher({
+        setTyping: (conversationId, typing, status) => status
+            ? client.setTyping(conversationId, typing, status)
+            : client.setTyping(conversationId, typing),
+    });
     async function markQueuedMessageAcceptedForConversation(conversationId, sourceMessageId, markAccepted) {
         if (!markAccepted || !sourceMessageId)
             return;
@@ -1645,7 +1664,7 @@ export async function main() {
             runtimeState.clearStreaming(conversation.id).catch(() => { });
             runtimeState.clearSessionState(conversation.id).catch(() => { });
             runtimeState.clearTurnState(conversation.id).catch(() => { });
-            client.setTyping(conversation.id, false).catch(() => { });
+            typingSignals.clear(conversation.id).catch(() => { });
         }
         console.error(`[canon-host] ${convos.length} conversations`);
     }
@@ -1803,7 +1822,8 @@ export async function main() {
         }
         runtimeState.clearSessionState(conversationId).catch(() => { });
         runtimeState.clearTurnState(conversationId).catch(() => { });
-        client.setTyping(conversationId, false).catch(() => { });
+        typingSignals.clear(conversationId).catch(() => { });
+        typingSignals.dispose(conversationId);
         try {
             session.query.close();
         }
@@ -1822,7 +1842,7 @@ export async function main() {
         session.pendingFinalDelivery = null;
         session.turnState = 'interrupted';
         session.clearStreaming().catch(() => { });
-        client.setTyping(conversationId, false).catch(() => { });
+        typingSignals.clear(conversationId).catch(() => { });
         if (session.state.state === 'running') {
             await session.query.interrupt().catch(() => { });
         }
@@ -1890,7 +1910,7 @@ export async function main() {
                     executionMode: environment.mode,
                 });
                 const resumeId = savedSessionIds.get(resumeKey) ?? persisted?.claudeSessionId;
-                const session = createSession(conversationId, environment, agentId, client, runtimeState, (convoId, sdkSessionId) => {
+                const session = createSession(conversationId, environment, agentId, client, typingSignals, runtimeState, (convoId, sdkSessionId) => {
                     // Called when session processing loop ends — save session ID for resume
                     const existing = sessions.get(convoId);
                     if (existing) {
@@ -1913,6 +1933,8 @@ export async function main() {
                         }
                     }
                     existing?.clearStreaming().catch(() => { });
+                    typingSignals.clear(convoId).catch(() => { });
+                    typingSignals.dispose(convoId);
                     sessions.delete(convoId);
                     runtimeState.clearSessionState(convoId).catch(() => { });
                     runtimeState.clearTurnState(convoId).catch(() => { });
@@ -2028,7 +2050,8 @@ 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 markQueuedMessageAcceptedForConversation(input.conversationId, m.id ?? null, shouldMarkAccepted);
-            await client.sendMessage(input.conversationId, `I couldn't start a coding session for this workspace: ${userMessage}`, {
+            await sendMessageWithRetry(client, input.conversationId, `I couldn't start a coding session for this workspace: ${userMessage}`, {
+                messageId: `claude-start-failed-${m.id}`,
                 ...(activeSelfContextId ? { selfContextId: activeSelfContextId } : {}),
                 metadata: {
                     turnSemantics: 'turn_complete',
@@ -2205,7 +2228,8 @@ 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 markQueuedMessageAcceptedForConversation(convoId, m.id ?? null, shouldMarkAccepted);
-                        await client.sendMessage(convoId, `I couldn't start a coding session for this workspace: ${userMessage}`, {
+                        await sendMessageWithRetry(client, convoId, `I couldn't start a coding session for this workspace: ${userMessage}`, {
+                            messageId: `claude-start-failed-${m.id}`,
                             ...(activeSelfContextId ? { selfContextId: activeSelfContextId } : {}),
                             metadata: {
                                 turnSemantics: 'turn_complete',
@@ -2270,6 +2294,11 @@ export async function main() {
     // ── Control signal watcher ──
     const pollControl = async () => {
         while (!controlStopped) {
+            const hadActiveWork = [...sessions.values()].some((session) => !session.closed
+                && (session.state.state === 'running'
+                    || session.state.state === 'requires_action'
+                    || session.pendingInputs.length > 0
+                    || Boolean(session.pendingFinalDelivery)));
             for (const convoId of [...sessions.keys()]) {
                 try {
                     // Session control signals (model, mode)
@@ -2365,7 +2394,7 @@ export async function main() {
                                     session.pendingFinalText = null;
                                     session.turnState = 'interrupted';
                                     session.clearStreaming().catch(() => { });
-                                    client.setTyping(convoId, false).catch(() => { });
+                                    typingSignals.clear(convoId).catch(() => { });
                                     runtimeState.writeTurnState(convoId, {
                                         turnId: session.currentTurnId,
                                         state: 'interrupted',
@@ -2392,7 +2421,7 @@ export async function main() {
                     // Transient RTDB errors — ignore and retry next cycle
                 }
             }
-            await new Promise((r) => setTimeout(r, CONTROL_POLL_MS));
+            await new Promise((r) => setTimeout(r, controlPollDelayMs(hadActiveWork)));
         }
     };
     pollControl().catch((err) => console.error('[canon-host] Control poll crashed:', err));

package/dist/session-state.d.ts

@@ -19,6 +19,7 @@ export interface ClaudePendingFinalDelivery {
     turnKey: string;
     text: string;
     messageId: string;
+    retryCount: number;
 }
 export interface ClaudeCompletedTurnState {
     state: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.14.15",
+  "version": "0.14.16",
   "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.141",
-    "@canonmsg/agent-sdk": "^2.0.0",
-    "@canonmsg/core": "^1.1.0",
+    "@canonmsg/agent-sdk": "^2.1.1",
+    "@canonmsg/core": "^1.3.0",
     "@modelcontextprotocol/sdk": "^1.29.0"
   },
   "engines": {