@canonmsg/codex-plugin 0.6.1 → 0.6.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,15 +1,15 @@
 #!/usr/bin/env node
 import { setDefaultResultOrder } from 'node:dns';
-setDefaultResultOrder('ipv4first');
 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';
 import { clearStoredThreadId, loadStoredThreadId, saveStoredThreadId, } from './session-store.js';
 import { deriveCodexPermissionEnvelope, mapCanonPermissionToCodex, } from './permission-mode.js';
+import { runCli } from './cli-entry.js';
 const MAX_SESSIONS = 12;
 const IDLE_TIMEOUT_MS = 30 * 60 * 1000;
 const HEARTBEAT_MS = 30_000;
@@ -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({
@@ -92,7 +90,8 @@ function formatTurnFailure(errorText) {
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
-async function main() {
+export async function main() {
+    setDefaultResultOrder('ipv4first');
     const { values: args } = parseArgs({
         options: {
             cwd: { type: 'string' },
@@ -105,17 +104,12 @@ 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.');
     }
@@ -255,10 +249,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,
@@ -547,9 +538,9 @@ 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,
@@ -765,7 +756,7 @@ async function main() {
     console.error('[canon-codex] Ready — sessions created on demand');
     await new Promise(() => { });
 }
-main().catch((error) => {
+runCli(import.meta.url, main, (error) => {
     console.error('[canon-codex] Fatal error:', error);
     const activeProfile = getActiveProfile();
     if (activeProfile)

package/dist/index.d.ts

@@ -0,0 +1,3 @@
+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,3 @@
+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,83 +1,90 @@
 #!/usr/bin/env node
 import { setDefaultResultOrder } from 'node:dns';
-setDefaultResultOrder('ipv4first');
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { parseArgs } from 'node:util';
 import { registerAndWaitForApproval } from '@canonmsg/core';
+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: canon-codex-register --name "Agent Name" --description "Description" --phone "+15551234567" [--profile "my-agent"]');
-    process.exit(1);
-}
-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 {
-    // No existing profile state.
-}
-console.log(`Registering Codex agent "${values.name}" (profile: ${profileName})...`);
-const result = await registerAndWaitForApproval({
-    name: values.name,
-    description: values.description,
-    ownerPhone: values.phone,
-    developerInfo: 'Codex host plugin',
-    clientType: 'codex',
-    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('');
-switch (result.status) {
-    case 'approved': {
-        mkdirSync(CANON_DIR, { recursive: true });
-        let profiles = {};
-        try {
-            profiles = JSON.parse(readFileSync(AGENTS_PATH, 'utf-8'));
-        }
-        catch {
-            // File does not 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: canon-codex-register --name "Agent Name" --description "Description" --phone "+15551234567" [--profile "my-agent"]');
+        process.exit(1);
+    }
+    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 {
+        // No existing profile state.
+    }
+    console.log(`Registering Codex agent "${values.name}" (profile: ${profileName})...`);
+    const result = await registerAndWaitForApproval({
+        name: values.name,
+        description: values.description,
+        ownerPhone: values.phone,
+        developerInfo: 'Codex host plugin',
+        clientType: 'codex',
+        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('');
+    switch (result.status) {
+        case 'approved': {
+            mkdirSync(CANON_DIR, { recursive: true });
+            let profiles = {};
+            try {
+                profiles = JSON.parse(readFileSync(AGENTS_PATH, 'utf-8'));
+            }
+            catch {
+                // File does not 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('Start it with: canon-codex --cwd /path/to/project');
+            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('Start it with: canon-codex --cwd /path/to/project');
-        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-codex-register] Fatal error:', error);
+    process.exit(1);
+});

package/dist/setup.d.ts

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

package/dist/setup.js

@@ -1,32 +1,39 @@
 #!/usr/bin/env node
 import { spawnSync } from 'node:child_process';
-console.log('Canon Codex Plugin Setup');
-console.log('========================\n');
-const version = spawnSync('codex', ['--version'], { encoding: 'utf-8' });
-if (version.status === 0) {
-    console.log(`Detected Codex CLI: ${version.stdout.trim()}\n`);
+import { runCli } from './cli-entry.js';
+export function main() {
+    console.log('Canon Codex Plugin Setup');
+    console.log('========================\n');
+    const version = spawnSync('codex', ['--version'], { encoding: 'utf-8' });
+    if (version.status === 0) {
+        console.log(`Detected Codex CLI: ${version.stdout.trim()}\n`);
+    }
+    else {
+        console.log('Codex CLI was not detected on PATH.');
+        console.log('Install Codex first, then rerun this setup.\n');
+    }
+    console.log('Next steps:');
+    console.log('  0. Confirm Codex is logged in the way you want Canon to use');
+    console.log('     codex login status');
+    console.log('');
+    console.log('  1. Register your agent');
+    console.log('     canon-codex-register --name "My Codex" --description "My local coding agent" --phone "+15551234567"');
+    console.log('');
+    console.log('  2. Start the host in a project directory and keep it running');
+    console.log('     canon-codex --cwd /path/to/project');
+    console.log('');
+    console.log('     A git repo is not required; any readable directory works.');
+    console.log('');
+    console.log('Optional flags:');
+    console.log('  --model gpt-5.4');
+    console.log('  --sandbox workspace-write');
+    console.log('  --full-auto');
+    console.log('');
+    console.log('Note: recent Codex CLI versions use --full-auto for non-interactive write access.');
+    console.log('Note: Canon uses the local Codex login state by default (for example ChatGPT/device auth or API-key auth).');
+    console.log('Note: If Canon starts returning "Invalid API key", rerun canon-codex-register to replace the saved profile and then restart the host.');
 }
-else {
-    console.log('Codex CLI was not detected on PATH.');
-    console.log('Install Codex first, then rerun this setup.\n');
-}
-console.log('Next steps:');
-console.log('  0. Confirm Codex is logged in the way you want Canon to use');
-console.log('     codex login status');
-console.log('');
-console.log('  1. Register your agent');
-console.log('     canon-codex-register --name "My Codex" --description "My local coding agent" --phone "+15551234567"');
-console.log('');
-console.log('  2. Start the host in a project directory and keep it running');
-console.log('     canon-codex --cwd /path/to/project');
-console.log('');
-console.log('     A git repo is not required; any readable directory works.');
-console.log('');
-console.log('Optional flags:');
-console.log('  --model gpt-5.4');
-console.log('  --sandbox workspace-write');
-console.log('  --full-auto');
-console.log('');
-console.log('Note: recent Codex CLI versions use --full-auto for non-interactive write access.');
-console.log('Note: Canon uses the local Codex login state by default (for example ChatGPT/device auth or API-key auth).');
-console.log('Note: If Canon starts returning "Invalid API key", rerun canon-codex-register to replace the saved profile and then restart the host.');
+runCli(import.meta.url, main, (error) => {
+    console.error('[canon-codex-setup] Fatal error:', error);
+    process.exit(1);
+});

package/package.json

@@ -1,10 +1,16 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Canon host integration for Codex CLI",
   "type": "module",
-  "main": "dist/host.js",
-  "types": "dist/host.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "bin": {
     "canon-codex": "dist/host.js",
     "canon-codex-register": "dist/register.js",
@@ -23,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"