@canonmsg/codex-plugin 0.9.5 → 0.9.6

package/dist/adapter.d.ts

@@ -66,5 +66,6 @@ export declare class CodexConversationAdapter {
     interrupt(): Promise<void>;
     runTurn(prompt: string, onEvent: (event: CodexEvent) => void, onLog?: (line: string) => void, imagePaths?: readonly string[]): Promise<CodexTurnResult>;
     private buildArgs;
+    private canResumeWithCurrentPolicy;
     private clearActiveProcess;
 }

package/dist/adapter.js

@@ -1,5 +1,6 @@
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';
+import { isRecoverableCodexThreadError } from './error-format.js';
 export class CodexConversationAdapter {
     cwd;
     codexBin;
@@ -121,6 +122,8 @@ export class CodexConversationAdapter {
             if (isIgnorableCodexLog(trimmed))
                 return;
             lastErrorText = trimmed;
+            if (isRecoverableCodexThreadError(trimmed))
+                return;
             onLog?.(trimmed);
         });
         return await new Promise((resolve, reject) => {
@@ -145,7 +148,7 @@ export class CodexConversationAdapter {
         });
     }
     buildArgs(prompt, imagePaths = []) {
-        if (this.threadId) {
+        if (this.threadId && this.canResumeWithCurrentPolicy()) {
             const args = ['exec', 'resume', '--json', '--skip-git-repo-check'];
             if (this.model) {
                 args.push('-m', this.model);
@@ -168,10 +171,12 @@ export class CodexConversationAdapter {
             args.push(this.threadId, prompt);
             return args;
         }
+        if (this.threadId) {
+            this.threadId = null;
+        }
         const args = ['exec', '--json', '--color', 'never', '-C', this.cwd, '--skip-git-repo-check'];
         const execMode = resolveExecMode({
             sandbox: this.sandbox,
-            approvalPolicy: this.legacyApprovalPolicy,
             fullAuto: this.fullAuto,
             bypassApprovalsAndSandbox: this.bypassApprovalsAndSandbox,
         });
@@ -202,6 +207,12 @@ export class CodexConversationAdapter {
         args.push(prompt);
         return args;
     }
+    canResumeWithCurrentPolicy() {
+        if (this.bypassApprovalsAndSandbox || this.fullAuto) {
+            return true;
+        }
+        return this.sandbox === null;
+    }
     clearActiveProcess() {
         if (this.interruptTimer) {
             clearTimeout(this.interruptTimer);
@@ -240,18 +251,8 @@ function resolveExecMode(input) {
     if (input.fullAuto) {
         return { fullAuto: true, bypassApprovalsAndSandbox: false };
     }
-    if (shouldTranslateLegacyApprovalMode(input)) {
-        return { fullAuto: true, bypassApprovalsAndSandbox: false };
-    }
     return { fullAuto: false, bypassApprovalsAndSandbox: false };
 }
-function shouldTranslateLegacyApprovalMode(input) {
-    // Newer Codex CLI releases no longer accept --ask-for-approval for `exec`.
-    // Keep the compatibility shim isolated here so the rest of the adapter only
-    // deals with the supported execution switches.
-    return input.approvalPolicy === 'never'
-        && (input.sandbox === 'workspace-write' || input.sandbox == null);
-}
 function isIgnorableCodexLog(line) {
     return [
         'Reading additional input from stdin...',

package/dist/host.js

@@ -145,6 +145,48 @@ function resolveExecutionFallbackReason(environment) {
         ? null
         : environment.reason;
 }
+function stringArg(args, key) {
+    const value = args[key];
+    return typeof value === 'string' && value.trim() ? value.trim() : undefined;
+}
+function boolArg(args, key) {
+    return args[key] === true;
+}
+function resolveCodexEffectiveRuntimePolicy(input) {
+    const model = input.config?.model ?? stringArg(input.args, 'model');
+    const permissionMode = input.config?.permissionMode ?? input.permissionEnvelope.defaultPermissionMode;
+    if (permissionMode
+        && !input.permissionEnvelope.availablePermissionModes.some((option) => option.value === permissionMode)) {
+        throw new ExecutionEnvironmentError(`Permission mode "${permissionMode}" is not supported by this Codex host.`, 'This Canon host was started with stricter approval settings. Choose one of the advertised permission modes or restart the host with more permissive flags.');
+    }
+    const approvalOverride = mapCanonPermissionToCodex(permissionMode);
+    const defaultSandbox = (stringArg(input.args, 'sandbox') ?? null);
+    const defaultApprovalPolicy = (stringArg(input.args, 'ask-for-approval') ?? null);
+    const sandbox = approvalOverride ? approvalOverride.sandbox : defaultSandbox;
+    const approvalPolicy = approvalOverride ? null : defaultApprovalPolicy;
+    const fullAuto = approvalOverride ? approvalOverride.fullAuto : boolArg(input.args, 'full-auto');
+    const bypassApprovalsAndSandbox = approvalOverride
+        ? approvalOverride.bypassApprovalsAndSandbox
+        : boolArg(input.args, 'dangerously-bypass-approvals-and-sandbox');
+    const fingerprint = buildCodexThreadPolicyFingerprint({
+        baseCwd: input.environment.baseCwd,
+        executionMode: input.environment.mode,
+        permissionMode: permissionMode ?? null,
+        sandbox,
+        approvalPolicy,
+        fullAuto,
+        bypassApprovalsAndSandbox,
+    });
+    return {
+        ...(model ? { model } : {}),
+        ...(permissionMode ? { permissionMode } : {}),
+        sandbox,
+        approvalPolicy,
+        fullAuto,
+        bypassApprovalsAndSandbox,
+        fingerprint,
+    };
+}
 function buildCanonPrompt(input) {
     return buildCanonHostPrompt({
         hostLabel: 'Codex',
@@ -184,6 +226,11 @@ export async function main() {
         },
         strict: true,
     });
+    if (typeof args['ask-for-approval'] === 'string') {
+        console.error('[canon-codex] --ask-for-approval is no longer supported by Canon. Use --full-auto, --sandbox, or Canon permission modes instead.');
+        process.exitCode = 1;
+        return;
+    }
     workingDir = (typeof args.cwd === 'string' ? args.cwd : null) || process.cwd();
     const workspaceDiscovery = buildConfiguredWorkspaceOptionsWithRoots({
         primaryCwd: workingDir,
@@ -196,9 +243,6 @@ export async function main() {
     for (const warning of workspaceDiscovery.warnings) {
         console.error(`[canon-codex] ${warning}`);
     }
-    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.');
-    }
     const codexBin = typeof args['codex-bin'] === 'string' ? args['codex-bin'] : 'codex';
     const codexCliStatus = detectCodexCliVersion(codexBin);
     if (codexCliStatus.version) {
@@ -311,10 +355,19 @@ export async function main() {
         });
     }
     function writeState(session) {
+        const appliedAt = Date.now();
+        const controlState = {};
+        if (session.state.model !== undefined) {
+            controlState.model = { value: session.state.model, source: 'applied', appliedAt };
+        }
+        if (session.state.permissionMode !== undefined) {
+            controlState.permissionMode = { value: session.state.permissionMode, source: 'applied', appliedAt };
+        }
         runtimeState.writeSessionState(session.conversationId, {
             lastError: session.state.lastError,
             model: session.state.model,
             permissionMode: session.state.permissionMode,
+            controlState,
             cwd: session.cwd,
             executionMode: session.environment.mode,
             ...(session.environment.branch ? { executionBranch: session.environment.branch } : {}),
@@ -433,38 +486,17 @@ export async function main() {
             });
             try {
                 const sessionCwd = environment.cwd;
-                const sessionModel = config?.model ?? (typeof args.model === 'string' ? args.model : undefined);
-                const modelGuard = buildCodexModelGuardMessage(sessionModel, codexCliStatus);
+                const policy = resolveCodexEffectiveRuntimePolicy({
+                    args,
+                    config,
+                    permissionEnvelope: codexPermissionEnvelope,
+                    environment,
+                });
+                const modelGuard = buildCodexModelGuardMessage(policy.model, codexCliStatus);
                 if (modelGuard) {
                     throw new ExecutionEnvironmentError(modelGuard, modelGuard);
                 }
-                const effectivePermissionMode = config?.permissionMode ?? codexPermissionEnvelope.defaultPermissionMode;
-                if (effectivePermissionMode
-                    && !codexPermissionEnvelope.availablePermissionModes.some((option) => option.value === effectivePermissionMode)) {
-                    throw new ExecutionEnvironmentError(`Permission mode "${effectivePermissionMode}" is not supported by this Codex host.`, 'This Canon host was started with stricter approval settings. Choose one of the advertised permission modes or restart the host with more permissive flags.');
-                }
-                const approvalOverride = mapCanonPermissionToCodex(effectivePermissionMode);
-                const defaultSandbox = (typeof args.sandbox === 'string' ? args.sandbox : null);
-                const defaultFullAuto = Boolean(args['full-auto']);
-                const defaultBypass = Boolean(args['dangerously-bypass-approvals-and-sandbox']);
-                const legacyApprovalPolicy = (typeof args['ask-for-approval'] === 'string'
-                    ? args['ask-for-approval']
-                    : null);
-                const effectiveSandbox = approvalOverride ? approvalOverride.sandbox : defaultSandbox;
-                const effectiveFullAuto = approvalOverride ? approvalOverride.fullAuto : defaultFullAuto;
-                const effectiveBypass = approvalOverride
-                    ? approvalOverride.bypassApprovalsAndSandbox
-                    : defaultBypass;
-                const policyFingerprint = buildCodexThreadPolicyFingerprint({
-                    baseCwd: environment.baseCwd,
-                    executionMode: environment.mode,
-                    permissionMode: effectivePermissionMode ?? null,
-                    sandbox: effectiveSandbox,
-                    approvalPolicy: approvalOverride ? null : legacyApprovalPolicy,
-                    fullAuto: effectiveFullAuto,
-                    bypassApprovalsAndSandbox: effectiveBypass,
-                });
-                const storedThreadId = loadStoredThreadId(runtimeId, agentId, conversationId, environment.baseCwd, environment.mode, policyFingerprint);
+                const storedThreadId = loadStoredThreadId(runtimeId, agentId, conversationId, environment.baseCwd, environment.mode, policy.fingerprint);
                 const session = {
                     conversationId,
                     cwd: sessionCwd,
@@ -473,23 +505,23 @@ export async function main() {
                         cwd: sessionCwd,
                         threadId: storedThreadId,
                         codexBin,
-                        model: sessionModel ?? null,
-                        sandbox: effectiveSandbox,
-                        approvalPolicy: approvalOverride ? null : legacyApprovalPolicy,
+                        model: policy.model ?? null,
+                        sandbox: policy.sandbox,
+                        approvalPolicy: policy.approvalPolicy,
                         codexProfile: typeof args['codex-profile'] === 'string' ? args['codex-profile'] : null,
                         addDirs: args['add-dir'] ?? [],
                         configOverrides: args.config ?? [],
-                        fullAuto: effectiveFullAuto,
-                        bypassApprovalsAndSandbox: effectiveBypass,
+                        fullAuto: policy.fullAuto,
+                        bypassApprovalsAndSandbox: policy.bypassApprovalsAndSandbox,
                     }),
                     queue: [],
                     running: false,
                     state: {
-                        model: sessionModel,
-                        permissionMode: effectivePermissionMode,
+                        model: policy.model,
+                        permissionMode: policy.permissionMode,
                         state: 'idle',
                     },
-                    policyFingerprint,
+                    policyFingerprint: policy.fingerprint,
                     turnState: 'idle',
                     currentTurnId: null,
                     currentTurnOpenedAt: null,

package/dist/permission-mode.js

@@ -22,10 +22,6 @@ function codexOptionsThrough(mode) {
     const index = CODEX_PERMISSION_OPTIONS.findIndex((option) => option.value === mode);
     return index >= 0 ? CODEX_PERMISSION_OPTIONS.slice(0, index + 1) : [];
 }
-function isLegacyFullAuto(args) {
-    return args['ask-for-approval'] === 'never'
-        && (args.sandbox === 'workspace-write' || args.sandbox == null);
-}
 export function deriveCodexPermissionEnvelope(args) {
     if (args.sandbox === 'read-only') {
         return {
@@ -46,7 +42,7 @@ export function deriveCodexPermissionEnvelope(args) {
             availablePermissionModes: [...CODEX_PERMISSION_OPTIONS],
         };
     }
-    if (args['full-auto'] || isLegacyFullAuto(args)) {
+    if (args['full-auto']) {
         return {
             defaultPermissionMode: 'full-auto',
             availablePermissionModes: codexOptionsThrough('full-auto'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canonmsg/codex-plugin",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "description": "Canon host integration for Codex CLI",
   "type": "module",
   "main": "dist/index.js",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@canonmsg/agent-sdk": "^1.1.0",
-    "@canonmsg/core": "^0.15.1"
+    "@canonmsg/core": "^0.15.2"
   },
   "engines": {
     "node": ">=18.0.0"