@canonmsg/claude-code-plugin 0.12.2 → 0.12.4

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, 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, loadHostSessionConfig, loadRuntimeSessionState, markLocalRuntimeStopped, releaseConversationEnvironment, saveRuntimeSessionState, clearRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, resolveHostWorkspaceCwd, upsertLocalRuntimeEntry, } from '@canonmsg/core';
+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 { buildInboundContextLines, decideAutoReply, } from './inbound-policy.js';
 import { createStreamingBuffer } from './streaming-buffer.js';
 import { runCli } from './cli-entry.js';
@@ -142,6 +142,16 @@ function buildClaudeRuntimeDescriptor(input) {
                 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' },
+            },
         ],
     });
 }
@@ -450,7 +460,7 @@ const CLAUDE_RUNTIME_CAPABILITIES = {
     ...DEFAULT_RUNTIME_CAPABILITIES,
     supportsInterrupt: true,
     supportsQueue: true,
-    supportsInterleave: true,
+    supportsInterleave: false,
     supportsRequiresAction: true,
     supportsNonFinalPermanentMessages: false,
 };
@@ -797,7 +807,10 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
     }
     function writeState() {
         runtimeState.writeSessionState(conversationId, {
-            ...session.state,
+            model: session.state.model,
+            permissionMode: session.state.permissionMode,
+            effort: session.state.effort,
+            contextUsage: session.state.contextUsage,
             ...(session.availableModels.length ? { availableModels: session.availableModels } : {}),
             cwd,
             executionMode: session.environment.mode,
@@ -1052,7 +1065,7 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
                 parent_tool_use_id: null,
             });
         }
-        // Write available models to session state
+        // Refresh the canonical runtime descriptor after Claude reports supported models.
         try {
             const models = await q.supportedModels();
             const modelList = toModelOptions(models);
@@ -1073,8 +1086,10 @@ function createSession(conversationId, environment, agentId, client, runtimeStat
                 }),
             });
             runtimeState.writeSessionState(conversationId, {
-                ...session.state,
-                availableModels: modelList,
+                model: session.state.model,
+                permissionMode: session.state.permissionMode,
+                effort: session.state.effort,
+                contextUsage: session.state.contextUsage,
                 cwd,
                 executionMode: session.environment.mode,
                 ...(session.environment.branch ? { executionBranch: session.environment.branch } : {}),
@@ -1257,13 +1272,11 @@ export async function main() {
                 ? resolveWorkspaceIdForBaseCwd(session.environment.baseCwd)
                 : runtimeDescriptor.defaultWorkspaceId;
             const workspace = workspaceOptions.find((option) => option.id === workspaceId) ?? null;
+            const descriptor = runtimeDescriptor.runtimeDescriptor;
+            if (!descriptor)
+                return;
             const payload = buildClaudeRuntimeInfo({
-                descriptor: runtimeDescriptor.runtimeDescriptor ?? buildClaudeRuntimeDescriptor({
-                    models: runtimeModels,
-                    workspaces: buildPublicWorkspaceOptions(workspaceOptions),
-                    workspaceRoots: workspaceRootMetadata,
-                    executionModes: hostAvailableExecutionModes,
-                }),
+                descriptor,
                 metadata,
                 workspaceLabel: workspace?.label ?? workspaceId ?? null,
                 resolvedCwd: session?.cwd ?? workspace?.cwd ?? workingDir,
@@ -1319,6 +1332,10 @@ export async function main() {
         for (const conversation of convos) {
             knownConversationIds.add(conversation.id);
             conversationCache.set(conversation.id, conversation);
+            runtimeState.clearStreaming(conversation.id).catch(() => { });
+            runtimeState.clearSessionState(conversation.id).catch(() => { });
+            runtimeState.clearTurnState(conversation.id).catch(() => { });
+            client.setTyping(conversation.id, false).catch(() => { });
         }
         console.error(`[canon-host] ${convos.length} conversations`);
     }
@@ -1328,6 +1345,9 @@ export async function main() {
     // ── Session manager ──
     const sessions = new Map();
     const pendingSessionCreations = new Map();
+    let controlStopped = false;
+    const lastSeenControl = new Map();
+    const lastSeenSignal = new Map();
     /** Saved SDK session IDs for resume after idle eviction, keyed by conversation + workspace */
     const savedSessionIds = new Map();
     const { getConversationMeta } = createConversationMetadataLoader({
@@ -1405,6 +1425,13 @@ export async function main() {
         sessions.delete(conversationId);
         console.error(`[canon-host] [${conversationId.slice(0, 8)}] Session suspended (sessionId saved for resume)`);
     }
+    async function markSessionPendingInputsRejected(conversationId, inputs) {
+        await Promise.all(inputs.map((input) => {
+            if (!input.markAccepted || !input.sourceMessageId)
+                return Promise.resolve();
+            return client.updateMessageDisposition(conversationId, input.sourceMessageId, 'rejected').catch(() => { });
+        }));
+    }
     function evictOldestIdle() {
         let oldest = null;
         for (const s of sessions.values()) {
@@ -1486,6 +1513,7 @@ export async function main() {
                     availableExecutionModes: hostAvailableExecutionModes,
                 }, resumeId);
                 sessions.set(conversationId, session);
+                await baselineControlSignal(conversationId);
                 return session;
             }
             catch (error) {
@@ -1501,6 +1529,17 @@ export async function main() {
             pendingSessionCreations.delete(conversationId);
         }
     }
+    async function baselineControlSignal(conversationId) {
+        if (lastSeenSignal.has(conversationId))
+            return;
+        const raw = await rtdbRead(`/control/${conversationId}/${agentId}/signal`).catch(() => null);
+        if (!raw || typeof raw !== 'object')
+            return;
+        const timestamp = Number(raw.updatedAt ?? 0);
+        if (timestamp > 0) {
+            lastSeenSignal.set(conversationId, timestamp);
+        }
+    }
     async function enqueueRecoveredInboundMessage(input) {
         const m = input.message;
         if (m.senderId === agentId)
@@ -1744,9 +1783,6 @@ export async function main() {
         console.error('[canon-host] SSE start error:', err instanceof Error ? err.message : err);
     });
     // ── Control signal watcher ──
-    let controlStopped = false;
-    const lastSeenControl = new Map();
-    const lastSeenSignal = new Map();
     const pollControl = async () => {
         while (!controlStopped) {
             for (const convoId of [...sessions.keys()]) {
@@ -1793,8 +1829,10 @@ export async function main() {
                                     }
                                 }
                                 runtimeState.writeSessionState(convoId, {
-                                    ...session.state,
-                                    ...(session.availableModels.length ? { availableModels: session.availableModels } : {}),
+                                    model: session.state.model,
+                                    permissionMode: session.state.permissionMode,
+                                    effort: session.state.effort,
+                                    contextUsage: session.state.contextUsage,
                                     cwd: session.cwd,
                                     executionMode: session.environment.mode,
                                     ...(session.environment.branch ? { executionBranch: session.environment.branch } : {}),
@@ -1808,17 +1846,26 @@ export async function main() {
                             }
                         }
                     }
-                    // Interrupt signal
+                    // Interrupt/stop-clear signal
                     const sig = await rtdbRead(`/control/${convoId}/${agentId}/signal`);
                     if (sig && typeof sig === 'object') {
                         const s = sig;
                         const ts = s.updatedAt ?? 0;
-                        if (s.type === 'interrupt' && ts > (lastSeenSignal.get(convoId) ?? 0)) {
+                        if ((s.type === 'interrupt' || s.type === 'stop_and_drop') && ts > (lastSeenSignal.get(convoId) ?? 0)) {
                             lastSeenSignal.set(convoId, ts);
                             const session = sessions.get(convoId);
                             if (session && !session.closed) {
-                                console.error(`[canon-host] [${convoId.slice(0, 8)}] Interrupt signal`);
+                                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(() => { });
+                                    continue;
+                                }
+                                console.error(`[canon-host] [${convoId.slice(0, 8)}] ${s.type} signal`);
                                 try {
+                                    if (s.type === 'stop_and_drop') {
+                                        const droppedInputs = session.pendingInputs.splice(0);
+                                        await markSessionPendingInputsRejected(convoId, droppedInputs);
+                                    }
                                     session.turnState = 'interrupted';
                                     runtimeState.writeTurnState(convoId, {
                                         turnId: session.currentTurnId,
@@ -1830,7 +1877,9 @@ export async function main() {
                                         ...(session.currentTurnOpenedAt ? { openedAt: session.currentTurnOpenedAt } : {}),
                                         completedAt: { '.sv': 'timestamp' },
                                     }).catch(() => { });
-                                    await session.query.interrupt();
+                                    if (isActive) {
+                                        await session.query.interrupt();
+                                    }
                                     if (session.streamingTimer) {
                                         clearTimeout(session.streamingTimer);
                                         session.streamingTimer = null;
@@ -1838,9 +1887,10 @@ export async function main() {
                                     session.streamingText = '';
                                     runtimeState.clearStreaming(convoId).catch(() => { });
                                     client.setTyping(convoId, false).catch(() => { });
+                                    await rtdbWrite(`/control/${convoId}/${agentId}/signal`, null).catch(() => { });
                                 }
                                 catch (err) {
-                                    console.error(`[canon-host] [${convoId.slice(0, 8)}] Interrupt failed:`, err);
+                                    console.error(`[canon-host] [${convoId.slice(0, 8)}] ${s.type} failed:`, err);
                                 }
                             }
                         }
@@ -1858,8 +1908,10 @@ export async function main() {
     const heartbeat = setInterval(() => {
         for (const session of sessions.values()) {
             runtimeState.writeSessionState(session.conversationId, {
-                ...session.state,
-                ...(session.availableModels.length ? { availableModels: session.availableModels } : {}),
+                model: session.state.model,
+                permissionMode: session.state.permissionMode,
+                effort: session.state.effort,
+                contextUsage: session.state.contextUsage,
                 cwd: session.cwd,
                 executionMode: session.environment.mode,
                 ...(session.environment.branch ? { executionBranch: session.environment.branch } : {}),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.12.2",
+  "version": "0.12.4",
   "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": "^0.10.2",
-    "@canonmsg/core": "^0.14.0",
+    "@canonmsg/agent-sdk": "^1.1.0",
+    "@canonmsg/core": "^0.15.0",
     "@modelcontextprotocol/sdk": "^1.12.0"
   },
   "engines": {