@canonmsg/claude-code-plugin 0.12.0 → 0.12.1

package/README.md

@@ -15,7 +15,15 @@ canon-register --name "My Claude" --description "My Claude Code agent" --phone "
 canon-claude
 ```
 
-Send a message to your agent in the Canon app. Claude Code responds with full capabilities (file read/write, bash, etc.).
+Send a message to your agent in the Canon app. Claude Code responds with full capabilities (file read/write, bash, etc.). Keep the `canon-claude` terminal open; closing it takes this local agent offline.
+
+After a restart or closed terminal, use the shared local manager to list and revive all recorded local agents:
+
+```bash
+npm install -g @canonmsg/local-agents
+canon-necromance
+canon-necromance revive frontend
+```
 
 ## Features
 
@@ -60,6 +68,8 @@ CANON_AGENT=frontend canon-claude --cwd ~/projects/frontend
 
 For a lighter integration without session controls, run Canon as a channel plugin inside your own Claude Code session. See [full setup guide](../../docs/claude-code-setup.md#channel-mode-alternative).
 
+Channel mode is embedded inside Claude Code and is shown as non-revivable by `canon-necromance`. Use `canon-claude` host mode when you want phone-controlled runtime sessions.
+
 ## Development
 
 ```bash

package/dist/host-runtime.js

@@ -69,8 +69,6 @@ export function renderCanonHostInboundContent(message, materialized) {
 }
 function describeContactCard(card) {
     const parts = [`${card.userType} · userId: ${card.userId}`];
-    if (card.accessLevel)
-        parts.push(`access: ${card.accessLevel}`);
     if (card.ownerName)
         parts.push(`owner: ${card.ownerName}`);
     if (card.about)

package/dist/host.js

@@ -26,7 +26,7 @@ import { execFileSync } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import { query, } from '@anthropic-ai/claude-agent-sdk';
 import { isAnthropicImageAttachment, materializeMessageMedia, toAnthropicImageBlock, } from '@canonmsg/agent-sdk';
-import { CLAUDE_PERMISSION_MODE_OPTIONS, buildConfiguredWorkspaceOptionsWithRoots, buildConversationEnvironmentKey, buildPlanApprovalRequest, buildQuestionRequest, buildPublicWorkspaceRoots, 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 { CLAUDE_PERMISSION_MODE_OPTIONS, buildConfiguredWorkspaceOptionsWithRoots, buildConversationEnvironmentKey, buildPlanApprovalRequest, buildQuestionRequest, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, EXECUTION_ENVIRONMENT_MODES, CanonClient, CanonStream, clearTurnState, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, HOST_ADMISSION_ACTIONS_DISABLED, ExecutionEnvironmentError, FINAL_MESSAGE_HANDOFF_MS, buildLocalRuntimeId, getActiveProfileLock, heartbeatLocalRuntimeEntry, normalizeTurnMetadata, prepareConversationEnvironment, resolveCanonAgent, initRTDBAuth, rtdbRead, rtdbWrite, writeRuntimeInfo, writeSessionState, clearSessionState, writeTurnState, loadRuntimeSessionState, markLocalRuntimeStopped, releaseConversationEnvironment, saveRuntimeSessionState, clearRuntimeSessionState, upsertLocalRuntimeEntry, } 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';
@@ -207,6 +207,7 @@ function buildClaudeRuntimeDescriptor(input) {
         workspaceRoots: input.workspaceRoots,
         supportsInterrupt: true,
         streamingTextMode: 'delta',
+        admissionActions: HOST_ADMISSION_ACTIONS_DISABLED,
     };
 }
 function normalizeClaudeEffortLevel(value) {
@@ -1158,7 +1159,13 @@ function createSession(conversationId, environment, agentId, client, onSessionEn
         console.error(`[canon-host] [${conversationId.slice(0, 8)}] Session ${resumeSessionId ? 'resumed' : 'started'} `
             + `(mode: ${environment.mode}, cwd: ${cwd})`);
     };
-    init().catch((err) => console.error(`[canon-host] [${conversationId.slice(0, 8)}] Init failed:`, err));
+    init().catch((err) => {
+        console.error(`[canon-host] [${conversationId.slice(0, 8)}] Init failed:`, err);
+        if (resumeSessionId) {
+            session.sdkSessionId = null;
+            onSessionEnd(conversationId, null);
+        }
+    });
     return session;
 }
 // ── Main ────────────────────────────────────────────────────────────
@@ -1186,10 +1193,10 @@ export async function main() {
     for (const warning of workspaceDiscovery.warnings) {
         console.error(`[canon-host] ${warning}`);
     }
-    const { apiKey, agentId: profileAgentId, profile } = resolveCanonAgent({ logPrefix: '[canon-host]' });
+    const { apiKey, agentId: profileAgentId, agentName: profileAgentName, profile, baseUrl, lockHandle, } = resolveCanonAgent({ logPrefix: '[canon-host]', expectedClientType: 'claude-code' });
     console.error(`[canon-host] Starting${profile ? ` (profile: ${profile})` : ''} in ${workingDir}`);
     // ── Canon API client + RTDB auth ──
-    const client = new CanonClient(apiKey);
+    const client = new CanonClient(apiKey, baseUrl);
     initRTDBAuth(client);
     let agentId;
     let ownerId = null;
@@ -1209,6 +1216,34 @@ export async function main() {
         }
         console.error(`[canon-host] Authenticated as ${agentId}`);
     }
+    const launchArgs = [...process.argv.slice(2)];
+    if (!launchArgs.some((arg) => arg === '--cwd' || arg.startsWith('--cwd='))) {
+        launchArgs.push('--cwd', workingDir);
+    }
+    const runtimeId = buildLocalRuntimeId({
+        runtime: 'claude-code',
+        profile,
+        cwd: workingDir,
+        launchCommand: ['canon-claude', ...launchArgs],
+    });
+    upsertLocalRuntimeEntry({
+        id: runtimeId,
+        runtime: 'claude-code',
+        profile,
+        agentId,
+        agentName: profileAgentName,
+        cwd: workingDir,
+        baseCwd: workingDir,
+        workspaceRoots: workspaceRoots.map((root) => root.cwd),
+        workspaces: workspaceOptions.map((workspace) => workspace.cwd),
+        launchCommand: ['canon-claude', ...launchArgs],
+        pid: process.pid,
+        status: profile ? 'running' : 'manual',
+        reviveCapability: profile ? 'revivable' : 'manual',
+        surfaceMode: 'host',
+        lastStartedAt: new Date().toISOString(),
+        lastHeartbeatAt: new Date().toISOString(),
+    });
     let streamConnected = false;
     const hostAvailableExecutionModes = [
         ...EXECUTION_ENVIRONMENT_MODES,
@@ -1230,6 +1265,12 @@ export async function main() {
     const knownConversationIds = new Set();
     let lastKnownConversationRefreshAt = 0;
     const publishRuntimeHeartbeat = async () => {
+        heartbeatLocalRuntimeEntry(runtimeId, {
+            agentId,
+            agentName: profileAgentName,
+            cwd: workingDir,
+            baseCwd: workingDir,
+        });
         if (!streamConnected)
             return;
         await refreshKnownConversationIds().catch((error) => {
@@ -1395,6 +1436,12 @@ export async function main() {
         // Save SDK session ID for future resume
         if (session.sdkSessionId) {
             savedSessionIds.set(buildConversationEnvironmentKey(conversationId, session.environment.baseCwd), session.sdkSessionId);
+            saveRuntimeSessionState(runtimeId, {
+                conversationId,
+                baseCwd: session.environment.baseCwd,
+                executionMode: session.environment.mode,
+                claudeSessionId: session.sdkSessionId,
+            });
         }
         if (session.streamingTimer)
             clearTimeout(session.streamingTimer);
@@ -1457,7 +1504,12 @@ export async function main() {
             });
             try {
                 const resumeKey = buildConversationEnvironmentKey(conversationId, environment.baseCwd);
-                const resumeId = savedSessionIds.get(resumeKey);
+                const persisted = loadRuntimeSessionState(runtimeId, {
+                    conversationId,
+                    baseCwd: environment.baseCwd,
+                    executionMode: environment.mode,
+                });
+                const resumeId = savedSessionIds.get(resumeKey) ?? persisted?.claudeSessionId;
                 const session = createSession(conversationId, environment, agentId, client, (convoId, sdkSessionId) => {
                     // Called when session processing loop ends — save session ID for resume
                     const existing = sessions.get(convoId);
@@ -1465,6 +1517,19 @@ export async function main() {
                         releaseConversationEnvironment(existing.environment);
                         if (sdkSessionId) {
                             savedSessionIds.set(buildConversationEnvironmentKey(convoId, existing.environment.baseCwd), sdkSessionId);
+                            saveRuntimeSessionState(runtimeId, {
+                                conversationId: convoId,
+                                baseCwd: existing.environment.baseCwd,
+                                executionMode: existing.environment.mode,
+                                claudeSessionId: sdkSessionId,
+                            });
+                        }
+                        else {
+                            clearRuntimeSessionState(runtimeId, {
+                                conversationId: convoId,
+                                baseCwd: existing.environment.baseCwd,
+                                executionMode: existing.environment.mode,
+                            });
                         }
                     }
                     sessions.delete(convoId);
@@ -1496,6 +1561,112 @@ export async function main() {
             pendingSessionCreations.delete(conversationId);
         }
     }
+    async function enqueueRecoveredInboundMessage(input) {
+        const m = input.message;
+        if (m.senderId === agentId)
+            return;
+        let materialized = [];
+        if (m.id) {
+            try {
+                materialized = await materializeMessageMedia({
+                    id: m.id,
+                    attachments: m.attachments ?? [],
+                }, { agentId, conversationId: input.conversationId });
+            }
+            catch (error) {
+                console.error(`[canon-host] [${input.conversationId.slice(0, 8)}] Failed to materialize recovered media:`, error instanceof Error ? error.message : error);
+            }
+        }
+        const sender = m.senderName || m.senderId;
+        const isOwner = m.isOwner ?? (ownerId != null && m.senderId === ownerId);
+        const content = renderInboundContent(m, materialized);
+        const hydrated = await loadHydratedInboundContext({
+            conversationId: input.conversationId,
+            message: m,
+            senderName: sender,
+            isOwner,
+        });
+        const behavior = input.hydratedPage?.behavior ?? hydrated.behavior;
+        const workSessions = input.hydratedPage?.workSessions ?? hydrated.workSessions;
+        const participantContext = hydrated.participantContext;
+        const autoReply = decideAutoReply(participantContext, behavior);
+        if (!autoReply.allow) {
+            console.error(`[canon-host] [${input.conversationId.slice(0, 8)}] Suppressed recovered auto-reply: ${autoReply.reason}`);
+            return;
+        }
+        let session;
+        try {
+            session = await getOrCreateSession(input.conversationId);
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            const userMessage = error instanceof ExecutionEnvironmentError ? error.userMessage : message;
+            console.error(`[canon-host] [${input.conversationId.slice(0, 8)}] Failed to create recovered session: ${message}`);
+            await client.sendMessage(input.conversationId, `I couldn't start a coding session for this workspace: ${userMessage}`, {
+                metadata: {
+                    turnSemantics: 'turn_complete',
+                    turnComplete: true,
+                },
+            }).catch(() => { });
+            return;
+        }
+        const turnMetadata = normalizeTurnMetadata(m.metadata);
+        const deliveryIntent = turnMetadata?.deliveryIntent ?? 'queue';
+        const shouldMarkAccepted = turnMetadata?.inboundDisposition === 'queued';
+        const promptText = buildCanonPrompt({
+            content,
+            conversationId: input.conversationId,
+            participantContext,
+            behavior,
+            workSession: m.workSession,
+            workSessions,
+        });
+        const messageContent = await buildCanonUserContent({ promptText, materialized });
+        session.enqueueInbound({
+            type: 'user',
+            message: {
+                role: 'user',
+                content: messageContent,
+            },
+            parent_tool_use_id: null,
+        }, deliveryIntent, m.id ?? null, shouldMarkAccepted);
+        if (m.id) {
+            saveRuntimeSessionState(runtimeId, {
+                conversationId: input.conversationId,
+                baseCwd: workingDir,
+                lastInboundMessageId: m.id,
+            });
+        }
+    }
+    try {
+        for (const conversation of conversationCache.values()) {
+            const cursor = loadRuntimeSessionState(runtimeId, {
+                conversationId: conversation.id,
+                baseCwd: workingDir,
+            })?.lastInboundMessageId;
+            const page = await client.getMessagesPage(conversation.id, 25);
+            const inboundMessages = page.messages
+                .filter((message) => message.senderId !== agentId)
+                .sort((a, b) => String(a.createdAt ?? '').localeCompare(String(b.createdAt ?? '')));
+            const cursorIndex = cursor
+                ? inboundMessages.findIndex((message) => message.id === cursor)
+                : -1;
+            const messagesToRecover = cursorIndex >= 0
+                ? inboundMessages.slice(cursorIndex + 1)
+                : inboundMessages.slice(-1);
+            for (const message of messagesToRecover) {
+                console.error(`[canon-host] [${conversation.id.slice(0, 8)}] Recovering inbound message on startup`);
+                await enqueueRecoveredInboundMessage({
+                    conversationId: conversation.id,
+                    message: message,
+                    hydratedPage: page,
+                });
+            }
+        }
+    }
+    catch (error) {
+        console.error('[canon-host] Failed startup recovery:', error instanceof Error ? error.message : error);
+    }
     // ── Connect SSE stream for inbound Canon messages ──
     const stream = new CanonStream({
         apiKey,
@@ -1607,6 +1778,13 @@ export async function main() {
                         },
                         parent_tool_use_id: null,
                     }, deliveryIntent, m.id ?? null, shouldMarkAccepted);
+                    if (m.id) {
+                        saveRuntimeSessionState(runtimeId, {
+                            conversationId: convoId,
+                            baseCwd: workingDir,
+                            lastInboundMessageId: m.id,
+                        });
+                    }
                 })();
             },
             onConnected: () => {
@@ -1788,13 +1966,13 @@ export async function main() {
         for (const convoId of [...sessions.keys()]) {
             closeSession(convoId);
         }
-        const ap = getActiveProfile();
-        if (ap)
-            releaseLock(ap);
+        markLocalRuntimeStopped(runtimeId);
+        (lockHandle ?? getActiveProfileLock())?.release();
         process.exit(0);
     };
     process.on('SIGINT', shutdown);
     process.on('SIGTERM', shutdown);
+    process.on('SIGHUP', shutdown);
     console.error('[canon-host] Ready — sessions created on demand');
     // Keep alive
     await new Promise(() => { });
@@ -1802,8 +1980,6 @@ export async function main() {
 // ── Entry ───────────────────────────────────────────────────────────
 runCli(import.meta.url, main, (err) => {
     console.error('[canon-host] Fatal error:', err);
-    const ap = getActiveProfile();
-    if (ap)
-        releaseLock(ap);
+    getActiveProfileLock()?.release();
     process.exit(1);
 });

package/dist/register.js

@@ -9,14 +9,10 @@ import { setDefaultResultOrder } from 'node:dns';
  *
  * On approval, saves the agent to ~/.canon/agents.json under the profile name.
  */
-import { registerAndWaitForApproval } from '@canonmsg/core';
-import { readFileSync, writeFileSync, mkdirSync } from 'node:fs';
-import { join } from 'node:path';
-import { homedir } from 'node:os';
+import { ackRegistrationApproval, clearPendingRegistration, getOrCreatePendingRegistration, registerAndWaitForApproval, updatePendingRegistration, upsertAgentProfile, AGENTS_PATH, } from '@canonmsg/core';
+import { readFileSync } from 'node:fs';
 import { parseArgs } from 'node:util';
 import { runCli } from './cli-entry.js';
-const CANON_DIR = join(homedir(), '.canon');
-const AGENTS_PATH = join(CANON_DIR, 'agents.json');
 export async function main() {
     setDefaultResultOrder('ipv4first');
     const { values } = parseArgs({
@@ -44,6 +40,7 @@ export async function main() {
         // File doesn't exist yet
     }
     console.log(`Registering agent "${values.name}" (profile: ${profileName})...`);
+    const pending = getOrCreatePendingRegistration(profileName, 'claude-code');
     const result = await registerAndWaitForApproval({
         name: values.name,
         description: values.description,
@@ -52,8 +49,14 @@ export async function main() {
         clientType: 'claude-code',
         baseUrl: values['base-url'],
         requestedAgentId: existingAgentId,
+        localRegistrationId: pending.localRegistrationId,
     }, {
-        onSubmitted: (requestId) => {
+        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...');
         },
@@ -64,25 +67,26 @@ export async function main() {
     console.log(''); // newline after dots
     switch (result.status) {
         case 'approved': {
-            // Save to ~/.canon/agents.json
-            mkdirSync(CANON_DIR, { recursive: true });
-            let profiles = {};
-            try {
-                profiles = JSON.parse(readFileSync(AGENTS_PATH, 'utf-8'));
+            if (!result.apiKey || !result.agentId || !result.agentName) {
+                console.error('Approval completed but Canon did not return a usable API key. Run this command again to resume key pickup.');
+                process.exit(1);
             }
-            catch {
-                // File doesn't exist yet
-            }
-            profiles[profileName] = {
+            upsertAgentProfile(profileName, {
                 apiKey: result.apiKey,
                 agentId: result.agentId,
                 agentName: result.agentName,
                 registeredAt: new Date().toISOString(),
-            };
-            writeFileSync(AGENTS_PATH, JSON.stringify(profiles, null, 2));
+                clientType: 'claude-code',
+                ...(typeof values['base-url'] === 'string' ? { baseUrl: values['base-url'] } : {}),
+            });
+            if (result.requestId) {
+                await ackRegistrationApproval(values['base-url'], result.requestId, result.pollToken);
+            }
+            clearPendingRegistration(profileName);
             console.log(`Approved! Agent: ${result.agentName} (${result.agentId})`);
             console.log(`Saved as profile "${profileName}" in ~/.canon/agents.json`);
-            console.log('Restart Claude Code to connect.');
+            console.log('Start it with: CANON_AGENT=' + profileName + ' canon-claude --cwd /path/to/project');
+            console.log('Keep that terminal open. Closing it takes this local agent offline.');
             break;
         }
         case 'rejected':

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, loadProfiles, isProfileLocked, resolveCanonAgent, getActiveProfile, releaseLock, initRTDBAuth, writeSessionState, clearSessionState, } from '@canonmsg/core';
+import { CanonClient, CanonStream, ApprovalManager, buildLocalRuntimeId, getActiveProfileLock, markLocalRuntimeStopped, loadProfiles, isProfileLocked, resolveCanonAgent, getActiveProfile, releaseLock, upsertLocalRuntimeEntry, initRTDBAuth, writeSessionState, clearSessionState, } from '@canonmsg/core';
 import { ApprovalHttpServer } from './approval-server.js';
 import { runCli } from './cli-entry.js';
 // ── MCP server ─────────────────────────────────────────────────────────
@@ -525,10 +525,14 @@ async function handleInboundMessage(payload) {
 async function startChannel() {
     let apiKey;
     let profile;
+    let baseUrl;
+    let profileAgentName;
     try {
-        const resolved = resolveCanonAgent({ logPrefix: '[canon]' });
+        const resolved = resolveCanonAgent({ logPrefix: '[canon]', expectedClientType: 'claude-code' });
         apiKey = resolved.apiKey;
         profile = resolved.profile;
+        baseUrl = resolved.baseUrl;
+        profileAgentName = resolved.agentName;
     }
     catch (err) {
         console.error(err instanceof Error ? err.message : err);
@@ -537,7 +541,7 @@ async function startChannel() {
     if (profile) {
         console.error(`[canon] Using agent profile: ${profile}`);
     }
-    client = new CanonClient(apiKey);
+    client = new CanonClient(apiKey, baseUrl);
     // Get agent identity — try /agents/me first, fall back to /agents/auth-token
     let agentId;
     try {
@@ -560,6 +564,27 @@ async function startChannel() {
     }
     // Initialize RTDB auth for session state reporting
     initRTDBAuth(client);
+    const runtimeId = buildLocalRuntimeId({
+        runtime: 'claude-code',
+        profile,
+        cwd: process.cwd(),
+        launchCommand: ['canon-channel-server'],
+    });
+    upsertLocalRuntimeEntry({
+        id: runtimeId,
+        runtime: 'claude-code',
+        profile,
+        agentId,
+        agentName: agentContext?.displayName ?? profileAgentName,
+        cwd: process.cwd(),
+        launchCommand: ['canon-channel-server'],
+        pid: process.pid,
+        status: 'embedded',
+        reviveCapability: 'embedded',
+        surfaceMode: 'channel',
+        lastStartedAt: new Date().toISOString(),
+        lastHeartbeatAt: new Date().toISOString(),
+    });
     // Populate conversation cache
     try {
         const convos = await client.getConversations();
@@ -627,13 +652,22 @@ export async function main() {
         approvalManager?.dispose();
         approvalServer?.stop().catch(() => { });
         stream?.stop();
+        const runtimeId = buildLocalRuntimeId({
+            runtime: 'claude-code',
+            profile: getActiveProfile(),
+            cwd: process.cwd(),
+            launchCommand: ['canon-channel-server'],
+        });
+        markLocalRuntimeStopped(runtimeId);
         const ap = getActiveProfile();
         if (ap)
             releaseLock(ap);
+        getActiveProfileLock()?.release();
         process.exit(0);
     };
     process.on('SIGINT', shutdown);
     process.on('SIGTERM', shutdown);
+    process.on('SIGHUP', shutdown);
 }
 runCli(import.meta.url, main, (err) => {
     console.error('[canon] Fatal error:', err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.12.0",
+  "version": "0.12.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.101",
-    "@canonmsg/agent-sdk": "^0.9.2",
-    "@canonmsg/core": "^0.10.0",
+    "@canonmsg/agent-sdk": "^0.10.1",
+    "@canonmsg/core": "^0.13.0",
     "@modelcontextprotocol/sdk": "^1.12.0"
   },
   "engines": {