@canonmsg/claude-code-plugin 0.19.6 → 0.20.0

package/dist/mcp-args.d.ts

@@ -1,4 +1,4 @@
-import type { DirectSessionSelection, SendContextualMessageOptions } from '@canonmsg/core';
+import type { DirectSessionSelection, SendContextualMessageOptions } from '@canonmsg/core/contract';
 export type McpParseResult<T> = {
     ok: true;
     value: T;

package/dist/register.js

@@ -9,10 +9,47 @@ import { setDefaultResultOrder } from 'node:dns';
  *
  * On approval, saves the agent to ~/.canon/agents.json under the profile name.
  */
-import { ackRegistrationApproval, clearPendingRegistration, getOrCreatePendingRegistration, registerAndWaitForApproval, updatePendingRegistration, upsertAgentProfile, AGENTS_PATH, } from '@canonmsg/core';
+import { ackRegistrationApprovalWith, resolveCanonBaseUrl, runRegistrationFlow, } from '@canonmsg/core/contract';
+import { clearPendingRegistration, getOrCreatePendingRegistration, updatePendingRegistration, upsertAgentProfile, AGENTS_PATH, } from '@canonmsg/core/local';
+import { resolvePackagedBridgeBin } from './bridge-bin.js';
+import { connectBridge } from '@canonmsg/framework';
 import { readFileSync } from 'node:fs';
 import { parseArgs } from 'node:util';
 import { runCli } from './cli-entry.js';
+/**
+ * Registration rides the bridge (Phase 6, same shape as the Hermes port): a
+ * short-lived PRE-IDENTITY registration daemon (offline stub +
+ * CANON_BRIDGE_REGISTRATION_BASE_URL, managed-child so it dies with this
+ * process) serves the three unauthenticated §B10 routes over JSON-RPC.
+ */
+async function openRegistrationBridge(baseUrl) {
+    return connectBridge({
+        profile: 'registration',
+        mode: 'managed-child',
+        ...(resolvePackagedBridgeBin() ? { binPath: resolvePackagedBridgeBin() } : {}),
+        env: {
+            ...process.env,
+            CANON_BRIDGE_AGENT_ID: 'canon-registration',
+            CANON_BRIDGE_REGISTRATION_BASE_URL: baseUrl,
+        },
+        hello: { clientType: 'claude-code', wantFamilies: [] },
+    });
+}
+function bridgeRegistrationTransport(bridge) {
+    return {
+        register: (_baseUrl, body) => bridge.client.call('register', body),
+        checkStatus: (_baseUrl, requestId, pollToken) => bridge.client.call('getRegistrationStatus', {
+            requestId,
+            ...(pollToken ? { pollToken } : {}),
+        }),
+        ackRegistrationStatus: async (_baseUrl, requestId, pollToken) => {
+            await bridge.client.call('ackRegistrationStatus', {
+                requestId,
+                ...(pollToken ? { pollToken } : {}),
+            });
+        },
+    };
+}
 const HELP = `canon-register — register or reconnect a Claude Code agent in Canon
 
 USAGE
@@ -62,29 +99,39 @@ export async function main() {
     }
     console.log(`Registering agent "${values.name}" (profile: ${profileName})...`);
     const pending = getOrCreatePendingRegistration(profileName, 'claude-code');
-    const result = await registerAndWaitForApproval({
-        name: values.name,
-        description: values.description,
-        ownerPhone: values.phone,
-        developerInfo: 'Claude Code plugin',
-        clientType: 'claude-code',
-        baseUrl: values['base-url'],
-        requestedAgentId: existingAgentId,
-        localRegistrationId: pending.localRegistrationId,
-    }, {
-        onSubmitted: (requestId, pollToken) => {
-            updatePendingRegistration(profileName, {
-                requestId,
-                pollToken,
-                clientType: 'claude-code',
-            });
-            console.log(`Registration submitted (request ID: ${requestId}).`);
-            console.log('Waiting for approval in Canon app...');
-        },
-        onPollUpdate: () => {
-            process.stdout.write('.');
-        },
-    });
+    const baseUrl = resolveCanonBaseUrl(values['base-url']);
+    const bridge = await openRegistrationBridge(baseUrl);
+    const transport = bridgeRegistrationTransport(bridge);
+    let result;
+    try {
+        result = await runRegistrationFlow({
+            name: values.name,
+            description: values.description,
+            ownerPhone: values.phone,
+            developerInfo: 'Claude Code plugin',
+            clientType: 'claude-code',
+            baseUrl: values['base-url'],
+            requestedAgentId: existingAgentId,
+            localRegistrationId: pending.localRegistrationId,
+        }, transport, {
+            onSubmitted: (requestId, pollToken) => {
+                updatePendingRegistration(profileName, {
+                    requestId,
+                    pollToken,
+                    clientType: 'claude-code',
+                });
+                console.log(`Registration submitted (request ID: ${requestId}).`);
+                console.log('Waiting for approval in Canon app...');
+            },
+            onPollUpdate: () => {
+                process.stdout.write('.');
+            },
+        });
+    }
+    catch (error) {
+        bridge.client.close();
+        throw error;
+    }
     console.log(''); // newline after dots
     switch (result.status) {
         case 'approved': {
@@ -101,7 +148,7 @@ export async function main() {
                 ...(typeof values['base-url'] === 'string' ? { baseUrl: values['base-url'] } : {}),
             });
             if (result.requestId) {
-                await ackRegistrationApproval(values['base-url'], result.requestId, result.pollToken);
+                await ackRegistrationApprovalWith(transport, values['base-url'], result.requestId, result.pollToken);
             }
             clearPendingRegistration(profileName);
             console.log(`Approved! Agent: ${result.agentName} (${result.agentId})`);
@@ -121,6 +168,7 @@ export async function main() {
             process.exit(1);
             break;
     }
+    bridge.client.close();
 }
 runCli(import.meta.url, main, (error) => {
     console.error('[canon-register] Fatal error:', error);

package/dist/server.js

@@ -10,7 +10,7 @@ import { setDefaultResultOrder } from 'node:dns';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { CallToolRequestSchema, ListToolsRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
-import { CanonClient, CanonStream, ApprovalManager, buildLocalRuntimeId, getActiveProfileLock, markLocalRuntimeStopped, loadProfiles, isProfileLocked, resolveCanonAgent, getActiveProfile, releaseLock, upsertLocalRuntimeEntry, initRTDBAuth, writeSessionState, clearSessionState, renderCanonHostInboundContent, } from '@canonmsg/core';
+import { CanonClient, CanonStream, ApprovalManager, buildLocalRuntimeId, markLocalRuntimeStopped, loadProfiles, isProfileLocked, resolveCanonAgent, releaseLock, upsertLocalRuntimeEntry, initRTDBAuth, renderCanonHostInboundContent, } from '@canonmsg/core';
 import { materializeMessageMedia, sendMediaFileMessage, } from '@canonmsg/agent-sdk';
 import { ApprovalHttpServer } from './approval-server.js';
 import { runCli } from './cli-entry.js';
@@ -34,6 +34,16 @@ const server = new Server({ name: 'canon-channel', version: '0.1.0' }, {
     },
 });
 let client = null;
+// Scoped RTDB handle for this channel server's single agent. Held alongside
+// the other per-process singletons (client, stream, ...) so both startChannel
+// and the shutdown handler in main() write session state as this agent — not
+// through any module-global default.
+let rtdb = null;
+// The one agent profile this server resolved+locked, and its lock handle.
+// Held here (not via a core module-global) so the list_agents tool handler and
+// the shutdown/error paths — all outside startChannel's scope — can read them.
+let activeProfile = null;
+let activeLockHandle = null;
 let stream = null;
 let agentContext = null;
 let approvalManager = null;
@@ -386,7 +396,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     profile: name,
                     agentName: p.agentName,
                     agentId: p.agentId,
-                    status: getActiveProfile() === name ? 'active (this session)' : lock.locked ? `in use (PID ${lock.pid})` : 'available',
+                    status: activeProfile === name ? 'active (this session)' : lock.locked ? `in use (PID ${lock.pid})` : 'available',
                 };
             });
             if (entries.length === 0) {
@@ -547,6 +557,8 @@ async function startChannel() {
         profile = resolved.profile;
         baseUrl = resolved.baseUrl;
         profileAgentName = resolved.agentName;
+        activeProfile = resolved.profile;
+        activeLockHandle = resolved.lockHandle ?? null;
     }
     catch (err) {
         console.error(err instanceof Error ? err.message : err);
@@ -577,7 +589,7 @@ async function startChannel() {
         }
     }
     // Initialize RTDB auth for session state reporting
-    initRTDBAuth(client);
+    rtdb = initRTDBAuth(client);
     const runtimeId = buildLocalRuntimeId({
         runtime: 'claude-code',
         profile,
@@ -612,7 +624,7 @@ async function startChannel() {
     // Write initial session state
     const initialState = { cwd: process.cwd(), isActive: true };
     for (const convoId of conversationCache.keys()) {
-        writeSessionState(convoId, agentId, initialState).catch((err) => console.error(`[canon] Failed to write initial state for ${convoId}:`, err));
+        rtdb.writeSessionState(convoId, agentId, initialState).catch((err) => console.error(`[canon] Failed to write initial state for ${convoId}:`, err));
     }
     // Start SSE stream
     stream = new CanonStream({
@@ -665,9 +677,10 @@ export async function main() {
     // Graceful shutdown — release agent lock and clear session state
     const shutdown = () => {
         // Mark all conversations as inactive
-        if (agentContext) {
+        if (agentContext && rtdb) {
+            const scopedRtdb = rtdb;
             for (const convoId of conversationCache.keys()) {
-                clearSessionState(convoId, agentContext.agentId).catch(() => { });
+                scopedRtdb.clearSessionState(convoId, agentContext.agentId).catch(() => { });
             }
         }
         approvalManager?.dispose();
@@ -675,15 +688,14 @@ export async function main() {
         stream?.stop();
         const runtimeId = buildLocalRuntimeId({
             runtime: 'claude-code',
-            profile: getActiveProfile(),
+            profile: activeProfile,
             cwd: process.cwd(),
             launchCommand: ['canon-channel-server'],
         });
         markLocalRuntimeStopped(runtimeId);
-        const ap = getActiveProfile();
-        if (ap)
-            releaseLock(ap);
-        getActiveProfileLock()?.release();
+        if (activeProfile)
+            releaseLock(activeProfile);
+        activeLockHandle?.release();
         process.exit(0);
     };
     process.on('SIGINT', shutdown);

package/dist/session-state.d.ts

@@ -1,6 +1,6 @@
 import type { SDKUserMessage } from '@anthropic-ai/claude-agent-sdk';
-import type { DeliveryIntent, ModelOption, TurnLifecycleState } from '@canonmsg/core';
-import type { TurnArtifactSnapshot } from '@canonmsg/coding-agent-host';
+import type { DeliveryIntent, ModelOption, TurnLifecycleState } from '@canonmsg/core/contract';
+import type { TurnArtifactSnapshot } from '@canonmsg/agent-host';
 export type ClaudeInputKind = 'seed' | 'canon';
 export type ClaudeArtifactRoutingMode = 'workspace-generated' | 'disabled';
 export interface ClaudeInputEnvelope {

package/dist/tool-policy.d.ts

@@ -1,4 +1,5 @@
-import type { ApprovalManager, ApprovalRequestCategory, ApprovalRequestDetail, ApprovalRisk, CanonUnifiedDiff } from '@canonmsg/core';
+import type { ApprovalRequestCategory, ApprovalRequestDetail, ApprovalRisk, CanonUnifiedDiff } from '@canonmsg/core/contract';
+import type { ApprovalManager } from '@canonmsg/core/host';
 export type ClaudeToolPolicyDecision = {
     behavior: 'allow';
 } | {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.19.6",
+  "version": "0.20.0",
   "description": "Canon channel plugin for Claude Code — messaging where AI agents are first-class citizens",
   "type": "module",
   "main": "dist/index.js",
@@ -23,17 +23,19 @@
     ".claude-plugin"
   ],
   "scripts": {
-    "prepare:workspace-deps": "node ../../scripts/run-workspace-prep.mjs ../core ../agent-sdk ../coding-agent-host",
+    "prepare:workspace-deps": "node ../../scripts/run-workspace-prep.mjs ../../packages/core ../../packages/agent-sdk ../../packages/framework ../../packages/bridge ../../packages/agent-host",
     "build": "npm run prepare:workspace-deps && node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\" && tsc",
     "dev": "npm run prepare:workspace-deps && tsc --watch",
     "prepack": "npm run build",
     "test": "vitest run"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.2.141",
-    "@canonmsg/agent-sdk": "^3.4.2",
-    "@canonmsg/coding-agent-host": "^0.2.2",
-    "@canonmsg/core": "^3.0.0",
+    "@anthropic-ai/claude-agent-sdk": "^0.3.200",
+    "@canonmsg/agent-host": "^0.3.0",
+    "@canonmsg/agent-sdk": "^3.4.3",
+    "@canonmsg/bridge": "^0.2.0",
+    "@canonmsg/core": "^3.1.0",
+    "@canonmsg/framework": "^0.2.0",
     "@modelcontextprotocol/sdk": "^1.29.0"
   },
   "engines": {
@@ -50,9 +52,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/HeyBobChan/canon",
-    "directory": "packages/claude-code-plugin"
+    "directory": "adapters/claude-code-plugin"
   },
-  "homepage": "https://github.com/HeyBobChan/canon/tree/main/packages/claude-code-plugin",
+  "homepage": "https://github.com/HeyBobChan/canon/tree/main/adapters/claude-code-plugin",
   "publishConfig": {
     "access": "public"
   },

package/dist/inbound-policy.d.ts

@@ -1,22 +0,0 @@
-import { type CanonGroupContext, type CanonGroupContextMode, type CanonConversation, type ResolvedAgentBehaviorPolicy } from '@canonmsg/core';
-export interface InboundParticipantContext {
-    conversationType: CanonConversation['type'] | 'unknown';
-    memberCount: number | null;
-    senderType: 'human' | 'ai_agent';
-    senderName: string;
-    isOwner: boolean;
-    mentionedAgent: boolean;
-    groupContext?: CanonGroupContext;
-    groupContextMode?: CanonGroupContextMode;
-    recentSenderTypes: Array<'human' | 'ai_agent'>;
-    recentHumanCount: number;
-    recentAgentCount: number;
-    consecutiveAgentTurns: number;
-    currentAgentStreakStartedByHuman: boolean;
-}
-export interface AutoReplyDecision {
-    allow: boolean;
-    reason: string;
-}
-export declare function buildInboundContextLines(context: InboundParticipantContext): string[];
-export declare function decideAutoReply(context: InboundParticipantContext, behavior?: ResolvedAgentBehaviorPolicy | null): AutoReplyDecision;

package/dist/inbound-policy.js

@@ -1,46 +0,0 @@
-import { buildCompactGroupContextLines, evaluateParticipationPolicy, resolveAgentBehaviorPolicy, } from '@canonmsg/core';
-function formatRecentSenders(senderTypes) {
-    if (senderTypes.length === 0)
-        return 'none';
-    return senderTypes.map((senderType) => (senderType === 'ai_agent' ? 'agent' : 'human')).join(' -> ');
-}
-export function buildInboundContextLines(context) {
-    const conversationTypeLabel = context.conversationType === 'unknown'
-        ? 'unknown'
-        : `${context.conversationType}${context.memberCount ? ` (${context.memberCount} members)` : ''}`;
-    const senderRole = context.isOwner
-        ? 'The latest sender is the verified human owner of this Canon agent.'
-        : context.senderType === 'ai_agent'
-            ? 'The latest sender is another AI agent in Canon.'
-            : 'The latest sender is a human Canon participant.';
-    return [
-        senderRole,
-        `Latest sender name: ${context.senderName}`,
-        `Latest sender type: ${context.senderType}`,
-        `Conversation type: ${conversationTypeLabel}`,
-        ...(context.groupContext && context.groupContextMode
-            ? buildCompactGroupContextLines(context.groupContext, context.groupContextMode)
-            : []),
-        `Directly addressed to this agent: ${context.mentionedAgent ? 'yes' : 'no'}`,
-        `Recent sender pattern: ${formatRecentSenders(context.recentSenderTypes)}`,
-        `Recent human messages: ${context.recentHumanCount}`,
-        `Recent agent messages: ${context.recentAgentCount}`,
-        `Consecutive recent agent turns: ${context.consecutiveAgentTurns}`,
-        `Current agent streak started after a human message: ${context.currentAgentStreakStartedByHuman ? 'yes' : 'no'}`,
-    ];
-}
-export function decideAutoReply(context, behavior) {
-    const decision = evaluateParticipationPolicy(behavior ?? resolveAgentBehaviorPolicy(), {
-        conversationType: context.conversationType,
-        senderType: context.senderType,
-        isOwner: context.isOwner,
-        mentionedAgent: context.mentionedAgent,
-        recentHumanCount: context.recentHumanCount,
-        consecutiveAgentTurns: context.consecutiveAgentTurns,
-        currentAgentStreakStartedByHuman: context.currentAgentStreakStartedByHuman,
-    });
-    return {
-        allow: decision.allow,
-        reason: decision.reason,
-    };
-}

package/dist/startup-recovery.d.ts

@@ -1,46 +0,0 @@
-/**
- * Startup recovery for inbound messages missed while the host was offline.
- *
- * The host persists a `lastInboundMessageId` cursor per conversation. On
- * startup we paginate `getMessagesPage` (newest-first pages, older pages via
- * its `before` message-id parameter) until the cursor is found or a hard
- * per-conversation bound is hit, then replay everything after the cursor.
- *
- * This module is intentionally identical in packages/claude-code-plugin and
- * packages/codex-plugin — keep both copies in sync (future consolidation
- * candidate).
- */
-export declare const STARTUP_RECOVERY_PAGE_SIZE = 25;
-export declare const STARTUP_RECOVERY_MAX_MESSAGES = 500;
-export interface StartupRecoveryMessage {
-    id: string;
-    senderId: string;
-    createdAt?: string;
-}
-export interface StartupRecoveryPage {
-    messages: StartupRecoveryMessage[];
-}
-export type StartupRecoveryMode = 
-/** Cursor found — `messages` is everything strictly after it. */
-'after-cursor'
-/** Cursor present but not found within the bound — `messages` is the bounded recent window. */
- | 'truncated-window'
-/**
- * No usable cursor (fresh runtime file, or the cursor message no longer
- * exists in history) — only the newest inbound message is recovered, since
- * a full-history replay could fire mass duplicate turns.
- */
- | 'latest-only';
-export interface StartupRecoveryResult<TPage extends StartupRecoveryPage> {
-    mode: StartupRecoveryMode;
-    /** Missed inbound messages (own messages excluded), oldest first. */
-    messages: TPage['messages'];
-    /** First page fetched — reusable as hydration context for recovered turns. */
-    newestPage: TPage;
-}
-export declare function collectMissedInboundMessages<TPage extends StartupRecoveryPage>(input: {
-    fetchPage: (before?: string) => Promise<TPage>;
-    cursor: string | null | undefined;
-    agentId: string;
-    maxMessages?: number;
-}): Promise<StartupRecoveryResult<TPage>>;

package/dist/startup-recovery.js

@@ -1,59 +0,0 @@
-/**
- * Startup recovery for inbound messages missed while the host was offline.
- *
- * The host persists a `lastInboundMessageId` cursor per conversation. On
- * startup we paginate `getMessagesPage` (newest-first pages, older pages via
- * its `before` message-id parameter) until the cursor is found or a hard
- * per-conversation bound is hit, then replay everything after the cursor.
- *
- * This module is intentionally identical in packages/claude-code-plugin and
- * packages/codex-plugin — keep both copies in sync (future consolidation
- * candidate).
- */
-export const STARTUP_RECOVERY_PAGE_SIZE = 25;
-export const STARTUP_RECOVERY_MAX_MESSAGES = 500;
-export async function collectMissedInboundMessages(input) {
-    const maxMessages = input.maxMessages ?? STARTUP_RECOVERY_MAX_MESSAGES;
-    const newestPage = await input.fetchPage();
-    const collected = [...newestPage.messages];
-    const seenIds = new Set(collected.map((message) => message.id));
-    const hasCursor = (messages) => input.cursor != null && messages.some((message) => message.id === input.cursor);
-    let cursorFound = hasCursor(collected);
-    if (input.cursor != null) {
-        while (!cursorFound && collected.length < maxMessages) {
-            // Pages are newest-first, so the last collected message is the oldest.
-            const before = collected[collected.length - 1]?.id;
-            if (!before)
-                break;
-            const page = await input.fetchPage(before);
-            const fresh = page.messages.filter((message) => !seenIds.has(message.id));
-            // No pagination progress (history exhausted, or the server ignored the
-            // `before` cursor because that message was hard-deleted) — stop here.
-            if (fresh.length === 0)
-                break;
-            for (const message of fresh)
-                seenIds.add(message.id);
-            collected.push(...fresh);
-            cursorFound = hasCursor(fresh);
-        }
-    }
-    const ascending = [...collected].sort((a, b) => String(a.createdAt ?? '').localeCompare(String(b.createdAt ?? '')));
-    const inboundOnly = (messages) => messages.filter((message) => message.senderId !== input.agentId);
-    let mode;
-    let missed;
-    if (cursorFound) {
-        const cursorIndex = ascending.findIndex((message) => message.id === input.cursor);
-        mode = 'after-cursor';
-        missed = inboundOnly(ascending.slice(cursorIndex + 1));
-    }
-    else if (input.cursor != null && collected.length >= maxMessages) {
-        mode = 'truncated-window';
-        missed = inboundOnly(ascending.slice(-maxMessages));
-    }
-    else {
-        mode = 'latest-only';
-        missed = inboundOnly(ascending).slice(-1);
-    }
-    // Safe: `missed` only holds elements of pages returned by `fetchPage`.
-    return { mode, messages: missed, newestPage };
-}

package/dist/streaming-buffer.d.ts

@@ -1,16 +0,0 @@
-export interface StreamingBufferOptions {
-    throttleMs: number;
-    getText: () => string;
-    setText: (text: string) => void;
-    getTimer: () => ReturnType<typeof setTimeout> | null;
-    setTimer: (timer: ReturnType<typeof setTimeout> | null) => void;
-    onWrite: (text: string) => void;
-    schedule?: typeof setTimeout;
-    cancel?: typeof clearTimeout;
-}
-export declare function createStreamingBuffer(options: StreamingBufferOptions): {
-    append(delta: string): void;
-    flush: () => void;
-    clear(): void;
-    replace(text: string): void;
-};

package/dist/streaming-buffer.js

@@ -1,52 +0,0 @@
-export function createStreamingBuffer(options) {
-    const schedule = options.schedule ?? setTimeout;
-    const cancel = options.cancel ?? clearTimeout;
-    const flush = () => {
-        const timer = options.getTimer();
-        if (timer) {
-            cancel(timer);
-            options.setTimer(null);
-        }
-        const text = options.getText();
-        if (text) {
-            options.onWrite(text);
-        }
-    };
-    return {
-        append(delta) {
-            if (!delta)
-                return;
-            options.setText(`${options.getText()}${delta}`);
-            if (options.getTimer())
-                return;
-            const timer = schedule(() => {
-                options.setTimer(null);
-                const text = options.getText();
-                if (text) {
-                    options.onWrite(text);
-                }
-            }, options.throttleMs);
-            options.setTimer(timer);
-        },
-        flush,
-        clear() {
-            const timer = options.getTimer();
-            if (timer) {
-                cancel(timer);
-                options.setTimer(null);
-            }
-            options.setText('');
-        },
-        replace(text) {
-            const timer = options.getTimer();
-            if (timer) {
-                cancel(timer);
-                options.setTimer(null);
-            }
-            options.setText(text);
-            if (text) {
-                options.onWrite(text);
-            }
-        },
-    };
-}