@canonmsg/claude-code-plugin 0.34.1 → 0.34.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.34.1",
+  "version": "0.34.3",
   "channels": [
     {
       "server": "canon-channel",

package/dist/host.js

@@ -29,7 +29,7 @@ import { query, } from '@anthropic-ai/claude-agent-sdk';
 import { materializeMessageMedia, materializeReplyContextMedia, sendMediaFileMessage, } from '@canonmsg/agent-sdk';
 import { captureTurnArtifactSnapshot, createTurnArtifactRouter, IDLE_TIMEOUT_MS, collectMissedInboundMessages, createRecoveryCheckpointTracker, createReconnectRecoveryCoordinator, STARTUP_RECOVERY_PAGE_SIZE, } from '@canonmsg/coding-agent-host';
 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, ExecutionEnvironmentError, CanonClient, CanonStream, ControlChannelPoller, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, HOST_ADMISSION_ACTIONS_DISABLED, ApprovalManager, RuntimeRequestManager, FINAL_MESSAGE_HANDOFF_MS, buildLocalRuntimeId, getActiveProfileLock, heartbeatLocalRuntimeEntry, normalizeTurnMetadata, parseTurnVerbosityConfig, prepareConversationEnvironment, resolveCanonAgent, verifyResolvedAgentEnvironment, decideAutoReply, initRTDBAuth, isChunkedSendMessageError, sendMessageWithRetry, sendMessageWithRetryChunked, loadRuntimeSessionState, markLocalRuntimeStopped, releaseConversationEnvironment, resolveLocalRuntimeSessionState, saveRuntimeSessionState, clearRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCodingHostInboundPrompt, resolveConfiguredWorkspaceCwd, resolveTurnVerbosity, shouldTriggerAgentTurn, upsertLocalRuntimeEntry, } from '@canonmsg/core';
+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, createRuntimeHeartbeat, createTypingStatusPublisher, EXECUTION_ENVIRONMENT_MODES, ExecutionEnvironmentError, CanonClient, CanonStream, ControlChannelPoller, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, HOST_ADMISSION_ACTIONS_DISABLED, ApprovalManager, RuntimeRequestManager, FINAL_MESSAGE_HANDOFF_MS, buildLocalRuntimeId, getActiveProfileLock, heartbeatLocalRuntimeEntry, normalizeTurnMetadata, parseTurnVerbosityConfig, prepareConversationEnvironment, resolveCanonAgent, verifyResolvedAgentEnvironment, decideAutoReply, initRTDBAuth, isChunkedSendMessageError, sendMessageWithRetry, sendMessageWithRetryChunked, loadRuntimeSessionState, markLocalRuntimeStopped, releaseConversationEnvironment, resolveLocalRuntimeSessionState, saveRuntimeSessionState, clearRuntimeSessionState, publishHostSessionSnapshots, renderCodingHostInboundPrompt, resolveConfiguredWorkspaceCwd, 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';
@@ -414,9 +414,6 @@ function acceptClaudeCli(source, cliPath) {
 function toModelOptions(models) {
     return models.map(claudeModelInfoToOption);
 }
-async function publishAgentRuntime(agentId, runtime, rtdb) {
-    await publishHostAgentRuntime(agentId, 'claude-code', runtime, rtdb);
-}
 export function resolveSessionExecutionMode(defaultExecutionMode = 'worktree') {
     return defaultExecutionMode;
 }
@@ -434,14 +431,6 @@ function resolveWorkspaceCwd() {
         defaultCwd: workingDir,
     });
 }
-function resolveExecutionFallbackReason(environment) {
-    if (!environment?.reason || environment.mode !== 'locked') {
-        return null;
-    }
-    return environment.reason === 'Sharing the base workspace (locked mode)'
-        ? null
-        : environment.reason;
-}
 async function detectRuntimeModels(cwd) {
     const discovered = await detectRuntimeModelsForSelection(cwd, 'default');
     const supplemental = await detectSupplementalRuntimeModels(cwd, deriveClaudeSupplementalModelProbes(discovered));
@@ -562,147 +551,6 @@ async function readApprovalDiffPreImage(filePath) {
         throw error;
     }
 }
-function mapClaudeMcpStatus(status) {
-    switch (status) {
-        case 'connected':
-            return 'ready';
-        case 'needs-auth':
-            return 'auth_needed';
-        case 'disabled':
-            return 'configured';
-        case 'failed':
-            return 'error';
-        default:
-            return 'unknown';
-    }
-}
-function buildClaudeRuntimeInfo(input) {
-    const { descriptor, metadata } = input;
-    const statusItems = [
-        metadata.account?.email
-            ? {
-                id: 'account',
-                label: 'Account',
-                value: 'Connected',
-                tone: 'success',
-                tier: 'diagnostic',
-            }
-            : null,
-        metadata.account?.subscriptionType
-            ? {
-                id: 'subscription',
-                label: 'Plan',
-                value: metadata.account.subscriptionType,
-            }
-            : null,
-        metadata.account?.apiProvider
-            ? {
-                id: 'provider',
-                label: 'Provider',
-                value: metadata.account.apiProvider,
-            }
-            : null,
-        metadata.account?.tokenSource || metadata.account?.apiKeySource
-            ? {
-                id: 'auth',
-                label: 'Auth',
-                value: metadata.account.tokenSource ?? metadata.account?.apiKeySource ?? 'connected',
-                tier: 'diagnostic',
-            }
-            : null,
-        runtimeModels[0]
-            ? {
-                id: 'fallbackModel',
-                label: 'Fallback model',
-                value: runtimeModels[0].label,
-                tier: 'diagnostic',
-                source: 'host-default',
-            }
-            : null,
-        {
-            id: 'toolPolicy',
-            label: 'Tool policy',
-            value: 'Claude Code preset',
-            tier: 'detail',
-        },
-        {
-            id: 'browser',
-            label: 'Browser tools',
-            value: 'Runtime policy',
-            tier: 'detail',
-        },
-        {
-            id: 'mediaOut',
-            label: 'Media out',
-            value: 'Generated media artifacts',
-            tier: 'detail',
-        },
-    ].filter((item) => Boolean(item));
-    return {
-        descriptor,
-        surfaceMode: 'host',
-        statusItems,
-        inventories: [
-            {
-                id: 'mcp',
-                label: 'MCP',
-                entries: metadata.mcpServers.map((server) => ({
-                    id: server.name,
-                    label: server.name,
-                    status: mapClaudeMcpStatus(server.status),
-                    description: server.error
-                        ?? server.serverInfo?.version
-                        ?? server.scope
-                        ?? undefined,
-                })),
-                tier: 'diagnostic',
-            },
-            {
-                id: 'plugins',
-                label: 'Plugins',
-                entries: metadata.plugins.map((plugin) => ({
-                    id: plugin.name,
-                    label: plugin.name,
-                    status: 'configured',
-                    description: plugin.source ?? plugin.path,
-                })),
-                tier: 'diagnostic',
-            },
-            {
-                id: 'commands',
-                label: 'Commands',
-                entries: metadata.commands.map((command) => ({
-                    id: command.name,
-                    label: command.name.startsWith('/') ? command.name : `/${command.name}`,
-                    status: 'configured',
-                    description: command.description ?? command.argumentHint ?? undefined,
-                })),
-                tier: 'diagnostic',
-            },
-            {
-                id: 'agents',
-                label: 'Agents',
-                entries: metadata.agents.map((agent) => ({
-                    id: agent.name,
-                    label: agent.name,
-                    status: 'configured',
-                    description: agent.description ?? agent.model ?? undefined,
-                })),
-                tier: 'diagnostic',
-            },
-        ],
-        execution: {
-            resolvedWorkspaceLabel: input.workspaceLabel,
-            resolvedCwd: input.resolvedCwd,
-            workspaceRootId: input.workspaceRootId ?? null,
-            workspaceRelativePath: input.workspaceRelativePath ?? null,
-            executionMode: input.executionMode,
-            executionBranch: input.executionBranch,
-            worktreePath: input.worktreePath,
-            fallbackReason: input.fallbackReason,
-        },
-    };
-}
 // ── Constants ───────────────────────────────────────────────────────
 const MAX_SESSIONS = 5;
 // IDLE_TIMEOUT_MS (30 minutes) is shared with the other coding-agent hosts.
@@ -2529,29 +2377,29 @@ export async function main() {
             console.error('[canon-host] Failed to publish session snapshots:', error);
         });
     }
-    const publishRuntimeHeartbeat = async () => {
+    const publishLocalHeartbeat = () => {
         heartbeatLocalRuntimeEntry(runtimeId, {
             agentId,
             agentName: profileAgentName,
             cwd: workingDir,
             baseCwd: workingDir,
         });
-        if (!streamConnected)
-            return;
+    };
+    const refreshRuntimeDetails = async (signal) => {
         await refreshKnownConversationIds().catch((error) => {
             console.error('[canon-host] Failed to refresh known conversations:', error);
         });
+        if (signal.aborted)
+            return;
         const activeSessionQuery = sessions.values().next().value?.query ?? null;
-        const metadata = await refreshClaudeRuntimeMetadata({
+        await refreshClaudeRuntimeMetadata({
             cwd: workingDir,
             activeQuery: activeSessionQuery,
         }).catch((error) => {
             console.error('[canon-host] Failed to refresh Claude runtime metadata:', error);
-            return runtimeMetadata;
-        });
-        await publishAgentRuntime(agentId, runtimeDescriptor, rtdb).catch((error) => {
-            console.error('[canon-host] Failed to publish agent runtime:', error);
         });
+        if (signal.aborted)
+            return;
         await publishSessionSnapshots(Array.from(knownConversationIds));
         // Rebuild so the descriptor picks up native slash commands from the
         // metadata refresh above — the initial descriptor is built before the
@@ -2569,32 +2417,34 @@ export async function main() {
                 }),
             };
         }
-        await Promise.all(Array.from(knownConversationIds).map(async (conversationId) => {
-            const session = sessions.get(conversationId);
-            const workspaceId = session
-                ? resolveWorkspaceIdForBaseCwd(session.environment.baseCwd)
-                : runtimeDescriptor.defaultWorkspaceId;
-            const workspace = workspaceOptions.find((option) => option.id === workspaceId) ?? null;
+        if (signal.aborted)
+            return;
+        const results = await Promise.allSettled(Array.from(knownConversationIds).map(async (conversationId) => {
             const descriptor = runtimeDescriptor.runtimeDescriptor;
             if (!descriptor)
                 return;
-            const payload = buildClaudeRuntimeInfo({
-                descriptor,
-                metadata,
-                workspaceLabel: workspace?.label ?? workspaceId ?? null,
-                resolvedCwd: session?.cwd ?? workspace?.cwd ?? workingDir,
-                workspaceRootId: workspace?.workspaceRootId ?? null,
-                workspaceRelativePath: workspace?.workspaceRelativePath ?? null,
-                executionMode: session?.environment.mode ?? null,
-                executionBranch: session?.environment.branch ?? null,
-                worktreePath: session?.environment.worktreePath ?? null,
-                fallbackReason: resolveExecutionFallbackReason(session?.environment),
+            await runtimeState.writeRuntimeInfo(conversationId, {
+                surfaceMode: 'host',
+                descriptor: {
+                    coreControls: [],
+                    supportsInterrupt: descriptor.supportsInterrupt,
+                    supportsInputInterrupt: descriptor.supportsInputInterrupt,
+                    streamingTextMode: descriptor.streamingTextMode,
+                },
             });
-            await runtimeState.writeRuntimeInfo(conversationId, payload);
-        })).catch((error) => {
-            console.error('[canon-host] Failed to publish runtime info:', error);
-        });
+        }));
+        const failure = results.find((result) => result.status === 'rejected');
+        if (failure?.status === 'rejected')
+            throw failure.reason;
     };
+    const runtimeHeartbeat = createRuntimeHeartbeat({
+        publisher: runtimeState,
+        getRuntime: () => runtimeDescriptor,
+        refreshDetails: refreshRuntimeDetails,
+        onError: (error, operation) => {
+            console.error(`[canon-host] Runtime ${operation} failed:`, error);
+        },
+    });
     // ── Load conversations (informational — sessions created on demand) ──
     try {
         runtimeModels = await detectRuntimeModels(workingDir);
@@ -2706,9 +2556,6 @@ export async function main() {
         client,
         conversationCache,
     });
-    function resolveWorkspaceIdForBaseCwd(baseCwd) {
-        return workspaceOptions.find((option) => option.cwd === baseCwd)?.id;
-    }
     async function refreshKnownConversationIds(force = false) {
         if (!force && Date.now() - lastKnownConversationRefreshAt < HEARTBEAT_MS) {
             return;
@@ -3004,7 +2851,7 @@ export async function main() {
                     runtimeState.clearTurnState(convoId).catch(() => { });
                 }, (descriptor) => {
                     runtimeDescriptor = descriptor;
-                    void publishRuntimeHeartbeat();
+                    runtimeHeartbeat.refresh();
                 }, {
                     model: runtimeModels[0]?.value,
                     permissionMode: 'default',
@@ -3460,7 +3307,8 @@ export async function main() {
             },
             onConnected: () => {
                 streamConnected = true;
-                void publishRuntimeHeartbeat();
+                publishLocalHeartbeat();
+                runtimeHeartbeat.connect();
                 const recovery = reconnectRecovery.onConnected();
                 if (recovery) {
                     void recovery.catch((error) => {
@@ -3471,7 +3319,7 @@ export async function main() {
             },
             onDisconnected: () => {
                 streamConnected = false;
-                runtimeState.clearAgentRuntime().catch(() => { });
+                void runtimeHeartbeat.disconnect();
                 console.error('[canon-host] SSE disconnected');
             },
             onError: (err) => console.error(`[canon-host] SSE error: ${err.message}`),
@@ -3571,7 +3419,7 @@ export async function main() {
                 session.writeTurn();
             }
         }
-        void publishRuntimeHeartbeat();
+        publishLocalHeartbeat();
     }, HEARTBEAT_MS);
     // ── Idle session cleanup ──
     const idleCheck = setInterval(() => {
@@ -3595,7 +3443,7 @@ export async function main() {
         stream.stop();
         approvalManager?.dispose();
         runtimeInputManager.dispose();
-        await runtimeState.clearAgentRuntime().catch(() => { });
+        await runtimeHeartbeat.dispose();
         for (const convoId of [...sessions.keys()]) {
             closeSession(convoId);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.34.1",
+  "version": "0.34.3",
   "description": "Canon channel plugin for Claude Code — messaging where AI agents are first-class citizens",
   "type": "module",
   "main": "dist/index.js",
@@ -31,10 +31,10 @@
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "0.3.228",
-    "@canonmsg/agent-sdk": "^10.1.0",
+    "@canonmsg/agent-sdk": "^10.2.1",
     "@canonmsg/agent-tools": "^0.9.0",
     "@canonmsg/coding-agent-host": "^0.7.0",
-    "@canonmsg/core": "^12.1.0",
+    "@canonmsg/core": "^12.3.0",
     "@canonmsg/rich-cards": "^0.10.4",
     "@modelcontextprotocol/sdk": "^1.30.0"
   },