@canonmsg/codex-plugin 0.6.2 → 0.6.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

@@ -3,7 +3,7 @@ import { setDefaultResultOrder } from 'node:dns';
 import { randomUUID } from 'node:crypto';
 import { parseArgs } from 'node:util';
 import { getCodexImagePath, materializeMessageMedia, } from '@canonmsg/agent-sdk';
-import { buildConfiguredWorkspaceOptions, buildPublicWorkspaceOptions, EXECUTION_ENVIRONMENT_MODES, ExecutionEnvironmentError, isEnabledFlag, CanonClient, CanonStream, clearSessionState, clearTurnState, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, FINAL_MESSAGE_HANDOFF_MS, getActiveProfile, initRTDBAuth, normalizeTurnMetadata, normalizeTurnState, prepareConversationEnvironment, releaseLock, releaseConversationEnvironment, resolveCanonAgent, rtdbRead, rtdbWrite, shouldTriggerAgentTurn, writeSessionState, writeTurnState, } from '@canonmsg/core';
+import { buildConfiguredWorkspaceOptions, buildPublicWorkspaceOptions, EXECUTION_ENVIRONMENT_MODES, ExecutionEnvironmentError, CanonClient, CanonStream, clearSessionState, clearTurnState, DEFAULT_PARTICIPATION_HISTORY_FETCH_LIMIT, DEFAULT_RUNTIME_CAPABILITIES, FINAL_MESSAGE_HANDOFF_MS, getActiveProfile, initRTDBAuth, normalizeTurnMetadata, normalizeTurnState, prepareConversationEnvironment, releaseLock, releaseConversationEnvironment, resolveCanonAgent, rtdbRead, rtdbWrite, shouldTriggerAgentTurn, writeSessionState, writeTurnState, } from '@canonmsg/core';
 import { buildCanonHostPrompt, buildHydratedInboundContext, createConversationMetadataLoader, loadHostSessionConfig, publishHostAgentRuntime, renderCanonHostInboundContent, resolveHostWorkspaceCwd, } from './host-runtime.js';
 import { buildInboundContextLines, decideAutoReply, } from './inbound-policy.js';
 import { CodexConversationAdapter, } from './adapter.js';
@@ -49,13 +49,11 @@ async function loadSessionConfig(conversationId, agentId) {
         extraStringFields: ['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({
@@ -106,17 +104,12 @@ export async function main() {
             config: { type: 'string', multiple: true },
             'codex-bin': { type: 'string' },
             'full-auto': { type: 'boolean' },
-            'enable-worktrees': { type: 'boolean' },
             'dangerously-bypass-approvals-and-sandbox': { type: 'boolean' },
         },
         strict: true,
     });
     workingDir = (typeof args.cwd === 'string' ? args.cwd : null) || process.cwd();
     workspaceOptions = buildConfiguredWorkspaceOptions(workingDir, args.workspace ?? []);
-    const allowWorktrees = isEnabledFlag(args['enable-worktrees'] ?? process.env.CANON_ENABLE_WORKTREES);
-    if (!allowWorktrees) {
-        console.error('[canon-codex] Worktree isolation is disabled; sessions will lock their selected workspace unless explicitly enabled.');
-    }
     if (typeof args['ask-for-approval'] === 'string') {
         console.error('[canon-codex] Note: newer Codex CLI releases do not accept --ask-for-approval for `codex exec`; Canon will translate compatible legacy usage when possible.');
     }
@@ -256,10 +249,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,
@@ -548,9 +538,9 @@ export async function main() {
     }
     let controlStopped = false;
     let streamConnected = false;
-    const hostAvailableExecutionModes = allowWorktrees
-        ? [...EXECUTION_ENVIRONMENT_MODES]
-        : ['locked'];
+    const hostAvailableExecutionModes = [
+        ...EXECUTION_ENVIRONMENT_MODES,
+    ];
     const codexPermissionEnvelope = deriveCodexPermissionEnvelope(args);
     let runtimeDescriptor = {
         defaultWorkspaceId: workspaceOptions[0]?.id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "Canon host integration for Codex CLI",
   "type": "module",
   "main": "dist/index.js",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@canonmsg/agent-sdk": "^0.8.1",
-    "@canonmsg/core": "^0.7.1"
+    "@canonmsg/core": "^0.7.2"
   },
   "engines": {
     "node": ">=18.0.0"