@canonmsg/claude-code-plugin 0.9.5 → 0.10.0

package/README.md

@@ -32,6 +32,14 @@ Send a message to your agent in the Canon app. Claude Code responds with full ca
 canon-claude --cwd /path/to/project
 ```
 
+Advertise multiple project choices to the Canon app:
+
+```bash
+canon-claude --cwd ~/dev --workspace ~/dev/canon --workspace ~/dev/yumyumv2
+```
+
+`--cwd` is the default workspace. Each `--workspace` value appears as a selectable workspace during session creation. Worktree mode creates a per-conversation git worktree under `~/.canon/conversation-worktrees`; shared-workspace mode runs directly in the selected directory.
+
 ## Multiple agents
 
 ```bash

package/dist/host-runtime.d.ts

@@ -37,6 +37,12 @@ interface HostWorkspaceResolverOption {
     id: string;
     cwd: string;
 }
+export declare const HOST_ADMISSION_ACTION_CAPABILITIES: Readonly<{
+    canStartDirectConversation: false;
+    canSendContactRequest: false;
+    canApprovePendingContactRequests: false;
+    canRejectPendingContactRequests: false;
+}>;
 export declare function buildCanonHostPrompt(input: {
     hostLabel: string;
     content: string;
@@ -82,12 +88,33 @@ export declare function buildHydratedInboundContext(input: {
     hydratedFromPage: boolean;
 };
 export declare function publishHostAgentRuntime(agentId: string, clientType: AgentClientType, runtime: AgentRuntime): Promise<void>;
-export declare function readHostSessionConfig<TExtra extends string = never>(raw: unknown, extraStringFields?: readonly TExtra[]): (SessionWorkspaceConfig & Partial<Record<TExtra, string>>) | null;
+export declare function publishHostSessionSnapshots(input: {
+    conversationIds: string[];
+    agentId: string;
+    clientType: AgentClientType;
+    runtime: AgentRuntime;
+    workspaceOptions: HostWorkspaceResolverOption[];
+    defaultCwd: string;
+    liveSessionConfigByConversation?: ReadonlyMap<string, {
+        model?: string;
+        permissionMode?: string;
+        effort?: string;
+        runtimeControlValues?: Record<string, string>;
+        workspaceId?: string;
+        executionMode?: SessionWorkspaceConfig['executionMode'];
+        executionBranch?: string | null;
+    }>;
+}): Promise<void>;
+export declare function readHostSessionConfig<TExtra extends string = never>(raw: unknown, extraStringFields?: readonly TExtra[]): (SessionWorkspaceConfig & Partial<Record<TExtra, string>> & {
+    runtimeControlValues?: Record<string, string>;
+}) | null;
 export declare function loadHostSessionConfig<TExtra extends string = never>(input: {
     conversationId: string;
     agentId: string;
     extraStringFields?: readonly TExtra[];
-}): Promise<(SessionWorkspaceConfig & Partial<Record<TExtra, string>>) | null>;
+}): Promise<(SessionWorkspaceConfig & Partial<Record<TExtra, string>> & {
+    runtimeControlValues?: Record<string, string>;
+}) | null>;
 export declare function resolveHostWorkspaceCwd(input: {
     workspaceOptions: HostWorkspaceResolverOption[];
     config: {

package/dist/host-runtime.js

@@ -11,7 +11,13 @@
  * behavior here, update that copy too and adjust the shared golden
  * fixture test (`packages/claude-code-plugin/src/host-runtime.test.ts`).
  */
-import { buildBehaviorPolicyLines, buildParticipationHistorySnapshot, buildWorkSessionsPromptLines, mergeWorkSessionContexts, normalizeOptionalString, readSessionWorkspaceConfig, resolveConfiguredWorkspaceCwd, rtdbRead, rtdbWrite, } from '@canonmsg/core';
+import { buildAgentSessionSnapshot, buildConversationWorktreeSpec, buildBehaviorPolicyLines, buildParticipationHistorySnapshot, buildWorkSessionsPromptLines, mergeWorkSessionContexts, normalizeOptionalString, patchAgentSessionSnapshot, readSessionWorkspaceConfig, resolveConfiguredWorkspaceCwd, rtdbRead, rtdbWrite, } from '@canonmsg/core';
+export const HOST_ADMISSION_ACTION_CAPABILITIES = Object.freeze({
+    canStartDirectConversation: false,
+    canSendContactRequest: false,
+    canApprovePendingContactRequests: false,
+    canRejectPendingContactRequests: false,
+});
 export function buildCanonHostPrompt(input) {
     const resolvedWorkSessions = mergeWorkSessionContexts(input.workSession, input.workSessions);
     return [
@@ -70,7 +76,21 @@ function describeContactCard(card) {
     if (card.about)
         parts.push(`about: ${card.about}`);
     const identity = `📇 Contact card: "${card.displayName}" (${parts.join(' · ')}).`;
-    const hint = `This card is informational only in host mode. Canon does not currently expose a host-side tool here for starting a new direct conversation or sending a contact request to userId ${card.userId}.`;
+    const missingCapabilities = [
+        !HOST_ADMISSION_ACTION_CAPABILITIES.canStartDirectConversation
+            ? 'start a direct conversation'
+            : null,
+        !HOST_ADMISSION_ACTION_CAPABILITIES.canSendContactRequest
+            ? 'send a contact request'
+            : null,
+        !HOST_ADMISSION_ACTION_CAPABILITIES.canApprovePendingContactRequests
+            ? 'approve pending requests'
+            : null,
+        !HOST_ADMISSION_ACTION_CAPABILITIES.canRejectPendingContactRequests
+            ? 'reject pending requests'
+            : null,
+    ].filter(Boolean).join(', ');
+    const hint = `This host can inspect the card, but Canon admission actions are missing here. Missing capabilities: ${missingCapabilities}. Use another Canon surface for userId ${card.userId}.`;
     return `${identity}\n${hint}`;
 }
 function describeAttachment(attachment, materialized) {
@@ -117,6 +137,70 @@ export async function publishHostAgentRuntime(agentId, clientType, runtime) {
         updatedAt: { '.sv': 'timestamp' },
     });
 }
+export async function publishHostSessionSnapshots(input) {
+    if (input.conversationIds.length === 0) {
+        return;
+    }
+    await Promise.all(input.conversationIds.map(async (conversationId) => {
+        const persistedConfig = await loadHostSessionConfig({
+            conversationId,
+            agentId: input.agentId,
+            extraStringFields: ['permissionMode', 'effort'],
+        });
+        const liveConfig = input.liveSessionConfigByConversation?.get(conversationId) ?? null;
+        const mergedConfig = {
+            ...(persistedConfig ?? {}),
+            ...(liveConfig ?? {}),
+        };
+        const snapshot = buildAgentSessionSnapshot({
+            conversationId,
+            agentId: input.agentId,
+            runtime: {
+                ...input.runtime,
+                clientType: input.clientType,
+                hostMode: true,
+            },
+            sessionConfig: {
+                ...(mergedConfig.model ? { model: mergedConfig.model } : {}),
+                ...(mergedConfig.permissionMode ? { permissionMode: mergedConfig.permissionMode } : {}),
+                ...(mergedConfig.effort ? { effort: mergedConfig.effort } : {}),
+                ...(mergedConfig.runtimeControlValues
+                    ? { runtimeControlValues: mergedConfig.runtimeControlValues }
+                    : {}),
+                ...(mergedConfig.workspaceId ? { workspaceId: mergedConfig.workspaceId } : {}),
+                ...(mergedConfig.executionMode ? { executionMode: mergedConfig.executionMode } : {}),
+            },
+            lastHeartbeatAt: undefined,
+        });
+        let executionBranch = liveConfig?.executionBranch ?? null;
+        if (!executionBranch && snapshot.executionMode === 'worktree' && snapshot.workspaceId) {
+            const workspace = input.workspaceOptions.find((option) => option.id === snapshot.workspaceId);
+            if (workspace) {
+                executionBranch = buildConversationWorktreeSpec({
+                    agentId: input.agentId,
+                    conversationId,
+                    workspaceCwd: workspace.cwd,
+                }).branch;
+            }
+        }
+        return patchAgentSessionSnapshot(conversationId, input.agentId, {
+            clientType: input.clientType,
+            hostMode: true,
+            model: snapshot.model ?? null,
+            permissionMode: snapshot.permissionMode ?? null,
+            effort: snapshot.effort ?? null,
+            runtimeControlValues: snapshot.runtimeControlValues ?? null,
+            workspaceId: snapshot.workspaceId ?? null,
+            executionMode: snapshot.executionMode ?? null,
+            executionBranch,
+            modelOptions: snapshot.modelOptions,
+            permissionModeOptions: snapshot.permissionModeOptions,
+            workspaceOptions: snapshot.workspaceOptions,
+            availableExecutionModes: snapshot.availableExecutionModes,
+            lastHeartbeatAt: { '.sv': 'timestamp' },
+        });
+    }));
+}
 export function readHostSessionConfig(raw, extraStringFields = []) {
     const baseConfig = readSessionWorkspaceConfig(raw);
     if (!raw || typeof raw !== 'object') {
@@ -127,9 +211,16 @@ export function readHostSessionConfig(raw, extraStringFields = []) {
         const value = normalizeOptionalString(data[field]);
         return value ? [[field, value]] : [];
     }));
+    const runtimeControlValues = Object.fromEntries(Object.entries(data.runtimeControlValues && typeof data.runtimeControlValues === 'object'
+        ? data.runtimeControlValues
+        : {}).flatMap(([key, value]) => {
+        const normalizedValue = normalizeOptionalString(value);
+        return normalizedValue ? [[key, normalizedValue]] : [];
+    }));
     return {
         ...(baseConfig ?? {}),
         ...extraConfig,
+        ...(Object.keys(runtimeControlValues).length > 0 ? { runtimeControlValues } : {}),
     };
 }
 export async function loadHostSessionConfig(input) {

package/dist/host.js

@@ -24,16 +24,97 @@ import { parseArgs } from 'node:util';
 import { randomUUID } from 'node:crypto';
 import { execFileSync } from 'node:child_process';
 import { existsSync } from 'node:fs';
-import { query } from '@anthropic-ai/claude-agent-sdk';
+import { query, } from '@anthropic-ai/claude-agent-sdk';
 import { isAnthropicImageAttachment, materializeMessageMedia, toAnthropicImageBlock, } from '@canonmsg/agent-sdk';
-import { CLAUDE_PERMISSION_MODE_OPTIONS, buildConfiguredWorkspaceOptions, buildConversationEnvironmentKey, buildPublicWorkspaceOptions, EXECUTION_ENVIRONMENT_MODES, CanonClient, CanonStream, clearTurnState, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, ExecutionEnvironmentError, FINAL_MESSAGE_HANDOFF_MS, normalizeTurnMetadata, prepareConversationEnvironment, resolveCanonAgent, getActiveProfile, releaseLock, initRTDBAuth, rtdbRead, rtdbWrite, writeSessionState, clearSessionState, writeTurnState, releaseConversationEnvironment, } from '@canonmsg/core';
-import { buildCanonHostPrompt, buildHydratedInboundContext, createConversationMetadataLoader, loadHostSessionConfig, publishHostAgentRuntime, renderCanonHostInboundContent, resolveHostWorkspaceCwd, } from './host-runtime.js';
+import { CLAUDE_PERMISSION_MODE_OPTIONS, buildConfiguredWorkspaceOptions, buildConversationEnvironmentKey, buildPlanApprovalRequest, buildQuestionRequest, buildPublicWorkspaceOptions, EXECUTION_ENVIRONMENT_MODES, CanonClient, CanonStream, clearTurnState, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, ExecutionEnvironmentError, FINAL_MESSAGE_HANDOFF_MS, normalizeTurnMetadata, prepareConversationEnvironment, resolveCanonAgent, getActiveProfile, releaseLock, initRTDBAuth, rtdbRead, rtdbWrite, writeRuntimeInfo, writeSessionState, clearSessionState, writeTurnState, releaseConversationEnvironment, } from '@canonmsg/core';
+import { buildCanonHostPrompt, buildHydratedInboundContext, createConversationMetadataLoader, loadHostSessionConfig, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, resolveHostWorkspaceCwd, } from './host-runtime.js';
 import { buildInboundContextLines, decideAutoReply, } from './inbound-policy.js';
 import { createStreamingBuffer } from './streaming-buffer.js';
 import { runCli } from './cli-entry.js';
 let workingDir = process.cwd();
 let workspaceOptions = [];
 let runtimeModels = [];
+const CLAUDE_METADATA_TTL_MS = 5 * 60 * 1000;
+let runtimeMetadata = {
+    account: null,
+    mcpServers: [],
+    plugins: [],
+    loadedAt: 0,
+};
+let runtimeMetadataRefresh = null;
+function buildClaudeRuntimeDescriptor(input) {
+    return {
+        coreControls: [
+            {
+                id: 'model',
+                label: 'Model',
+                options: input.models,
+                defaultValue: input.models[0]?.value ?? null,
+                availability: 'setup_and_live',
+                liveBehavior: 'immediate',
+                selectionPolicy: 'inherit',
+            },
+            {
+                id: 'workspace',
+                label: 'Workspace',
+                options: input.workspaces.map((workspace) => ({
+                    value: workspace.id,
+                    label: workspace.label,
+                })),
+                defaultValue: input.workspaces[0]?.id ?? null,
+                availability: 'setup',
+                liveBehavior: 'none',
+                selectionPolicy: 'inherit',
+            },
+            {
+                id: 'executionMode',
+                label: 'Execution mode',
+                options: input.executionModes.map((mode) => ({
+                    value: mode,
+                    label: mode === 'worktree' ? 'Isolated worktree' : 'Use shared workspace',
+                    description: mode === 'worktree'
+                        ? 'Creates or reuses a per-conversation git worktree under ~/.canon/conversation-worktrees when the selected workspace is a git repo.'
+                        : 'Runs directly in the selected workspace. Canon records usage, but does not create a separate checkout.',
+                })),
+                defaultValue: null,
+                availability: 'setup',
+                liveBehavior: 'none',
+                selectionPolicy: 'required_explicit',
+            },
+        ],
+        runtimeControls: [
+            {
+                id: 'permissionMode',
+                label: 'Permission mode',
+                options: [...CLAUDE_PERMISSION_MODE_OPTIONS],
+                defaultValue: 'default',
+                availability: 'setup_and_live',
+                liveBehavior: 'immediate',
+                selectionPolicy: 'inherit',
+            },
+            {
+                id: 'effort',
+                label: 'Thinking level',
+                options: [
+                    { value: 'low', label: 'Low' },
+                    { value: 'medium', label: 'Medium' },
+                    { value: 'high', label: 'High' },
+                ],
+                defaultValue: 'medium',
+                availability: 'setup_and_live',
+                liveBehavior: 'immediate',
+                selectionPolicy: 'inherit',
+            },
+        ],
+        supportsInterrupt: true,
+        streamingTextMode: 'delta',
+    };
+}
+function normalizeClaudeEffortLevel(value) {
+    return value === 'low' || value === 'medium' || value === 'high'
+        ? value
+        : undefined;
+}
 let cachedClaudeCliPath;
 // The SDK bundles a Bun-compiled `claude` Mach-O binary next to
 // claude-agent-sdk-darwin-arm64. On some macOS setups that exact binary gets
@@ -83,11 +164,12 @@ async function loadSessionConfig(conversationId, agentId) {
     const config = await loadHostSessionConfig({
         conversationId,
         agentId,
-        extraStringFields: ['permissionMode'],
+        extraStringFields: ['permissionMode', 'effort'],
     });
     return {
         ...config,
         permissionMode: config?.permissionMode,
+        effort: normalizeClaudeEffortLevel(config?.effort),
     };
 }
 // Default to 'locked' (shared workspace) when no mode has been picked. The
@@ -103,6 +185,14 @@ function resolveWorkspaceCwd(config) {
         defaultCwd: workingDir,
     });
 }
+function resolveExecutionFallbackReason(environment) {
+    if (!environment?.reason || environment.mode !== 'locked') {
+        return null;
+    }
+    return environment.reason === 'Sharing the base workspace (locked mode)'
+        ? null
+        : environment.reason;
+}
 async function detectRuntimeModels(cwd) {
     const emptyPrompt = {
         async *[Symbol.asyncIterator]() { },
@@ -130,6 +220,166 @@ async function detectRuntimeModels(cwd) {
         catch { }
     }
 }
+async function inspectClaudeRuntimeMetadata(cwd, activeQuery) {
+    const emptyPrompt = {
+        async *[Symbol.asyncIterator]() { },
+    };
+    const claudeCliPath = resolveClaudeCliPath();
+    const probe = activeQuery ?? query({
+        prompt: emptyPrompt,
+        options: {
+            systemPrompt: { type: 'preset', preset: 'claude_code' },
+            tools: { type: 'preset', preset: 'claude_code' },
+            permissionMode: 'default',
+            cwd,
+            settings: { forceLoginMethod: 'claudeai' },
+            ...(claudeCliPath ? { pathToClaudeCodeExecutable: claudeCliPath } : {}),
+        },
+    });
+    try {
+        const [init, mcpServers, pluginInfo] = await Promise.all([
+            probe.initializationResult(),
+            probe.mcpServerStatus().catch(() => []),
+            probe.reloadPlugins().catch(() => null),
+        ]);
+        return {
+            account: init.account ?? null,
+            mcpServers: pluginInfo?.mcpServers ?? mcpServers,
+            plugins: pluginInfo?.plugins ?? [],
+            loadedAt: Date.now(),
+        };
+    }
+    finally {
+        if (!activeQuery) {
+            try {
+                probe.close();
+            }
+            catch { }
+        }
+    }
+}
+async function refreshClaudeRuntimeMetadata(input) {
+    if (!input.force
+        && runtimeMetadata.loadedAt > 0
+        && Date.now() - runtimeMetadata.loadedAt < CLAUDE_METADATA_TTL_MS) {
+        return runtimeMetadata;
+    }
+    if (runtimeMetadataRefresh) {
+        return runtimeMetadataRefresh;
+    }
+    runtimeMetadataRefresh = inspectClaudeRuntimeMetadata(input.cwd, input.activeQuery ?? null)
+        .then((metadata) => {
+        runtimeMetadata = metadata;
+        return metadata;
+    })
+        .finally(() => {
+        runtimeMetadataRefresh = null;
+    });
+    return runtimeMetadataRefresh;
+}
+function mapClaudeMcpStatus(status) {
+    switch (status) {
+        case 'connected':
+            return 'ready';
+        case 'needs-auth':
+            return 'auth_needed';
+        case 'disabled':
+            return 'configured';
+        case 'failed':
+            return 'error';
+        default:
+            return 'unknown';
+    }
+}
+function buildClaudeRuntimeInfo(input) {
+    const { descriptor, metadata } = input;
+    const statusItems = [
+        metadata.account?.email
+            ? {
+                id: 'account',
+                label: 'Account',
+                value: metadata.account.email,
+                tone: 'success',
+            }
+            : null,
+        metadata.account?.subscriptionType
+            ? {
+                id: 'subscription',
+                label: 'Plan',
+                value: metadata.account.subscriptionType,
+            }
+            : null,
+        metadata.account?.apiProvider
+            ? {
+                id: 'provider',
+                label: 'Provider',
+                value: metadata.account.apiProvider,
+            }
+            : null,
+        metadata.account?.tokenSource || metadata.account?.apiKeySource
+            ? {
+                id: 'auth',
+                label: 'Auth',
+                value: metadata.account.tokenSource ?? metadata.account?.apiKeySource ?? 'connected',
+            }
+            : null,
+        runtimeModels[0]
+            ? {
+                id: 'fallbackModel',
+                label: 'Fallback model',
+                value: runtimeModels[0].label,
+            }
+            : null,
+        {
+            id: 'toolPolicy',
+            label: 'Tool policy',
+            value: 'Claude Code preset',
+        },
+        {
+            id: 'browser',
+            label: 'Browser tools',
+            value: 'Runtime policy',
+        },
+    ].filter((item) => Boolean(item));
+    return {
+        descriptor,
+        surfaceMode: 'host',
+        statusItems,
+        inventories: [
+            {
+                id: 'mcp',
+                label: 'MCP',
+                entries: metadata.mcpServers.map((server) => ({
+                    id: server.name,
+                    label: server.name,
+                    status: mapClaudeMcpStatus(server.status),
+                    description: server.error
+                        ?? server.serverInfo?.version
+                        ?? server.scope
+                        ?? undefined,
+                })),
+            },
+            {
+                id: 'plugins',
+                label: 'Plugins',
+                entries: metadata.plugins.map((plugin) => ({
+                    id: plugin.name,
+                    label: plugin.name,
+                    status: 'configured',
+                    description: plugin.source ?? plugin.path,
+                })),
+            },
+        ],
+        execution: {
+            resolvedWorkspaceLabel: input.workspaceLabel,
+            resolvedCwd: input.resolvedCwd,
+            executionMode: input.executionMode,
+            executionBranch: input.executionBranch,
+            worktreePath: input.worktreePath,
+            fallbackReason: input.fallbackReason,
+        },
+    };
+}
 // ── Constants ───────────────────────────────────────────────────────
 const MAX_SESSIONS = 5;
 const IDLE_TIMEOUT_MS = 30 * 60 * 1000; // 30 minutes
@@ -222,7 +472,7 @@ function createSession(conversationId, environment, agentId, client, onSessionEn
     // eslint-disable-next-line prefer-const -- session must be declared before queryOptions but assigned after query()
     let session;
     const REPLY_TIMEOUT_MS = 10 * 60 * 1000; // 10 minutes
-    function waitForReply() {
+    function waitForReply(type, requestId) {
         // Keep session alive while waiting for user input
         session.lastActivity = Date.now();
         return new Promise((resolve, reject) => {
@@ -231,6 +481,8 @@ function createSession(conversationId, environment, agentId, client, onSessionEn
                 reject(new Error('Timed out waiting for user reply'));
             }, REPLY_TIMEOUT_MS);
             session.pendingReply = {
+                type,
+                requestId,
                 resolve: (metadata) => {
                     clearTimeout(timer);
                     resolve(metadata);
@@ -260,17 +512,16 @@ function createSession(conversationId, environment, agentId, client, onSessionEn
                 try {
                     const questionId = randomUUID();
                     const questions = input.questions ?? [];
-                    await client.sendMessage(conversationId, '', {
+                    const questionCard = buildQuestionRequest(questionId, questions);
+                    await client.sendMessage(conversationId, questionCard.text, {
                         metadata: {
-                            type: 'claude_question',
-                            questionId,
-                            questions,
+                            ...questionCard.metadata,
                             turnSemantics: 'control',
                             replyBehavior: 'suppress_auto_reply',
                         },
                     });
                     console.error(`[canon-host] [${conversationId.slice(0, 8)}] Question sent (${questionId.slice(0, 8)})`);
-                    const reply = await waitForReply();
+                    const reply = await waitForReply('question_reply', questionId);
                     return {
                         behavior: 'allow',
                         updatedInput: { ...input, answers: reply.answers },
@@ -283,16 +534,16 @@ function createSession(conversationId, environment, agentId, client, onSessionEn
             if (toolName === 'ExitPlanMode') {
                 try {
                     const planId = randomUUID();
-                    await client.sendMessage(conversationId, 'Plan ready for review.', {
+                    const planApproval = buildPlanApprovalRequest(planId);
+                    await client.sendMessage(conversationId, planApproval.text, {
                         metadata: {
-                            type: 'plan_approval',
-                            planId,
+                            ...planApproval.metadata,
                             turnSemantics: 'control',
                             replyBehavior: 'suppress_auto_reply',
                         },
                     });
                     console.error(`[canon-host] [${conversationId.slice(0, 8)}] Plan approval sent (${planId.slice(0, 8)})`);
-                    const reply = await waitForReply();
+                    const reply = await waitForReply('plan_approval_reply', planId);
                     if (reply.decision === 'approve') {
                         return { behavior: 'allow' };
                     }
@@ -467,6 +718,7 @@ function createSession(conversationId, environment, agentId, client, onSessionEn
             cwd,
             executionMode: session.environment.mode,
             ...(session.environment.branch ? { executionBranch: session.environment.branch } : {}),
+            ...(session.environment.worktreePath ? { worktreePath: session.environment.worktreePath } : {}),
             hostMode: true,
             isActive: true,
         }).catch(() => { });
@@ -667,6 +919,15 @@ function createSession(conversationId, environment, agentId, client, onSessionEn
                 console.error(`[canon-host] [${conversationId.slice(0, 8)}] Failed to set initial model:`, err);
             }
         }
+        if (config.effort) {
+            try {
+                await q.applyFlagSettings({ effortLevel: config.effort });
+                session.state.effort = config.effort;
+            }
+            catch (err) {
+                console.error(`[canon-host] [${conversationId.slice(0, 8)}] Failed to set initial effort:`, err);
+            }
+        }
         if (!resumeSessionId) {
             // New session — send seed message to activate streaming input mode
             sendInput({
@@ -698,6 +959,7 @@ function createSession(conversationId, environment, agentId, client, onSessionEn
                 cwd,
                 executionMode: session.environment.mode,
                 ...(session.environment.branch ? { executionBranch: session.environment.branch } : {}),
+                ...(session.environment.worktreePath ? { worktreePath: session.environment.worktreePath } : {}),
                 hostMode: true,
                 isActive: true,
             }).catch(() => { });
@@ -758,13 +1020,80 @@ export async function main() {
         availablePermissionModes: [...CLAUDE_PERMISSION_MODE_OPTIONS],
         availableWorkspaces: buildPublicWorkspaceOptions(workspaceOptions),
         availableExecutionModes: hostAvailableExecutionModes,
+        runtimeDescriptor: buildClaudeRuntimeDescriptor({
+            models: runtimeModels,
+            workspaces: buildPublicWorkspaceOptions(workspaceOptions),
+            executionModes: hostAvailableExecutionModes,
+        }),
     };
+    const conversationCache = new Map();
+    const knownConversationIds = new Set();
+    let lastKnownConversationRefreshAt = 0;
     const publishRuntimeHeartbeat = async () => {
         if (!streamConnected)
             return;
+        await refreshKnownConversationIds().catch((error) => {
+            console.error('[canon-host] Failed to refresh known conversations:', error);
+        });
+        const activeSessionQuery = sessions.values().next().value?.query ?? null;
+        const metadata = await refreshClaudeRuntimeMetadata({
+            cwd: workingDir,
+            activeQuery: activeSessionQuery,
+        }).catch((error) => {
+            console.error('[canon-host] Failed to refresh Claude runtime metadata:', error);
+            return runtimeMetadata;
+        });
         await publishAgentRuntime(agentId, runtimeDescriptor).catch((error) => {
             console.error('[canon-host] Failed to publish agent runtime:', error);
         });
+        await publishHostSessionSnapshots({
+            conversationIds: Array.from(knownConversationIds),
+            agentId,
+            clientType: 'claude-code',
+            runtime: runtimeDescriptor,
+            workspaceOptions,
+            defaultCwd: workingDir,
+            liveSessionConfigByConversation: new Map(Array.from(sessions.values()).map((session) => {
+                const workspaceId = resolveWorkspaceIdForBaseCwd(session.environment.baseCwd);
+                return [
+                    session.conversationId,
+                    {
+                        ...(session.state.model ? { model: session.state.model } : {}),
+                        ...(session.state.permissionMode ? { permissionMode: session.state.permissionMode } : {}),
+                        ...(session.state.effort ? { effort: session.state.effort } : {}),
+                        ...(workspaceId ? { workspaceId } : {}),
+                        executionMode: session.environment.mode,
+                        executionBranch: session.environment.branch ?? null,
+                    },
+                ];
+            })),
+        }).catch((error) => {
+            console.error('[canon-host] Failed to publish session snapshots:', error);
+        });
+        await Promise.all(Array.from(knownConversationIds).map(async (conversationId) => {
+            const session = sessions.get(conversationId);
+            const workspaceId = session
+                ? resolveWorkspaceIdForBaseCwd(session.environment.baseCwd)
+                : runtimeDescriptor.defaultWorkspaceId;
+            const workspace = workspaceOptions.find((option) => option.id === workspaceId) ?? null;
+            const payload = buildClaudeRuntimeInfo({
+                descriptor: runtimeDescriptor.runtimeDescriptor ?? buildClaudeRuntimeDescriptor({
+                    models: runtimeModels,
+                    workspaces: buildPublicWorkspaceOptions(workspaceOptions),
+                    executionModes: hostAvailableExecutionModes,
+                }),
+                metadata,
+                workspaceLabel: workspace?.label ?? workspaceId ?? null,
+                resolvedCwd: session?.cwd ?? workspace?.cwd ?? workingDir,
+                executionMode: session?.environment.mode ?? null,
+                executionBranch: session?.environment.branch ?? null,
+                worktreePath: session?.environment.worktreePath ?? null,
+                fallbackReason: resolveExecutionFallbackReason(session?.environment),
+            });
+            await writeRuntimeInfo(conversationId, agentId, payload);
+        })).catch((error) => {
+            console.error('[canon-host] Failed to publish runtime info:', error);
+        });
     };
     // ── Load conversations (informational — sessions created on demand) ──
     try {
@@ -777,6 +1106,11 @@ export async function main() {
             availableModels: runtimeModels,
             availableWorkspaces: buildPublicWorkspaceOptions(workspaceOptions),
             availableExecutionModes: hostAvailableExecutionModes,
+            runtimeDescriptor: buildClaudeRuntimeDescriptor({
+                models: runtimeModels,
+                workspaces: buildPublicWorkspaceOptions(workspaceOptions),
+                executionModes: hostAvailableExecutionModes,
+            }),
         };
     }
     catch {
@@ -786,10 +1120,20 @@ export async function main() {
             availablePermissionModes: [...CLAUDE_PERMISSION_MODE_OPTIONS],
             availableWorkspaces: buildPublicWorkspaceOptions(workspaceOptions),
             availableExecutionModes: hostAvailableExecutionModes,
+            runtimeDescriptor: buildClaudeRuntimeDescriptor({
+                models: runtimeModels,
+                workspaces: buildPublicWorkspaceOptions(workspaceOptions),
+                executionModes: hostAvailableExecutionModes,
+            }),
         };
     }
     try {
         const convos = await client.getConversations();
+        lastKnownConversationRefreshAt = Date.now();
+        for (const conversation of convos) {
+            knownConversationIds.add(conversation.id);
+            conversationCache.set(conversation.id, conversation);
+        }
         console.error(`[canon-host] ${convos.length} conversations`);
     }
     catch {
@@ -800,11 +1144,25 @@ export async function main() {
     const pendingSessionCreations = new Map();
     /** Saved SDK session IDs for resume after idle eviction, keyed by conversation + workspace */
     const savedSessionIds = new Map();
-    const conversationCache = new Map();
     const { getConversationMeta } = createConversationMetadataLoader({
         client,
         conversationCache,
     });
+    function resolveWorkspaceIdForBaseCwd(baseCwd) {
+        return workspaceOptions.find((option) => option.cwd === baseCwd)?.id;
+    }
+    async function refreshKnownConversationIds(force = false) {
+        if (!force && Date.now() - lastKnownConversationRefreshAt < HEARTBEAT_MS) {
+            return;
+        }
+        const conversations = await client.getConversations();
+        knownConversationIds.clear();
+        for (const conversation of conversations) {
+            knownConversationIds.add(conversation.id);
+            conversationCache.set(conversation.id, conversation);
+        }
+        lastKnownConversationRefreshAt = Date.now();
+    }
     async function loadHydratedInboundContext(input) {
         const [conversation, page] = await Promise.all([
             getConversationMeta(input.conversationId),
@@ -865,6 +1223,7 @@ export async function main() {
         }
     }
     async function getOrCreateSession(conversationId) {
+        knownConversationIds.add(conversationId);
         const existing = sessions.get(conversationId);
         if (existing && !existing.closed) {
             existing.lastActivity = Date.now();
@@ -908,6 +1267,7 @@ export async function main() {
                 }, {
                     model: config?.model ?? runtimeModels[0]?.value,
                     permissionMode: config?.permissionMode ?? 'default',
+                    effort: config?.effort,
                     availableModels: runtimeModels,
                     availableExecutionModes: hostAvailableExecutionModes,
                 }, resumeId);
@@ -937,15 +1297,33 @@ export async function main() {
                 if (m.senderId === agentId)
                     return;
                 const convoId = payload.conversationId;
+                knownConversationIds.add(convoId);
                 // Check for metadata replies (question answers, plan approvals)
                 if (m.metadata?.type === 'question_reply' || m.metadata?.type === 'plan_approval_reply') {
                     const existingSession = sessions.get(convoId);
+                    const pendingReply = existingSession?.pendingReply;
+                    const isOwnerReply = m.isOwner ?? (ownerId != null && m.senderId === ownerId);
+                    const replyRequestId = m.metadata.type === 'question_reply'
+                        ? m.metadata.questionId
+                        : m.metadata.planId;
+                    if (!pendingReply) {
+                        console.error(`[canon-host] [${convoId.slice(0, 8)}] Ignoring stale ${m.metadata.type} with no pending request`);
+                        return;
+                    }
+                    if (!isOwnerReply) {
+                        console.error(`[canon-host] [${convoId.slice(0, 8)}] Ignoring ${m.metadata.type} from non-owner ${m.senderId}`);
+                        return;
+                    }
+                    if (pendingReply.type !== m.metadata.type || pendingReply.requestId !== replyRequestId) {
+                        console.error(`[canon-host] [${convoId.slice(0, 8)}] Ignoring mismatched ${m.metadata.type} (${String(replyRequestId ?? 'missing-id')})`);
+                        return;
+                    }
                     if (existingSession?.pendingReply) {
                         const { resolve } = existingSession.pendingReply;
                         existingSession.pendingReply = null;
                         existingSession.lastActivity = Date.now();
                         resolve(m.metadata);
-                        console.error(`[canon-host] [${convoId.slice(0, 8)}] Reply received (${m.metadata.type})`);
+                        console.error(`[canon-host] [${convoId.slice(0, 8)}] Reply received (${m.metadata.type}:${pendingReply.requestId.slice(0, 8)})`);
                         return;
                     }
                 }
@@ -1071,12 +1449,16 @@ export async function main() {
                                         console.error(`[canon-host] [${convoId.slice(0, 8)}] Failed to set mode:`, err);
                                     }
                                 }
-                                if (ctrl.effort && ctrl.effort !== session.state.effort) {
-                                    session.state.effort = ctrl.effort;
-                                    session.query.applyFlagSettings({
-                                        effortLevel: ctrl.effort,
-                                    }).catch((err) => console.error(`[canon-host] [${convoId.slice(0, 8)}] Failed to set effort:`, err));
-                                    console.error(`[canon-host] [${convoId.slice(0, 8)}] Effort → ${ctrl.effort}`);
+                                const nextEffort = normalizeClaudeEffortLevel(ctrl.effort);
+                                if (nextEffort && nextEffort !== session.state.effort) {
+                                    try {
+                                        await session.query.applyFlagSettings({ effortLevel: nextEffort });
+                                        session.state.effort = nextEffort;
+                                        console.error(`[canon-host] [${convoId.slice(0, 8)}] Effort → ${nextEffort}`);
+                                    }
+                                    catch (err) {
+                                        console.error(`[canon-host] [${convoId.slice(0, 8)}] Failed to set effort:`, err);
+                                    }
                                 }
                                 writeSessionState(convoId, agentId, {
                                     ...session.state,
@@ -1084,6 +1466,7 @@ export async function main() {
                                     cwd: session.cwd,
                                     executionMode: session.environment.mode,
                                     ...(session.environment.branch ? { executionBranch: session.environment.branch } : {}),
+                                    ...(session.environment.worktreePath ? { worktreePath: session.environment.worktreePath } : {}),
                                     hostMode: true,
                                     isActive: true,
                                 }).catch(() => { });
@@ -1145,6 +1528,7 @@ export async function main() {
                 cwd: session.cwd,
                 executionMode: session.environment.mode,
                 ...(session.environment.branch ? { executionBranch: session.environment.branch } : {}),
+                ...(session.environment.worktreePath ? { worktreePath: session.environment.worktreePath } : {}),
                 hostMode: true,
                 isActive: true,
             }).catch(() => { });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.9.5",
+  "version": "0.10.0",
   "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.8.2",
-    "@canonmsg/core": "^0.7.4",
+    "@canonmsg/agent-sdk": "^0.9.0",
+    "@canonmsg/core": "^0.8.0",
     "@modelcontextprotocol/sdk": "^1.12.0"
   },
   "engines": {