@canonmsg/claude-code-plugin 0.25.3 → 0.25.5

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

package/dist/host.js

@@ -35,7 +35,7 @@ import { synthesizeClaudeApprovalDiff } from './approval-diff.js';
 import { decideClaudeToolPermissionForMode, parseAllowedNonOwnerClaudeTools, } from './tool-policy.js';
 import { applyClaudeSessionControl, buildClaudeFinalMessageId, claudeModelInfoToOption, confirmClaudeInterrupt, createClaudeInputEnvelope, formatClaudeControlError, isClaudeCustomModelOption, mergeClaudeDiscoveredModelOptions, resolveClaudeTurnResponseRouting, resolveClaudeModelOptions, resetClaudeCompletedTurnState, shouldDeliverClaudeFinal, } from './session-state.js';
 import { CLAUDE_SUPPORTED_DIALOG_KINDS, buildClaudeAskUserPermissionDenied, buildClaudeAskUserPermissionResult, createClaudeUserDialogCoordinator, parseClaudeAskUserDialog, parseClaudeAskUserToolInput, resolveClaudeUserDialogRequestId, } from './user-dialog.js';
-import { collectMissedInboundMessages, STARTUP_RECOVERY_MAX_MESSAGES, STARTUP_RECOVERY_PAGE_SIZE, } from './startup-recovery.js';
+import { collectMissedInboundMessages, createReconnectRecoveryGate, STARTUP_RECOVERY_MAX_MESSAGES, STARTUP_RECOVERY_PAGE_SIZE, } from './startup-recovery.js';
 function parseRuntimeVisibilityPreset(value) {
     return value === 'normal' || value === 'minimal' || value === 'full' ? value : undefined;
 }
@@ -841,25 +841,6 @@ function createSession(conversationId, environment, agentId, client, typingSigna
             }
         });
     }
-    function waitForReply(type, requestId, responseUserId) {
-        // Keep session alive while waiting for user input
-        session.lastActivity = Date.now();
-        return new Promise((resolve, reject) => {
-            const timer = setTimeout(() => {
-                session.pendingReply = null;
-                reject(new Error('Timed out waiting for user reply'));
-            }, REPLY_TIMEOUT_MS);
-            session.pendingReply = {
-                type,
-                requestId,
-                responseUserId,
-                resolve: (metadata) => {
-                    clearTimeout(timer);
-                    resolve(metadata);
-                },
-            };
-        });
-    }
     function buildArtifactMediaMetadata() {
         return {
             ...(session.currentTurnId ? { turnId: session.currentTurnId } : {}),
@@ -939,24 +920,24 @@ function createSession(conversationId, environment, agentId, client, typingSigna
                     const planBody = typeof input.plan === 'string' && input.plan.trim()
                         ? input.plan.trim()
                         : undefined;
-                    // Route plan-CREATE through the unified spine (`/runtime-plan/request`):
-                    // seeds the server-owned pending node/attention/state and authors the
-                    // `plan_approval` card. Resolution is UNCHANGED — the gate still blocks
-                    // on the server-authored `plan_approval_reply` below.
-                    await client.createRuntimePlanRequest({
-                        conversationId,
-                        planId,
+                    const reply = await config.runtimeInputManager.request('plan', conversationId, {
                         title: 'Plan ready for review.',
                         summary: 'Claude has prepared a plan and is asking permission to continue.',
                         ...(planBody ? { body: planBody } : {}),
                         responseUserId: turnResponseRouting.responseUserId,
                         ...(allowedPrompts.length > 0 ? { allowedPrompts } : {}),
                         ...(session.currentTurnId ? { turnId: session.currentTurnId } : {}),
+                    }, {
+                        requestId: planId,
                         expiresAt: Date.now() + REPLY_TIMEOUT_MS,
+                        responderPolicy: 'infer',
+                        signal: options.signal,
+                        onCreated: () => {
+                            session.lastActivity = Date.now();
+                            console.error(`[canon-host] [${conversationId.slice(0, 8)}] Plan approval sent (${planId.slice(0, 8)})`);
+                        },
                     });
-                    console.error(`[canon-host] [${conversationId.slice(0, 8)}] Plan approval sent (${planId.slice(0, 8)})`);
-                    const reply = await waitForReply('plan_approval_reply', planId, turnResponseRouting.responseUserId);
-                    if (reply.decision === 'approve') {
+                    if (reply.status === 'approve') {
                         // Honor opt-in selective grants: when the card sent an explicit
                         // granted subset, pre-approve those tools as session rules so they
                         // do not re-prompt. Owner-turn only; absent grants preserve the
@@ -1000,13 +981,21 @@ function createSession(conversationId, environment, agentId, client, typingSigna
                         }
                         return { behavior: 'allow' };
                     }
-                    if (reply.decision === 'reject') {
+                    if (reply.status === 'reject') {
                         return {
                             behavior: 'deny',
                             message: reply.feedback?.trim()
                                 || 'Plan declined — keep planning and wait for guidance before proceeding.',
                         };
                     }
+                    if (reply.status === 'cancelled' || reply.status === 'timeout') {
+                        return {
+                            behavior: 'deny',
+                            message: reply.status === 'timeout'
+                                ? 'No reply received (timed out)'
+                                : 'The plan review was cancelled.',
+                        };
+                    }
                     return {
                         behavior: 'deny',
                         message: reply.feedback?.trim() || 'User requested changes to the plan.',
@@ -1093,7 +1082,6 @@ function createSession(conversationId, environment, agentId, client, typingSigna
         controlInterruptPending: false,
         closed: false,
         sdkSessionId: resumeSessionId || null,
-        pendingReply: null,
         writeState: () => writeState(),
         writeTurn: () => writeTurn(),
         clearStreaming: () => clearStreaming(),
@@ -2559,28 +2547,14 @@ export async function main() {
                 return true;
             }
         }
-        if (message.metadata?.type !== 'plan_approval_reply')
-            return false;
-        const existingSession = sessions.get(conversationId);
-        const pendingReply = existingSession?.pendingReply;
-        const replyRequestId = message.metadata.planId;
-        if (!pendingReply) {
-            console.error(`[canon-host] [${conversationId.slice(0, 8)}] Ignoring stale ${message.metadata.type} with no pending request`);
-            return true;
-        }
-        if (message.senderId !== pendingReply.responseUserId) {
-            console.error(`[canon-host] [${conversationId.slice(0, 8)}] Ignoring ${message.metadata.type} from unexpected responder ${message.senderId}`);
-            return true;
-        }
-        if (pendingReply.type !== message.metadata.type || pendingReply.requestId !== replyRequestId) {
-            console.error(`[canon-host] [${conversationId.slice(0, 8)}] Ignoring mismatched ${message.metadata.type} (${String(replyRequestId ?? 'missing-id')})`);
-            return true;
+        const consumed = runtimeInputManager.handleMessage(conversationId, {
+            senderId: message.senderId,
+            metadata: message.metadata,
+        });
+        if (consumed) {
+            console.error(`[canon-host] [${conversationId.slice(0, 8)}] Runtime response receipt woke canonical polling`);
         }
-        existingSession.pendingReply = null;
-        existingSession.lastActivity = Date.now();
-        pendingReply.resolve(message.metadata);
-        console.error(`[canon-host] [${conversationId.slice(0, 8)}] Reply received (${message.metadata.type}:${pendingReply.requestId.slice(0, 8)})`);
-        return true;
+        return consumed;
     }
     function persistedConversationCursors(conversationId) {
         const canonicalCursor = loadRuntimeSessionState(runtimeId, {
@@ -2663,6 +2637,7 @@ export async function main() {
         });
         return recoveryInFlight;
     }
+    const shouldRecoverAfterStreamConnect = createReconnectRecoveryGate();
     await recoverMissedInboundMessages();
     // ── Connect SSE stream for inbound Canon messages ──
     const stream = new CanonStream({
@@ -2799,7 +2774,9 @@ export async function main() {
             onConnected: () => {
                 streamConnected = true;
                 void publishRuntimeHeartbeat();
-                void recoverMissedInboundMessages();
+                if (shouldRecoverAfterStreamConnect()) {
+                    void recoverMissedInboundMessages();
+                }
                 console.error('[canon-host] SSE connected');
             },
             onDisconnected: () => {

package/dist/startup-recovery.d.ts

@@ -40,6 +40,11 @@ export interface StartupRecoveryResult<TPage extends StartupRecoveryPage> {
     /** First page fetched — reusable as hydration context for recovered turns. */
     newestPage: TPage;
 }
+/**
+ * Startup recovery runs before the stream starts. The first SSE connection
+ * therefore needs no second pass, while later reconnects still need catch-up.
+ */
+export declare function createReconnectRecoveryGate(): () => boolean;
 export declare function collectMissedInboundMessages<TPage extends StartupRecoveryPage>(input: {
     fetchPage: (before?: string) => Promise<TPage>;
     cursor: string | null | undefined;

package/dist/startup-recovery.js

@@ -11,6 +11,18 @@
  */
 export const STARTUP_RECOVERY_PAGE_SIZE = 25;
 export const STARTUP_RECOVERY_MAX_MESSAGES = 500;
+/**
+ * Startup recovery runs before the stream starts. The first SSE connection
+ * therefore needs no second pass, while later reconnects still need catch-up.
+ */
+export function createReconnectRecoveryGate() {
+    let hasConnected = false;
+    return () => {
+        const shouldRecover = hasConnected;
+        hasConnected = true;
+        return shouldRecover;
+    };
+}
 export async function collectMissedInboundMessages(input) {
     const maxMessages = input.maxMessages ?? STARTUP_RECOVERY_MAX_MESSAGES;
     const newestPage = await input.fetchPage();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.25.3",
+  "version": "0.25.5",
   "description": "Canon channel plugin for Claude Code — messaging where AI agents are first-class citizens",
   "type": "module",
   "main": "dist/index.js",
@@ -33,7 +33,7 @@
     "@anthropic-ai/claude-agent-sdk": "0.3.204",
     "@canonmsg/agent-sdk": "^5.1.1",
     "@canonmsg/coding-agent-host": "^0.2.2",
-    "@canonmsg/core": "^4.2.2",
+    "@canonmsg/core": "^4.2.3",
     "@modelcontextprotocol/sdk": "^1.29.0"
   },
   "engines": {