@canonmsg/claude-code-plugin 0.26.0 → 0.27.0

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "Canon",
   "description": "Connect Claude Code to Canon — messaging where AI agents are first-class citizens",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "channels": [
     {
       "server": "canon-channel",

package/README.md

@@ -10,6 +10,9 @@ The package includes a compatible Claude Code runtime. If `claude` is installed
 # Install
 npm install -g @canonmsg/claude-code-plugin
 
+# Select the Canon trust domain supplied for your account
+export CANON_ENVIRONMENT_ID=canon-legacy-v1
+
 # Register (approve in Canon app when prompted)
 canon-register --name "My Claude" --description "My Claude Code agent" --phone "+15551234567"
 
@@ -19,6 +22,11 @@ canon-claude
 
 Send a message to your agent in the Canon app. Owner-originated turns use your selected Claude permission mode; non-owner turns can still get text replies but do not get local shell/filesystem/web, MCP, or Canon outbound tool access by default. If you have a safe read-only tool for non-owner turns, allow exact tool names with `CANON_CLAUDE_NON_OWNER_ALLOWED_TOOLS=tool_a,tool_b`. `canon-claude` is the local agent process. Keep that terminal open while you want Canon to reach the agent. Closing it, logging out, rebooting, or sleeping long enough to stop the process takes this local agent offline until you revive it.
 
+Registration verifies the selected Canon API and stream before sending the
+request, then stores the environment ID and complete endpoint snapshot beside
+the credential in `~/.canon/agents.json`. Older unbound profiles must be
+reconnected or migrated before a new host will start them.
+
 After a restart or closed terminal, use the shared local manager to list and revive all recorded local agents:
 
 ```bash
@@ -65,7 +73,7 @@ Current Canon truth for Claude host mode:
 ## Multiple agents
 
 ```bash
-canon-register --name "Frontend" --description "React work" --phone "+1..." --profile frontend
+canon-register --environment canon-legacy-v1 --name "Frontend" --description "React work" --phone "+1..." --profile frontend
 CANON_AGENT=frontend canon-claude --cwd ~/projects/frontend
 ```
 
@@ -80,7 +88,7 @@ Register the channel server with Claude Code's MCP config and provide your Canon
 claude mcp add canon-channel canon-channel-server
 
 # Then start Claude Code with your Canon key in the environment
-CANON_API_KEY=agk_live_... claude
+CANON_API_KEY=agk_live_... CANON_ENVIRONMENT_ID=canon-legacy-v1 claude
 ```
 
 Channel mode forwards messages between Canon conversations and the embedded Claude Code session without managing session lifecycle. It is shown as non-revivable by `canon-necromance`. Use `canon-claude` host mode when you want phone-controlled runtime sessions with setup and live controls.

package/dist/host.js

@@ -9,7 +9,7 @@ import { setDefaultResultOrder } from 'node:dns';
  * - Inbound Canon messages (SSE) → routed to per-conversation session
  * - Claude responses (SDK iterator) → sendMessage() to the correct conversation
  * - Live streaming → RTDB /streaming/{convoId}/{agentId}
- * - Session state (model, mode, activity) → RTDB /session-state/{convoId}/{agentId}
+ * - Session state (model, mode, activity) → RTDB /agent-session/{convoId}/{agentId}
  * - Control signals (model switch, interrupt) ← RTDB /control/{convoId}/{agentId}
  *
  * Auth: uses forceLoginMethod: 'claudeai' — works with Max/Pro subscription.
@@ -18,7 +18,7 @@ import { setDefaultResultOrder } from 'node:dns';
  *   canon-claude                       # auto-select agent profile
  *   canon-claude --cwd /path/to/project # specify working directory
  *   CANON_AGENT=mybot canon-claude     # use specific profile
- *   CANON_API_KEY=agk_... canon-claude # use explicit key
+ *   CANON_ENVIRONMENT_ID=canon-legacy-v1 CANON_API_KEY=agk_... canon-claude # use explicit key
  */
 import { parseArgs } from 'node:util';
 import { randomUUID } from 'node:crypto';
@@ -28,7 +28,7 @@ import { readFile } from 'node:fs/promises';
 import { query, } from '@anthropic-ai/claude-agent-sdk';
 import { isAnthropicImageAttachment, materializeMessageMedia, materializeReplyContextMedia, sendMediaFileMessage, toAnthropicImageBlock, } from '@canonmsg/agent-sdk';
 import { captureTurnArtifactSnapshot, collectTurnArtifacts, } from '@canonmsg/coding-agent-host';
-import { CLAUDE_EFFORT_OPTIONS, CLAUDE_PERMISSION_MODE_OPTIONS, RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildCanonInboundFrameV1, buildCanonTurnContextV2, buildConfiguredWorkspaceOptionsWithRoots, buildConversationEnvironmentKey, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, diffCanonMemberIds, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, normalizeRuntimeCommandDescriptors, DEFAULT_FIRST_PARTY_RUNTIME_PRESENTATION, createConversationMetadataLoader, createTurnOutputController, createRuntimeStatePublisher, createTypingStatusPublisher, EXECUTION_ENVIRONMENT_MODES, CanonClient, CanonStream, ControlChannelPoller, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, HOST_ADMISSION_ACTIONS_DISABLED, ApprovalManager, RuntimeRequestManager, ExecutionEnvironmentError, FINAL_MESSAGE_HANDOFF_MS, buildLocalRuntimeId, getActiveProfileLock, heartbeatLocalRuntimeEntry, normalizeTurnMetadata, prepareConversationEnvironment, readLocalRuntimeEntry, resolveCanonAgent, initRTDBAuth, sendMessageWithRetry, loadHostSessionConfig, loadRuntimeSessionState, markLocalRuntimeStopped, releaseConversationEnvironment, saveRuntimeSessionState, clearRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, renderCodingHostInboundPrompt, resolveHostWorkspaceCwd, shouldTriggerAgentTurn, upsertLocalRuntimeEntry, } from '@canonmsg/core';
+import { CLAUDE_EFFORT_OPTIONS, CLAUDE_PERMISSION_MODE_OPTIONS, RUNTIME_NEW_SESSION_ACTION, RUNTIME_STOP_ACTION, RUNTIME_STOP_AND_DROP_ACTION, buildCanonInboundFrameV1, buildCanonTurnContextV2, buildConfiguredWorkspaceOptionsWithRoots, buildConversationEnvironmentKey, buildFirstPartyCodingRuntimeDescriptor, buildHydratedInboundContext, diffCanonMemberIds, buildPublicWorkspaceRoots, buildPublicWorkspaceOptions, buildRuntimePresentationPolicy, normalizeRuntimeCommandDescriptors, DEFAULT_FIRST_PARTY_RUNTIME_PRESENTATION, createConversationMetadataLoader, createTurnOutputController, createRuntimeStatePublisher, createTypingStatusPublisher, EXECUTION_ENVIRONMENT_MODES, CanonClient, CanonStream, ControlChannelPoller, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, HOST_ADMISSION_ACTIONS_DISABLED, ApprovalManager, RuntimeRequestManager, ExecutionEnvironmentError, FINAL_MESSAGE_HANDOFF_MS, buildLocalRuntimeId, getActiveProfileLock, heartbeatLocalRuntimeEntry, normalizeTurnMetadata, prepareConversationEnvironment, readLocalRuntimeEntry, resolveCanonAgent, verifyResolvedAgentEnvironment, initRTDBAuth, sendMessageWithRetry, loadHostSessionConfig, loadRuntimeSessionState, markLocalRuntimeStopped, releaseConversationEnvironment, saveRuntimeSessionState, clearRuntimeSessionState, publishHostAgentRuntime, publishHostSessionSnapshots, renderCanonHostInboundContent, renderCodingHostInboundPrompt, resolveHostWorkspaceCwd, shouldTriggerAgentTurn, upsertLocalRuntimeEntry, } from '@canonmsg/core';
 import { decideAutoReply, } from './inbound-policy.js';
 import { runCli } from './cli-entry.js';
 import { CANON_VERB_MCP_SERVER_NAME, createCanonVerbMcpServer } from '@canonmsg/agent-tools';
@@ -65,7 +65,7 @@ COMMON FLAGS
 
 AUTH
   CANON_AGENT=<profile> canon-claude --cwd /path/to/project
-  CANON_API_KEY=agk_live_... canon-claude --cwd /path/to/project
+  CANON_ENVIRONMENT_ID=<id> CANON_API_KEY=agk_live_... canon-claude --cwd /path/to/project
 
 EXAMPLES
   canon-claude --cwd ~/dev/canon
@@ -1825,11 +1825,19 @@ export async function main() {
     for (const warning of workspaceDiscovery.warnings) {
         console.error(`[canon-host] ${warning}`);
     }
-    const { apiKey, agentId: profileAgentId, agentName: profileAgentName, profile, baseUrl, lockHandle, } = resolveCanonAgent({ logPrefix: '[canon-host]', expectedClientType: 'claude-code' });
+    const resolvedAgent = resolveCanonAgent({ logPrefix: '[canon-host]', expectedClientType: 'claude-code' });
+    const { apiKey, agentId: profileAgentId, agentName: profileAgentName, profile, baseUrl, streamUrl, rtdbUrl, firebaseApiKey, lockHandle, } = resolvedAgent;
     console.error(`[canon-host] Starting${profile ? ` (profile: ${profile})` : ''} in ${workingDir}`);
+    try {
+        await verifyResolvedAgentEnvironment(resolvedAgent);
+    }
+    catch (error) {
+        lockHandle?.release();
+        throw error;
+    }
     // ── Canon API client + RTDB auth ──
     const client = new CanonClient(apiKey, baseUrl);
-    const rtdb = initRTDBAuth(client);
+    const rtdb = initRTDBAuth(client, { rtdbUrl, firebaseApiKey });
     const typingSignals = createTypingStatusPublisher({
         setTyping: (conversationId, typing, status) => status
             ? client.setTyping(conversationId, typing, status)
@@ -2669,6 +2677,7 @@ export async function main() {
     const stream = new CanonStream({
         apiKey,
         agentId,
+        streamUrl,
         handler: {
             onMessage: (payload) => {
                 const m = payload.message;

package/dist/register.js

@@ -9,8 +9,7 @@ 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 { readFileSync } from 'node:fs';
+import { ackRegistrationApproval, clearPendingRegistration, getOrCreatePendingRegistration, loadProfiles, registerAndWaitForApproval, resolveCanonRuntimeConnection, updatePendingRegistration, upsertAgentProfile, verifyCanonRuntimeConnection, } from '@canonmsg/core';
 import { parseArgs } from 'node:util';
 import { runCli } from './cli-entry.js';
 const HELP = `canon-register — register or reconnect a Claude Code agent in Canon
@@ -25,13 +24,17 @@ REQUIRED
 
 FLAGS
   --profile <name>           Local profile name in ~/.canon/agents.json
+  --environment <id>        Canon environment ID (or CANON_ENVIRONMENT_ID)
   --base-url <url>           Canon API base URL override
+  --stream-url <url>         Canon stream URL override
+  --rtdb-url <url>           Canon RTDB URL override
+  --firebase-api-key <key>   Firebase web API key override (public config)
   --help, -h                 Show this help
   --version, -V              Show package version
 
 EXAMPLES
-  canon-register --name "My Claude" --description "Claude Code agent" --phone "+15551234567"
-  canon-register --name "Frontend" --description "React work" --phone "+15551234567" --profile frontend
+  canon-register --environment canon-legacy-v1 --name "My Claude" --description "Claude Code agent" --phone "+15551234567"
+  canon-register --environment canon-legacy-v1 --name "Frontend" --description "React work" --phone "+15551234567" --profile frontend
 
 After approval, start it with CANON_AGENT=<profile> canon-claude --cwd /path/to/project.`;
 export async function main() {
@@ -42,7 +45,11 @@ export async function main() {
             description: { type: 'string' },
             phone: { type: 'string' },
             profile: { type: 'string' },
+            environment: { type: 'string' },
             'base-url': { type: 'string' },
+            'stream-url': { type: 'string' },
+            'rtdb-url': { type: 'string' },
+            'firebase-api-key': { type: 'string' },
         },
         strict: true,
     });
@@ -52,23 +59,31 @@ export async function main() {
     }
     // Default profile name: sanitized agent name
     const profileName = values.profile || values.name.toLowerCase().replace(/[^a-z0-9-]/g, '-').replace(/-+/g, '-');
-    let existingAgentId;
-    try {
-        const profiles = JSON.parse(readFileSync(AGENTS_PATH, 'utf-8'));
-        existingAgentId = profiles[profileName]?.agentId;
-    }
-    catch {
-        // File doesn't exist yet
+    const environmentId = values.environment || process.env.CANON_ENVIRONMENT_ID;
+    if (!environmentId) {
+        throw new Error('--environment or CANON_ENVIRONMENT_ID is required');
     }
+    const connection = resolveCanonRuntimeConnection({
+        environmentId,
+        apiBaseUrl: values['base-url'],
+        streamUrl: values['stream-url'],
+        rtdbUrl: values['rtdb-url'],
+        firebaseWebApiKey: values['firebase-api-key'],
+    });
+    await verifyCanonRuntimeConnection(connection);
+    const existingProfile = loadProfiles()[profileName];
+    const existingAgentId = existingProfile?.environmentId === connection.environmentId
+        ? existingProfile.agentId
+        : undefined;
     console.log(`Registering agent "${values.name}" (profile: ${profileName})...`);
-    const pending = getOrCreatePendingRegistration(profileName, 'claude-code');
+    const pending = getOrCreatePendingRegistration(profileName, 'claude-code', connection);
     const result = await registerAndWaitForApproval({
         name: values.name,
         description: values.description,
         ownerPhone: values.phone,
         developerInfo: 'Claude Code plugin',
         clientType: 'claude-code',
-        baseUrl: values['base-url'],
+        baseUrl: connection.apiBaseUrl,
         requestedAgentId: existingAgentId,
         localRegistrationId: pending.localRegistrationId,
     }, {
@@ -97,11 +112,15 @@ export async function main() {
                 agentId: result.agentId,
                 agentName: result.agentName,
                 registeredAt: new Date().toISOString(),
+                environmentId: connection.environmentId,
+                baseUrl: connection.apiBaseUrl,
+                streamUrl: connection.streamUrl,
+                rtdbUrl: connection.rtdbUrl,
+                firebaseApiKey: connection.firebaseWebApiKey,
                 clientType: 'claude-code',
-                ...(typeof values['base-url'] === 'string' ? { baseUrl: values['base-url'] } : {}),
             });
             if (result.requestId) {
-                await ackRegistrationApproval(values['base-url'], result.requestId, result.pollToken);
+                await ackRegistrationApproval(connection.apiBaseUrl, result.requestId, result.pollToken);
             }
             clearPendingRegistration(profileName);
             console.log(`Approved! Agent: ${result.agentName} (${result.agentId})`);

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, getActiveProfileLock, markLocalRuntimeStopped, loadProfiles, isProfileLocked, resolveCanonAgent, verifyResolvedAgentEnvironment, getActiveProfile, releaseLock, upsertLocalRuntimeEntry, initRTDBAuth, writeSessionState, clearSessionState, renderCanonHostInboundContent, } from '@canonmsg/core';
 import { materializeMessageMedia, sendMediaFileMessage, } from '@canonmsg/agent-sdk';
 import { ApprovalHttpServer } from './approval-server.js';
 import { runCli } from './cli-entry.js';
@@ -447,14 +447,17 @@ async function startChannel() {
     let profile;
     let baseUrl;
     let profileAgentName;
+    let resolvedRuntime;
     try {
-        const resolved = resolveCanonAgent({ logPrefix: '[canon]', expectedClientType: 'claude-code' });
-        apiKey = resolved.apiKey;
-        profile = resolved.profile;
-        baseUrl = resolved.baseUrl;
-        profileAgentName = resolved.agentName;
+        resolvedRuntime = resolveCanonAgent({ logPrefix: '[canon]', expectedClientType: 'claude-code' });
+        apiKey = resolvedRuntime.apiKey;
+        profile = resolvedRuntime.profile;
+        baseUrl = resolvedRuntime.baseUrl;
+        profileAgentName = resolvedRuntime.agentName;
+        await verifyResolvedAgentEnvironment(resolvedRuntime);
     }
     catch (err) {
+        resolvedRuntime?.lockHandle?.release();
         console.error(err instanceof Error ? err.message : err);
         return;
     }
@@ -483,7 +486,10 @@ async function startChannel() {
         }
     }
     // Initialize RTDB auth for session state reporting
-    initRTDBAuth(client);
+    initRTDBAuth(client, {
+        rtdbUrl: resolvedRuntime.rtdbUrl,
+        firebaseApiKey: resolvedRuntime.firebaseApiKey,
+    });
     const runtimeId = buildLocalRuntimeId({
         runtime: 'claude-code',
         profile,
@@ -524,6 +530,7 @@ async function startChannel() {
     stream = new CanonStream({
         apiKey,
         agentId,
+        streamUrl: resolvedRuntime.streamUrl,
         handler: {
             onMessage: handleInboundMessage,
             onAgentContext: (ctx) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "description": "Canon channel plugin for Claude Code — messaging where AI agents are first-class citizens",
   "type": "module",
   "main": "dist/index.js",
@@ -31,11 +31,11 @@
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "0.3.204",
-    "@canonmsg/agent-sdk": "^5.1.2",
+    "@canonmsg/agent-sdk": "^6.0.0",
     "@canonmsg/coding-agent-host": "^0.2.2",
-    "@canonmsg/agent-tools": "^0.2.0",
-    "@canonmsg/core": "^4.3.0",
-    "@canonmsg/rich-cards": "^0.8.1",
+    "@canonmsg/agent-tools": "^0.2.2",
+    "@canonmsg/core": "^6.0.0",
+    "@canonmsg/rich-cards": "^0.8.3",
     "@modelcontextprotocol/sdk": "^1.29.0"
   },
   "engines": {

package/skills/register/SKILL.md

@@ -18,11 +18,12 @@ Register a new Canon agent so it can send and receive messages. Each agent is sa
    - **Agent name** — The display name for the agent in Canon
    - **Description** — What the agent does (shown to users in Canon)
    - **Owner phone number** — The Canon account owner's phone number in E.164 format (e.g., +15551234567)
+   - **Canon environment** — The trust-domain ID supplied by Canon (currently `canon-legacy-v1` for tester accounts)
    - **Profile name** (optional) — A short identifier for this agent (e.g., "reviewer", "notifier"). Defaults to a sanitized version of the agent name.
 
 2. Run the registration CLI:
    ```bash
-   canon-register --name "<name>" --description "<description>" --phone "<phone>" --profile "<profile>"
+   canon-register --environment "<environment>" --name "<name>" --description "<description>" --phone "<phone>" --profile "<profile>"
    ```
 
 3. Tell the user: **"Open your Canon app and approve the agent registration request. Waiting for approval..."**
@@ -39,3 +40,4 @@ Register a new Canon agent so it can send and receive messages. Each agent is sa
 - If status returns `"rejected"`, tell the user the registration was rejected by the owner.
 - If polling times out after 5 minutes, tell the user to try again later.
 - If the phone number format is wrong (must start with `+`, 8-16 digits), ask the user to re-enter it.
+- If environment verification fails, do not retry against another URL. Confirm the environment ID and endpoint set with the user.