@canonmsg/claude-code-plugin 0.9.1 → 0.9.3

package/dist/cli-entry.d.ts

@@ -0,0 +1,2 @@
+export declare function isDirectExecution(moduleUrl: string): boolean;
+export declare function runCli(moduleUrl: string, main: () => void | Promise<void>, onError: (error: unknown) => void): void;

package/dist/cli-entry.js

@@ -0,0 +1,26 @@
+import { realpathSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { pathToFileURL } from 'node:url';
+export function isDirectExecution(moduleUrl) {
+    const entry = process.argv[1];
+    if (!entry)
+        return false;
+    const abs = resolve(entry);
+    let real = abs;
+    try {
+        real = realpathSync(abs);
+    }
+    catch {
+        // argv[1] may not exist on disk in rare harnesses; fall back to abs
+    }
+    return (pathToFileURL(real).href === moduleUrl ||
+        pathToFileURL(abs).href === moduleUrl);
+}
+export function runCli(moduleUrl, main, onError) {
+    if (!isDirectExecution(moduleUrl)) {
+        return;
+    }
+    Promise.resolve()
+        .then(() => main())
+        .catch(onError);
+}

package/dist/host.d.ts

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-export {};
+export declare function main(): Promise<void>;

package/dist/host.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 import { setDefaultResultOrder } from 'node:dns';
-setDefaultResultOrder('ipv4first');
 /**
  * Canon Agent SDK host wrapper — multi-session.
  *
@@ -23,15 +22,54 @@ setDefaultResultOrder('ipv4first');
  */
 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 { isAnthropicImageAttachment, materializeMessageMedia, toAnthropicImageBlock, } from '@canonmsg/agent-sdk';
-import { buildConfiguredWorkspaceOptions, buildConversationEnvironmentKey, buildPublicWorkspaceOptions, EXECUTION_ENVIRONMENT_MODES, isEnabledFlag, 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 { 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 { 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 = [];
+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
+// SIGKILL'd at launch (path-based code-sign enforcement) even though a
+// byte-identical copy at ~/.local/bin/claude runs fine. Prefer whatever is on
+// PATH; fall back to the bundled one.
+function resolveClaudeCliPath() {
+    if (cachedClaudeCliPath !== undefined) {
+        return cachedClaudeCliPath ?? undefined;
+    }
+    const override = process.env.CANON_CLAUDE_CLI_PATH?.trim();
+    if (override) {
+        if (existsSync(override)) {
+            cachedClaudeCliPath = override;
+            console.error(`[canon-host] claude CLI override: ${override}`);
+            return override;
+        }
+        console.error(`[canon-host] CANON_CLAUDE_CLI_PATH=${override} not found; ignoring`);
+    }
+    try {
+        const resolved = execFileSync('/bin/sh', ['-c', 'command -v claude'], {
+            encoding: 'utf8',
+        }).trim();
+        if (resolved && existsSync(resolved)) {
+            cachedClaudeCliPath = resolved;
+            console.error(`[canon-host] claude CLI on PATH: ${resolved}`);
+            return resolved;
+        }
+    }
+    catch {
+        // `command -v` exits non-zero when claude isn't on PATH; fall through.
+    }
+    cachedClaudeCliPath = null;
+    console.error('[canon-host] claude CLI not on PATH; using SDK-bundled binary');
+    return undefined;
+}
 function toModelOptions(models) {
     return models.map((model) => ({
         value: model.value,
@@ -52,13 +90,11 @@ async function loadSessionConfig(conversationId, agentId) {
         permissionMode: config?.permissionMode,
     };
 }
-const SESSION_EXECUTION_MODE_REQUIRED = 'Session execution mode required; please select a mode before starting the session.';
-function requireSessionExecutionMode(config) {
-    const mode = config?.executionMode;
-    if (!mode) {
-        throw new ExecutionEnvironmentError(SESSION_EXECUTION_MODE_REQUIRED, SESSION_EXECUTION_MODE_REQUIRED);
-    }
-    return mode;
+// Default to 'locked' (shared workspace) when no mode has been picked. The
+// UI still lets owners flip to 'worktree'; this just stops sessions from
+// failing closed when the mode has never been written.
+function resolveSessionExecutionMode(config) {
+    return config?.executionMode ?? 'locked';
 }
 function resolveWorkspaceCwd(config) {
     return resolveHostWorkspaceCwd({
@@ -71,6 +107,7 @@ async function detectRuntimeModels(cwd) {
     const emptyPrompt = {
         async *[Symbol.asyncIterator]() { },
     };
+    const claudeCliPath = resolveClaudeCliPath();
     const probe = query({
         prompt: emptyPrompt,
         options: {
@@ -79,6 +116,7 @@ async function detectRuntimeModels(cwd) {
             permissionMode: 'default',
             cwd,
             settings: { forceLoginMethod: 'claudeai' },
+            ...(claudeCliPath ? { pathToClaudeCodeExecutable: claudeCliPath } : {}),
         },
     });
     try {
@@ -200,6 +238,7 @@ function createSession(conversationId, environment, agentId, client, onSessionEn
             };
         });
     }
+    const claudeCliPath = resolveClaudeCliPath();
     const queryOptions = {
         systemPrompt: { type: 'preset', preset: 'claude_code' },
         tools: { type: 'preset', preset: 'claude_code' },
@@ -208,6 +247,14 @@ function createSession(conversationId, environment, agentId, client, onSessionEn
         includePartialMessages: true,
         maxTurns: 200,
         settings: { forceLoginMethod: 'claudeai' },
+        settingSources: ['project', 'local'],
+        ...(claudeCliPath ? { pathToClaudeCodeExecutable: claudeCliPath } : {}),
+        stderr: (data) => {
+            const trimmed = data.toString().trim();
+            if (trimmed) {
+                console.error(`[claude-cli] [${conversationId.slice(0, 8)}] ${trimmed}`);
+            }
+        },
         canUseTool: async (toolName, input) => {
             if (toolName === 'AskUserQuestion') {
                 try {
@@ -666,22 +713,18 @@ function createSession(conversationId, environment, agentId, client, onSessionEn
     return session;
 }
 // ── Main ────────────────────────────────────────────────────────────
-async function main() {
+export async function main() {
+    setDefaultResultOrder('ipv4first');
     const { values: args } = parseArgs({
         options: {
             cwd: { type: 'string' },
             workspace: { type: 'string', multiple: true },
-            'enable-worktrees': { type: 'boolean' },
         },
         strict: false,
     });
     workingDir = (typeof args.cwd === 'string' ? args.cwd : null) || process.cwd();
     const configuredWorkspaces = (args.workspace ?? []).filter((value) => typeof value === 'string');
     workspaceOptions = buildConfiguredWorkspaceOptions(workingDir, configuredWorkspaces);
-    const allowWorktrees = isEnabledFlag(args['enable-worktrees'] ?? process.env.CANON_ENABLE_WORKTREES);
-    if (!allowWorktrees) {
-        console.error('[canon-host] Worktree isolation is disabled; sessions will lock their selected workspace unless explicitly enabled.');
-    }
     const { apiKey, agentId: profileAgentId, profile } = resolveCanonAgent({ logPrefix: '[canon-host]' });
     console.error(`[canon-host] Starting${profile ? ` (profile: ${profile})` : ''} in ${workingDir}`);
     // ── Canon API client + RTDB auth ──
@@ -706,9 +749,9 @@ async function main() {
         console.error(`[canon-host] Authenticated as ${agentId}`);
     }
     let streamConnected = false;
-    const hostAvailableExecutionModes = allowWorktrees
-        ? [...EXECUTION_ENVIRONMENT_MODES]
-        : ['locked'];
+    const hostAvailableExecutionModes = [
+        ...EXECUTION_ENVIRONMENT_MODES,
+    ];
     let runtimeDescriptor = {
         defaultWorkspaceId: workspaceOptions[0]?.id,
         defaultPermissionMode: 'default',
@@ -833,10 +876,7 @@ async function main() {
         }
         const creation = (async () => {
             const config = await loadSessionConfig(conversationId, agentId);
-            const sessionExecutionMode = requireSessionExecutionMode(config);
-            if (sessionExecutionMode === 'worktree' && !allowWorktrees) {
-                throw new ExecutionEnvironmentError('This host does not allow worktree sessions (launched without --enable-worktrees).', 'This Canon host was started without worktree isolation enabled. Choose "Lock the workspace" or restart the host with --enable-worktrees.');
-            }
+            const sessionExecutionMode = resolveSessionExecutionMode(config);
             const workspaceCwd = resolveWorkspaceCwd(config);
             const environment = prepareConversationEnvironment({
                 agentId,
@@ -1156,7 +1196,7 @@ async function main() {
     await new Promise(() => { });
 }
 // ── Entry ───────────────────────────────────────────────────────────
-main().catch((err) => {
+runCli(import.meta.url, main, (err) => {
     console.error('[canon-host] Fatal error:', err);
     const ap = getActiveProfile();
     if (ap)

package/dist/index.d.ts

@@ -0,0 +1,4 @@
+export { main as serverMain } from './server.js';
+export { main as hostMain } from './host.js';
+export { main as registerMain } from './register.js';
+export { main as setupMain } from './setup.js';

package/dist/index.js

@@ -0,0 +1,4 @@
+export { main as serverMain } from './server.js';
+export { main as hostMain } from './host.js';
+export { main as registerMain } from './register.js';
+export { main as setupMain } from './setup.js';

package/dist/register.d.ts

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-export {};
+export declare function main(): Promise<void>;

package/dist/register.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 import { setDefaultResultOrder } from 'node:dns';
-setDefaultResultOrder('ipv4first');
 /**
  * CLI script for Canon agent registration.
  * Invoked by the /canon-register skill.
@@ -15,80 +14,88 @@ import { readFileSync, writeFileSync, mkdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { homedir } from 'node:os';
 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');
-const { values } = parseArgs({
-    options: {
-        name: { type: 'string' },
-        description: { type: 'string' },
-        phone: { type: 'string' },
-        profile: { type: 'string' },
-        'base-url': { type: 'string' },
-    },
-    strict: true,
-});
-if (!values.name || !values.description || !values.phone) {
-    console.error('Usage: node register.js --name "Agent Name" --description "Description" --phone "+15551234567" [--profile "my-agent"]');
-    process.exit(1);
-}
-// 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
-}
-console.log(`Registering agent "${values.name}" (profile: ${profileName})...`);
-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,
-}, {
-    onSubmitted: (requestId) => {
-        console.log(`Registration submitted (request ID: ${requestId}).`);
-        console.log('Waiting for approval in Canon app...');
-    },
-    onPollUpdate: () => {
-        process.stdout.write('.');
-    },
-});
-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'));
-        }
-        catch {
-            // File doesn't exist yet
+export async function main() {
+    setDefaultResultOrder('ipv4first');
+    const { values } = parseArgs({
+        options: {
+            name: { type: 'string' },
+            description: { type: 'string' },
+            phone: { type: 'string' },
+            profile: { type: 'string' },
+            'base-url': { type: 'string' },
+        },
+        strict: true,
+    });
+    if (!values.name || !values.description || !values.phone) {
+        console.error('Usage: node register.js --name "Agent Name" --description "Description" --phone "+15551234567" [--profile "my-agent"]');
+        process.exit(1);
+    }
+    // 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
+    }
+    console.log(`Registering agent "${values.name}" (profile: ${profileName})...`);
+    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,
+    }, {
+        onSubmitted: (requestId) => {
+            console.log(`Registration submitted (request ID: ${requestId}).`);
+            console.log('Waiting for approval in Canon app...');
+        },
+        onPollUpdate: () => {
+            process.stdout.write('.');
+        },
+    });
+    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'));
+            }
+            catch {
+                // File doesn't exist yet
+            }
+            profiles[profileName] = {
+                apiKey: result.apiKey,
+                agentId: result.agentId,
+                agentName: result.agentName,
+                registeredAt: new Date().toISOString(),
+            };
+            writeFileSync(AGENTS_PATH, JSON.stringify(profiles, null, 2));
+            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.');
+            break;
         }
-        profiles[profileName] = {
-            apiKey: result.apiKey,
-            agentId: result.agentId,
-            agentName: result.agentName,
-            registeredAt: new Date().toISOString(),
-        };
-        writeFileSync(AGENTS_PATH, JSON.stringify(profiles, null, 2));
-        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.');
-        break;
+        case 'rejected':
+            console.log('Registration was rejected.');
+            process.exit(1);
+            break;
+        case 'timeout':
+            console.log('Registration timed out (5 minutes). Try again later.');
+            process.exit(1);
+            break;
     }
-    case 'rejected':
-        console.log('Registration was rejected.');
-        process.exit(1);
-        break;
-    case 'timeout':
-        console.log('Registration timed out (5 minutes). Try again later.');
-        process.exit(1);
-        break;
 }
+runCli(import.meta.url, main, (error) => {
+    console.error('[canon-register] Fatal error:', error);
+    process.exit(1);
+});

package/dist/server.d.ts

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-export {};
+export declare function main(): Promise<void>;

package/dist/server.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 import { setDefaultResultOrder } from 'node:dns';
-setDefaultResultOrder('ipv4first');
 /**
  * Canon channel MCP server for Claude Code.
  *
@@ -13,6 +12,7 @@ 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 { ApprovalHttpServer } from './approval-server.js';
+import { runCli } from './cli-entry.js';
 // ── MCP server ─────────────────────────────────────────────────────────
 const server = new Server({ name: 'canon-channel', version: '0.1.0' }, {
     capabilities: {
@@ -593,7 +593,8 @@ async function startChannel() {
     }
 }
 // ── Main ───────────────────────────────────────────────────────────────
-async function main() {
+export async function main() {
+    setDefaultResultOrder('ipv4first');
     const transport = new StdioServerTransport();
     await server.connect(transport);
     // Start the Canon channel after MCP connection is established
@@ -617,7 +618,7 @@ async function main() {
     process.on('SIGINT', shutdown);
     process.on('SIGTERM', shutdown);
 }
-main().catch((err) => {
+runCli(import.meta.url, main, (err) => {
     console.error('[canon] Fatal error:', err);
     process.exit(1);
 });

package/dist/setup.d.ts

@@ -6,4 +6,4 @@
  * 1. Install the /canon-register and /canon-configure skills
  * 2. Show the user how to add the MCP server to their .mcp.json
  */
-export {};
+export declare function main(): void;

package/dist/setup.js

@@ -9,6 +9,7 @@
 import { mkdirSync, writeFileSync, existsSync, readFileSync } from 'node:fs';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { runCli } from './cli-entry.js';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const home = process.env.HOME || process.env.USERPROFILE || '';
 const skillsDir = join(home, '.claude', 'skills');
@@ -55,12 +56,18 @@ Then start Claude Code with:
 `);
 }
 // ── Main ───────────────────────────────────────────────────────────────
-console.log('Canon Claude Code Plugin Setup');
-console.log('==============================\n');
-console.log('Installing skills...');
-installSkills();
-console.log('\nRegistering your agent...');
-console.log('  Run /canon-register in Claude Code to register a new agent');
-console.log('  Run /canon-configure if you already have an API key\n');
-console.log('MCP server configuration:');
-showMcpInstructions();
+export function main() {
+    console.log('Canon Claude Code Plugin Setup');
+    console.log('==============================\n');
+    console.log('Installing skills...');
+    installSkills();
+    console.log('\nRegistering your agent...');
+    console.log('  Run /canon-register in Claude Code to register a new agent');
+    console.log('  Run /canon-configure if you already have an API key\n');
+    console.log('MCP server configuration:');
+    showMcpInstructions();
+}
+runCli(import.meta.url, main, (error) => {
+    console.error('[canon-setup] Fatal error:', error);
+    process.exit(1);
+});

package/package.json

@@ -1,9 +1,16 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "Canon channel plugin for Claude Code — messaging where AI agents are first-class citizens",
   "type": "module",
-  "main": "dist/server.js",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "bin": {
     "canon-channel-server": "dist/server.js",
     "canon-claude": "dist/host.js",
@@ -24,7 +31,7 @@
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.101",
     "@canonmsg/agent-sdk": "^0.8.1",
-    "@canonmsg/core": "^0.7.1",
+    "@canonmsg/core": "^0.7.2",
     "@modelcontextprotocol/sdk": "^1.12.0"
   },
   "engines": {