@canonmsg/claude-code-plugin 0.25.4 → 0.25.6

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

package/dist/host.d.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
-import { type SDKControlReloadPluginsResponse } from '@anthropic-ai/claude-agent-sdk';
+import { type PermissionResult, type SDKControlReloadPluginsResponse } from '@anthropic-ai/claude-agent-sdk';
 import { type CanonRuntimeCommandDescriptor } from '@canonmsg/core';
+export declare function buildClaudePlanAllowResult(input: Record<string, unknown>): PermissionResult;
 /**
  * Claude Code's own slash commands (built-ins, plugins, project .claude/
  * commands) are executable when sent as prompt text, so the runtime's command

package/dist/host.js

@@ -92,6 +92,9 @@ let runtimeMetadata = {
 let runtimeMetadataRefresh = null;
 /** Bound on native slash commands exposed to the composer palette. */
 const MAX_NATIVE_SLASH_COMMANDS = 50;
+export function buildClaudePlanAllowResult(input) {
+    return { behavior: 'allow', updatedInput: input };
+}
 /**
  * Claude Code's own slash commands (built-ins, plugins, project .claude/
  * commands) are executable when sent as prompt text, so the runtime's command
@@ -841,25 +844,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 +923,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
@@ -998,15 +982,23 @@ function createSession(conversationId, environment, agentId, client, typingSigna
                             // instead of waiting for the next 30s heartbeat (lag fix).
                             config.publishSessionSnapshots?.([conversationId]);
                         }
-                        return { behavior: 'allow' };
+                        return buildClaudePlanAllowResult(input);
                     }
-                    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 +1085,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 +2550,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, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.25.4",
+  "version": "0.25.6",
   "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": {