@canonmsg/claude-code-plugin 0.9.2 → 0.9.3

package/dist/cli-entry.js

@@ -1,10 +1,20 @@
+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;
-    return pathToFileURL(resolve(entry)).href === moduleUrl;
+    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)) {

package/dist/host.js

@@ -22,9 +22,11 @@ import { setDefaultResultOrder } from 'node:dns';
  */
 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';
@@ -32,6 +34,42 @@ 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 {
@@ -672,17 +719,12 @@ export async function main() {
         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 ──
@@ -707,9 +749,9 @@ export 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',
@@ -834,10 +876,7 @@ export 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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/claude-code-plugin",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Canon channel plugin for Claude Code — messaging where AI agents are first-class citizens",
   "type": "module",
   "main": "dist/index.js",
@@ -31,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": {