@canonmsg/claude-code-plugin 0.14.18 → 0.15.1

package/dist/host.js

@@ -26,8 +26,8 @@ import { execFileSync } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import { query, } from '@anthropic-ai/claude-agent-sdk';
 import { isAnthropicImageAttachment, materializeMessageMedia, materializeReplyContextMedia, toAnthropicImageBlock, } from '@canonmsg/agent-sdk';
-import { CLAUDE_EFFORT_OPTIONS, CLAUDE_PERMISSION_MODE_OPTIONS, RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildCanonHostPrompt, buildCanonTurnEnvelopeV1, buildConfiguredWorkspaceOptionsWithRoots, buildConversationEnvironmentKey, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, diffCanonMemberIds, buildPlanApprovalRequest, buildQuestionRequest, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, DEFAULT_FIRST_PARTY_RUNTIME_PRESENTATION, createConversationMetadataLoader, createTurnOutputController, createRuntimeStatePublisher, createTypingStatusPublisher, EXECUTION_ENVIRONMENT_MODES, CanonClient, CanonStream, 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, rtdbRead, rtdbWrite, sendMessageWithRetry, loadHostSessionConfig, loadRuntimeSessionState, markLocalRuntimeStopped, releaseConversationEnvironment, saveRuntimeSessionState, clearRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, renderCanonTurnEnvelopePrompt, resolveCanonHostPromptMode, resolveHostWorkspaceCwd, upsertLocalRuntimeEntry, } from '@canonmsg/core';
-import { buildInboundContextLines, decideAutoReply, } from './inbound-policy.js';
+import { CLAUDE_EFFORT_OPTIONS, CLAUDE_PERMISSION_MODE_OPTIONS, RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildCanonTurnContextV2, buildConfiguredWorkspaceOptionsWithRoots, buildConversationEnvironmentKey, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, diffCanonMemberIds, buildPlanApprovalRequest, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, DEFAULT_FIRST_PARTY_RUNTIME_PRESENTATION, createConversationMetadataLoader, createTurnOutputController, createRuntimeStatePublisher, createTypingStatusPublisher, EXECUTION_ENVIRONMENT_MODES, CanonClient, CanonStream, 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, rtdbRead, rtdbWrite, sendMessageWithRetry, loadHostSessionConfig, loadRuntimeSessionState, markLocalRuntimeStopped, releaseConversationEnvironment, saveRuntimeSessionState, clearRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, renderCanonTurnBriefPrompt, resolveHostWorkspaceCwd, upsertLocalRuntimeEntry, } from '@canonmsg/core';
+import { decideAutoReply, } from './inbound-policy.js';
 import { runCli } from './cli-entry.js';
 import { decideClaudeToolPermissionForMode, parseAllowedNonOwnerClaudeTools, } from './tool-policy.js';
 import { buildClaudeFinalMessageId, createClaudeInputEnvelope, formatClaudeControlError, mergeClaudeModelOptions, resetClaudeCompletedTurnState, shouldDeliverClaudeFinal, } from './session-state.js';
@@ -87,21 +87,6 @@ let runtimeMetadata = {
 let runtimeMetadataRefresh = null;
 function buildClaudeRuntimeDescriptor(input) {
     const commands = [
-        {
-            id: 'plan',
-            label: 'Plan first',
-            description: 'Switch Claude into Plan mode. Text after /plan is kept as a ready prompt while the mode applies.',
-            aliases: ['plan'],
-            category: 'plan',
-            placements: ['composer_slash', 'command_palette'],
-            availability: ['always'],
-            trailingTextBehavior: 'send_as_prompt',
-            dispatch: {
-                kind: 'control',
-                controlId: 'permissionMode',
-                value: 'plan',
-            },
-        },
         {
             id: 'runtime-status',
             label: 'Runtime status',
@@ -190,6 +175,25 @@ function buildClaudeRuntimeDescriptor(input) {
         permissionModes: CLAUDE_PERMISSION_MODE_OPTIONS,
         defaultPermissionMode: 'default',
         streamingTextMode: 'delta',
+        turnModes: [
+            {
+                id: 'normal',
+                label: 'Normal',
+                description: 'Let Claude answer or act normally.',
+                scope: 'session',
+                default: true,
+                activation: { kind: 'control', controlId: 'permissionMode', value: 'default' },
+            },
+            {
+                id: 'plan',
+                label: 'Plan',
+                description: 'Switch Claude Code into Plan mode.',
+                scope: 'session',
+                ownerOnly: true,
+                aliases: ['plan'],
+                activation: { kind: 'control', controlId: 'permissionMode', value: 'plan' },
+            },
+        ],
         admissionActions: HOST_ADMISSION_ACTIONS_DISABLED,
         presentation: input.presentation,
         commands,
@@ -380,6 +384,71 @@ async function refreshClaudeRuntimeMetadata(input) {
     });
     return runtimeMetadataRefresh;
 }
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function mapClaudeQuestions(value) {
+    if (!Array.isArray(value))
+        return undefined;
+    const questions = value.slice(0, 12).flatMap((entry) => {
+        if (!entry || typeof entry !== 'object' || Array.isArray(entry))
+            return [];
+        const record = entry;
+        const id = typeof record.id === 'string' && record.id.trim()
+            ? record.id.trim().slice(0, 120)
+            : typeof record.question === 'string' && record.question.trim()
+                ? record.question.trim().slice(0, 80).replace(/[^A-Za-z0-9_.:-]+/g, '-')
+                : null;
+        const question = typeof record.question === 'string' && record.question.trim()
+            ? record.question.trim().slice(0, 1000)
+            : null;
+        if (!id || !/^[A-Za-z0-9_.:-]{1,120}$/.test(id) || !question)
+            return [];
+        const header = typeof record.header === 'string' && record.header.trim()
+            ? record.header.trim().slice(0, 120)
+            : undefined;
+        const rawOptions = Array.isArray(record.options) ? record.options : [];
+        const choices = rawOptions.slice(0, 12).flatMap((option) => {
+            if (!option || typeof option !== 'object' || Array.isArray(option))
+                return [];
+            const optionRecord = option;
+            const label = typeof optionRecord.label === 'string' && optionRecord.label.trim()
+                ? optionRecord.label.trim().slice(0, 120)
+                : typeof optionRecord.value === 'string' && optionRecord.value.trim()
+                    ? optionRecord.value.trim().slice(0, 120)
+                    : null;
+            if (!label)
+                return [];
+            const optionValue = typeof optionRecord.value === 'string' && optionRecord.value.trim()
+                ? optionRecord.value.trim().slice(0, 120)
+                : label;
+            return [{
+                    label,
+                    value: optionValue,
+                    ...(typeof optionRecord.description === 'string' && optionRecord.description.trim()
+                        ? { description: optionRecord.description.trim().slice(0, 240) }
+                        : {}),
+                }];
+        });
+        return [{
+                id,
+                question,
+                ...(header ? { header } : {}),
+                ...(choices.length ? { choices } : {}),
+                ...(record.isOther === true || record.allowOther === true ? { allowOther: true } : {}),
+                ...(record.isSecret === true ? { isSecret: true } : {}),
+                ...(record.multiSelect === true ? { multiSelect: true } : {}),
+            }];
+    });
+    return questions.length ? questions : undefined;
+}
+function flattenRuntimeInputAnswers(answers) {
+    const flattened = {};
+    for (const [questionId, answer] of Object.entries(answers ?? {})) {
+        flattened[questionId] = answer.answers.join(', ');
+    }
+    return flattened;
+}
 function mapClaudeMcpStatus(status) {
     switch (status) {
         case 'connected':
@@ -535,35 +604,24 @@ const CLAUDE_RUNTIME_CAPABILITIES = {
     supportsRequiresAction: true,
     supportsNonFinalPermanentMessages: false,
 };
-const HOST_PROMPT_MODE = resolveCanonHostPromptMode(process.env.CANON_HOST_PROMPT_MODE);
 function controlPollDelayMs(hasActiveWork) {
     const base = hasActiveWork ? CONTROL_POLL_MS : IDLE_CONTROL_POLL_MS;
     return base + Math.floor(Math.random() * CONTROL_POLL_JITTER_MS);
 }
 function buildCanonPrompt(input) {
-    const { session, ...promptInput } = input;
-    const sessionContextLines = session ? buildClaudeSessionContextLines(session) : undefined;
-    if (HOST_PROMPT_MODE === 'envelope') {
-        return renderCanonTurnEnvelopePrompt(buildCanonTurnEnvelopeV1({
-            content: input.content,
-            conversationId: input.conversationId,
-            participantContext: input.participantContext,
-            behavior: input.behavior,
-            selfContexts: input.selfContexts,
-            activeSelfContextId: input.activeSelfContextId,
-            provenance: input.provenance,
-            replyContext: input.replyContext,
-            sessionContextLines,
-            message: input.message,
-            hydratedFromPage: input.hydratedFromPage,
-        }));
-    }
-    return buildCanonHostPrompt({
-        hostLabel: 'Claude Code',
-        buildInboundContextLines,
+    const sessionContextLines = input.session ? buildClaudeSessionContextLines(input.session) : undefined;
+    return renderCanonTurnBriefPrompt(buildCanonTurnContextV2({
+        content: input.content,
+        conversationId: input.conversationId,
+        participantContext: input.participantContext,
+        behavior: input.behavior,
+        selfContexts: input.selfContexts,
+        activeSelfContextId: input.activeSelfContextId,
+        provenance: input.provenance,
+        replyContext: input.replyContext,
         sessionContextLines,
-        ...promptInput,
-    });
+        message: input.message,
+    }));
 }
 function optionLabel(value, options) {
     if (!value)
@@ -703,6 +761,30 @@ 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' };
+    }
     const claudeCliPath = resolveClaudeCliPath();
     const queryOptions = {
         systemPrompt: { type: 'preset', preset: 'claude_code' },
@@ -726,24 +808,43 @@ function createSession(conversationId, environment, agentId, client, typingSigna
             if (toolName === 'AskUserQuestion') {
                 try {
                     const questionId = randomUUID();
-                    const questions = input.questions ?? [];
-                    const questionCard = buildQuestionRequest(questionId, questions, cardResponseUser);
-                    await sendMessageWithRetry(client, conversationId, questionCard.text, {
-                        messageId: `claude-question-${questionId}`,
-                        ...(session.activeSelfContextId
-                            ? { selfContextId: session.activeSelfContextId }
-                            : {}),
-                        metadata: {
-                            ...questionCard.metadata,
-                            turnSemantics: 'control',
-                            replyBehavior: 'suppress_auto_reply',
+                    const questions = mapClaudeQuestions(input.questions);
+                    const expiresAt = Date.now() + REPLY_TIMEOUT_MS;
+                    await client.createRuntimeInputRequest({
+                        conversationId,
+                        inputId: questionId,
+                        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 } : {}),
+                        native: {
+                            runtime: 'claude-code',
+                            method: 'AskUserQuestion',
+                            requestId: questionId,
+                            turnId: session.currentTurnId ?? undefined,
                         },
+                        turnId: session.currentTurnId ?? undefined,
                     });
-                    console.error(`[canon-host] [${conversationId.slice(0, 8)}] Question sent (${questionId.slice(0, 8)})`);
-                    const reply = await waitForReply('question_reply', questionId);
+                    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)' };
+                    }
                     return {
                         behavior: 'allow',
-                        updatedInput: { ...input, answers: reply.answers },
+                        updatedInput: {
+                            ...input,
+                            answers: reply.answers
+                                ? flattenRuntimeInputAnswers(reply.answers)
+                                : reply.value
+                                    ? { answer: reply.value }
+                                    : {},
+                        },
                     };
                 }
                 catch {
@@ -2088,7 +2189,6 @@ export async function main() {
             provenance: hydrated.provenance,
             replyContext,
             message: m,
-            hydratedFromPage: hydrated.hydratedFromPage,
             session,
         });
         const messageContent = await buildCanonUserContent({
@@ -2196,6 +2296,10 @@ export async function main() {
                 }
                 const sender = m.senderName || m.senderId;
                 const isOwner = m.isOwner ?? (ownerId != null && m.senderId === ownerId);
+                if (payload.turnDispatch && payload.turnDispatch.kind !== 'run_turn') {
+                    console.error(`[canon-host] [${convoId.slice(0, 8)}] Ignoring server-dispatched observe-only message: ${payload.turnDispatch.reason}`);
+                    return;
+                }
                 void (async () => {
                     let materialized = [];
                     if (m.id) {
@@ -2230,7 +2334,12 @@ export async function main() {
                     });
                     const replyContext = replyMedia.replyContext;
                     const participantContext = hydrated.participantContext;
-                    const autoReply = decideAutoReply(participantContext, behavior);
+                    const autoReply = payload.turnDispatch?.kind === 'run_turn'
+                        ? {
+                            allow: true,
+                            reason: payload.turnDispatch.reason || 'server dispatch allowed this turn',
+                        }
+                        : decideAutoReply(participantContext, behavior);
                     if (!autoReply.allow) {
                         console.error(`[canon-host] [${convoId.slice(0, 8)}] Suppressed auto-reply: ${autoReply.reason}`);
                         return;
@@ -2270,7 +2379,6 @@ export async function main() {
                         provenance: hydrated.provenance,
                         replyContext,
                         message: m,
-                        hydratedFromPage: hydrated.hydratedFromPage,
                         session,
                     });
                     const messageContent = await buildCanonUserContent({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.14.18",
+  "version": "0.15.1",
   "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.141",
-    "@canonmsg/agent-sdk": "^2.4.0",
-    "@canonmsg/core": "^1.7.0",
+    "@canonmsg/agent-sdk": "^3.1.0",
+    "@canonmsg/core": "^2.1.0",
     "@modelcontextprotocol/sdk": "^1.29.0"
   },
   "engines": {
@@ -58,7 +58,7 @@
   "devDependencies": {
     "@types/node": "^22.0.0",
     "typescript": "~5.7.0",
-    "vitest": "^3.0.0"
+    "vitest": "^4.1.8"
   },
   "license": "MIT"
 }