@canonmsg/claude-code-plugin 0.24.0 → 0.25.0

package/dist/host.js

@@ -28,7 +28,7 @@ import { readFile } from 'node:fs/promises';
 import { query, } from '@anthropic-ai/claude-agent-sdk';
 import { isAnthropicImageAttachment, materializeMessageMedia, materializeReplyContextMedia, sendMediaFileMessage, toAnthropicImageBlock, } from '@canonmsg/agent-sdk';
 import { captureTurnArtifactSnapshot, collectTurnArtifacts, } from '@canonmsg/coding-agent-host';
-import { CLAUDE_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, buildPlanApprovalRequest, resolveQuestionAllowOther, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, normalizeRuntimeCommandDescriptors, DEFAULT_FIRST_PARTY_RUNTIME_PRESENTATION, createConversationMetadataLoader, createTurnOutputController, createRuntimeStatePublisher, createTypingStatusPublisher, EXECUTION_ENVIRONMENT_MODES, CanonClient, CanonStream, ControlChannelPoller, 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, sendMessageWithRetry, loadHostSessionConfig, loadRuntimeSessionState, markLocalRuntimeStopped, releaseConversationEnvironment, saveRuntimeSessionState, clearRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, renderCodingHostInboundPrompt, 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, buildCanonInboundFrameV1, buildCanonTurnContextV2, buildConfiguredWorkspaceOptionsWithRoots, buildConversationEnvironmentKey, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, diffCanonMemberIds, resolveQuestionAllowOther, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, normalizeRuntimeCommandDescriptors, DEFAULT_FIRST_PARTY_RUNTIME_PRESENTATION, createConversationMetadataLoader, createTurnOutputController, createRuntimeStatePublisher, createTypingStatusPublisher, EXECUTION_ENVIRONMENT_MODES, CanonClient, CanonStream, ControlChannelPoller, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, HOST_ADMISSION_ACTIONS_DISABLED, ApprovalManager, RuntimeRequestManager, ExecutionEnvironmentError, FINAL_MESSAGE_HANDOFF_MS, buildLocalRuntimeId, getActiveProfileLock, heartbeatLocalRuntimeEntry, normalizeTurnMetadata, prepareConversationEnvironment, resolveCanonAgent, initRTDBAuth, sendMessageWithRetry, loadHostSessionConfig, loadRuntimeSessionState, markLocalRuntimeStopped, releaseConversationEnvironment, saveRuntimeSessionState, clearRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, renderCodingHostInboundPrompt, resolveHostWorkspaceCwd, upsertLocalRuntimeEntry, } from '@canonmsg/core';
 import { decideAutoReply, } from './inbound-policy.js';
 import { runCli } from './cli-entry.js';
 import { synthesizeClaudeApprovalDiff } from './approval-diff.js';
@@ -769,7 +769,6 @@ async function buildCanonUserContent(input) {
 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;
     // Per-session input stream with message queue
     let resolveInput = null;
     let inputDone = false;
@@ -844,30 +843,6 @@ function createSession(conversationId, environment, agentId, client, typingSigna
             };
         });
     }
-    async function waitForRuntimeInputResponse(input) {
-        session.lastActivity = Date.now();
-        while (Date.now() < input.expiresAt) {
-            const response = await client.consumeRuntimeInputResponse({
-                conversationId,
-                inputId: input.inputId,
-            }).catch(() => null);
-            if (response?.status === 'submitted') {
-                return { status: 'submitted', answers: response.answers, value: response.value };
-            }
-            if (response?.status === 'cancelled' || response?.status === 'timeout') {
-                return { status: response.status };
-            }
-            await sleep(1_000);
-        }
-        const response = await client.consumeRuntimeInputResponse({
-            conversationId,
-            inputId: input.inputId,
-        }).catch(() => null);
-        if (response?.status === 'submitted') {
-            return { status: 'submitted', answers: response.answers, value: response.value };
-        }
-        return { status: 'timeout' };
-    }
     function buildArtifactMediaMetadata() {
         return {
             ...(session.currentTurnId ? { turnId: session.currentTurnId } : {}),
@@ -903,18 +878,19 @@ function createSession(conversationId, environment, agentId, client, typingSigna
                     const questionId = randomUUID();
                     const questions = mapClaudeQuestions(input.questions);
                     const expiresAt = Date.now() + REPLY_TIMEOUT_MS;
-                    await client.createRuntimeInputRequest({
-                        conversationId,
-                        inputId: questionId,
+                    // Create + poll fold onto the shared spine. `responderPolicy: 'infer'`
+                    // keeps the claude host's responder rule byte-identical (explicit
+                    // `cardResponseUserId` wins, else omit — never the manager's ownerId
+                    // fallback), and `native` carries the claude-specific descriptor.
+                    const reply = await config.runtimeInputManager.request('input', conversationId, {
                         kind: 'clarify',
-                        expiresAt,
                         title: 'Claude needs input',
                         prompt: questions?.length
                             ? 'Claude needs your input to continue.'
                             : 'Claude needs input to continue.',
                         ...(questions ? { questions } : {}),
                         sensitive: Boolean(questions?.some((question) => question.isSecret)),
-                        ...(cardResponseUserId ? { responseUserId: cardResponseUserId } : {}),
+                        responseUserId: cardResponseUserId,
                         native: {
                             runtime: 'claude-code',
                             method: 'AskUserQuestion',
@@ -922,9 +898,15 @@ function createSession(conversationId, environment, agentId, client, typingSigna
                             turnId: session.currentTurnId ?? undefined,
                         },
                         turnId: session.currentTurnId ?? undefined,
+                    }, {
+                        requestId: questionId,
+                        expiresAt,
+                        responderPolicy: 'infer',
+                        onCreated: () => {
+                            console.error(`[canon-host] [${conversationId.slice(0, 8)}] Runtime input question sent (${questionId.slice(0, 8)})`);
+                            session.lastActivity = Date.now();
+                        },
                     });
-                    console.error(`[canon-host] [${conversationId.slice(0, 8)}] Runtime input question sent (${questionId.slice(0, 8)})`);
-                    const reply = await waitForRuntimeInputResponse({ inputId: questionId, expiresAt });
                     if (reply.status !== 'submitted') {
                         return { behavior: 'deny', message: 'No reply received (timed out)' };
                     }
@@ -970,22 +952,19 @@ function createSession(conversationId, environment, agentId, client, typingSigna
                     const planBody = typeof input.plan === 'string' && input.plan.trim()
                         ? input.plan.trim()
                         : undefined;
-                    const planApproval = buildPlanApprovalRequest(planId, 'Plan ready for review.', {
+                    // 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,
+                        title: 'Plan ready for review.',
                         summary: 'Claude has prepared a plan and is asking permission to continue.',
                         ...(planBody ? { body: planBody } : {}),
-                        ...(cardResponseUser ?? {}),
+                        ...(cardResponseUserId ? { responseUserId: cardResponseUserId } : {}),
                         ...(allowedPrompts.length > 0 ? { allowedPrompts } : {}),
-                    });
-                    await sendMessageWithRetry(client, conversationId, planApproval.text, {
-                        messageId: `claude-plan-${planId}`,
-                        ...(session.activeSelfContextId
-                            ? { selfContextId: session.activeSelfContextId }
-                            : {}),
-                        metadata: {
-                            ...planApproval.metadata,
-                            turnSemantics: 'control',
-                            replyBehavior: 'suppress_auto_reply',
-                        },
+                        ...(session.currentTurnId ? { turnId: session.currentTurnId } : {}),
                     });
                     console.error(`[canon-host] [${conversationId.slice(0, 8)}] Plan approval sent (${planId.slice(0, 8)})`);
                     const reply = await waitForReply('plan_approval_reply', planId);
@@ -2062,6 +2041,10 @@ export async function main() {
     // ── Session manager ──
     const sessions = new Map();
     const approvalManager = ownerId ? new ApprovalManager(client, agentId, ownerId) : null;
+    // Interactive runtime input (AskUserQuestion) works with or without an owner,
+    // so its poll engine is always present. Create + poll fold onto the built-in
+    // input descriptor via `request()` (see the AskUserQuestion canUseTool branch).
+    const runtimeInputManager = new RuntimeRequestManager(client, { agentId, ownerId: ownerId ?? '' });
     const pendingSessionCreations = new Map();
     // Shared /control channel poller (claude host profile): session + signal
     // keys, sequential conversations, active/idle cadence + jitter sampled at
@@ -2368,6 +2351,7 @@ export async function main() {
                     availableExecutionModes: hostAvailableExecutionModes,
                     runtimePresentation,
                     approvalManager,
+                    runtimeInputManager,
                     canRequestApproval: () => canRequestCanonApproval(conversationId),
                     runtimeId,
                     ownerId,
@@ -2778,6 +2762,7 @@ export async function main() {
         clearInterval(idleCheck);
         stream.stop();
         approvalManager?.dispose();
+        runtimeInputManager.dispose();
         await runtimeState.clearAgentRuntime().catch(() => { });
         for (const convoId of [...sessions.keys()]) {
             closeSession(convoId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "description": "Canon channel plugin for Claude Code — messaging where AI agents are first-class citizens",
   "type": "module",
   "main": "dist/index.js",
@@ -31,9 +31,9 @@
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.3.200",
-    "@canonmsg/agent-sdk": "^5.0.0",
+    "@canonmsg/agent-sdk": "^5.1.0",
     "@canonmsg/coding-agent-host": "^0.2.2",
-    "@canonmsg/core": "^4.1.0",
+    "@canonmsg/core": "^4.2.0",
     "@modelcontextprotocol/sdk": "^1.29.0"
   },
   "engines": {