fix(codex): auto-execute after plan confirmation

Author: Him188

cli/src/codex/codexRemoteLauncher.ts

@@ -39,6 +39,8 @@ function shouldUseAppServer(): boolean {
     return !useMcpServer;
 }
 
+const AUTO_EXECUTE_PLAN_PROMPT = 'Plan approved. Exit plan mode and start implementing now.';
+
 class CodexRemoteLauncher extends RemoteLauncherBase {
     private readonly session: CodexSession;
     private readonly useAppServer: boolean;
@@ -313,6 +315,11 @@ class CodexRemoteLauncher extends RemoteLauncherBase {
             return rows.length > 0 ? rows.join('\n') : null;
         };
 
+        let activeTurnMode: EnhancedMode | null = null;
+        let planAutoExecutePending: {
+            turnId: string | null;
+        } | null = null;
+
         const permissionHandler = new CodexPermissionHandler(session.client, {
             getPermissionMode: () => session.getPermissionMode() as EnhancedMode['permissionMode'] | undefined,
             onRequest: ({ id, toolName, input }) => {
@@ -476,10 +483,23 @@ class CodexRemoteLauncher extends RemoteLauncherBase {
                 sendReady();
             }
 
+            if (msgType === 'tool_call_end') {
+                const toolName = asString(msg.name);
+                if (toolName === 'ExitPlanMode' || toolName === 'exit_plan_mode') {
+                    if (session.getCollaborationMode() === 'plan') {
+                        planAutoExecutePending = {
+                            turnId: eventTurnId ?? this.currentTurnId
+                        };
+                        messageBuffer.addMessage('Plan approved. Preparing auto-execution...', 'status');
+                    }
+                }
+            }
+
             if (msgType === 'task_started') {
                 setTurnInFlight(true);
             }
             if (isTerminalTurnEvent) {
+                const terminalTurnId = eventTurnId ?? this.currentTurnId;
                 setTurnInFlight(false);
 
                 const summaryStatus = msgType === 'task_complete'
@@ -505,6 +525,31 @@ class CodexRemoteLauncher extends RemoteLauncherBase {
                     id: randomUUID()
                 });
 
+                const planAutoExecuteMatchedTurn = Boolean(
+                    planAutoExecutePending
+                    && (!planAutoExecutePending.turnId || !terminalTurnId || planAutoExecutePending.turnId === terminalTurnId)
+                );
+                if (msgType === 'task_complete' && planAutoExecuteMatchedTurn) {
+                    const fallbackPermissionMode = session.getPermissionMode() as EnhancedMode['permissionMode'] | undefined;
+                    const executeMode: EnhancedMode = {
+                        ...(activeTurnMode ?? { permissionMode: fallbackPermissionMode ?? 'default' }),
+                        collaborationMode: undefined,
+                        routeContext: undefined
+                    };
+                    session.setCollaborationMode(undefined, { syncMetadata: true });
+                    session.queue.unshift(AUTO_EXECUTE_PLAN_PROMPT, executeMode, {
+                        deferUserMessageUntilDequeue: true
+                    });
+                    session.sendSessionEvent({
+                        type: 'message',
+                        message: 'Plan 已确认，自动切换到默认模式并开始执行。'
+                    });
+                    planAutoExecutePending = null;
+                } else if (planAutoExecuteMatchedTurn) {
+                    planAutoExecutePending = null;
+                }
+                activeTurnMode = null;
+
                 diffProcessor.reset();
                 this.turnChangeTracker.reset();
                 appServerEventConverter?.reset();
@@ -839,6 +884,7 @@ class CodexRemoteLauncher extends RemoteLauncherBase {
             currentModeHash = message.hash;
 
             try {
+                activeTurnMode = message.mode;
                 if (!wasCreated) {
                     if (useAppServer && appServerClient) {
                         const threadParams = buildThreadStartParams({
@@ -968,6 +1014,8 @@ class CodexRemoteLauncher extends RemoteLauncherBase {
                 const isAbortError = error instanceof Error && error.name === 'AbortError';
                 clearLiveActivity();
                 setTurnInFlight(false);
+                activeTurnMode = null;
+                planAutoExecutePending = null;
 
                 if (isAbortError) {
                     messageBuffer.addMessage('Aborted by user', 'status');

cli/src/codex/runCodex.ts

@@ -94,7 +94,12 @@ export async function runCodex(opts: {
         ? (metadataCollaborationMode === 'plan' ? 'plan' : undefined)
         : undefined;
 
+    const getCurrentCollaborationMode = (): EnhancedMode['collaborationMode'] => {
+        return sessionWrapperRef.current?.getCollaborationMode() ?? currentCollaborationMode;
+    };
+
     const syncRuntimeMetadata = (): void => {
+        const collaborationMode = getCurrentCollaborationMode();
         session.updateMetadata((currentMetadata) => {
             const {
                 thinkEffort: _previousThinkEffort,
@@ -106,12 +111,12 @@ export async function runCodex(opts: {
                     ...metadataWithoutRuntime,
                     model: currentModel,
                     thinkEffort: currentEffort,
-                    ...(currentCollaborationMode ? { collaborationMode: currentCollaborationMode } : {})
+                    ...(collaborationMode ? { collaborationMode } : {})
                 }
                 : {
                     ...metadataWithoutRuntime,
                     model: currentModel,
-                    ...(currentCollaborationMode ? { collaborationMode: currentCollaborationMode } : {})
+                    ...(collaborationMode ? { collaborationMode } : {})
                 };
         });
     };
@@ -186,7 +191,7 @@ export async function runCodex(opts: {
             mode: sessionInstance?.mode ?? startingMode,
             sessionId: sessionInstance?.sessionId ?? null,
             permissionMode: currentPermissionMode,
-            collaborationMode: currentCollaborationMode,
+            collaborationMode: getCurrentCollaborationMode(),
             queueSnapshot: getCodexQueueSnapshot()
         });
     };
@@ -223,7 +228,7 @@ export async function runCodex(opts: {
             permissionMode: messagePermissionMode ?? 'default',
             model: currentModel,
             effort: currentEffort,
-            collaborationMode: currentCollaborationMode,
+            collaborationMode: getCurrentCollaborationMode(),
             routeContext: message.meta?.routeContext
         };
         const formattedText = formatMessageWithAttachments(message.content.text, message.content.attachments);
@@ -373,6 +378,7 @@ export async function runCodex(opts: {
 
         if (config.collaborationMode !== undefined) {
             currentCollaborationMode = resolveCollaborationMode(config.collaborationMode);
+            sessionWrapperRef.current?.setCollaborationMode(currentCollaborationMode);
             syncRuntimeMetadata();
         }
 
@@ -385,7 +391,7 @@ export async function runCodex(opts: {
         return {
             applied: {
                 permissionMode: currentPermissionMode,
-                collaborationMode: currentCollaborationMode,
+                collaborationMode: getCurrentCollaborationMode(),
                 thinkEffort: currentEffort
             }
         };
@@ -418,7 +424,7 @@ export async function runCodex(opts: {
                 permissionMode: currentPermissionMode ?? 'default',
                 model: currentModel,
                 effort: currentEffort,
-                collaborationMode: currentCollaborationMode,
+                collaborationMode: getCurrentCollaborationMode(),
                 routeContext: parsed.routeContext
             };
             messageQueue.push(formattedText, enhancedMode, {
@@ -498,6 +504,7 @@ export async function runCodex(opts: {
             onSessionReady: (instance) => {
                 sessionWrapperRef.current = instance;
                 syncSessionMode();
+                instance.setCollaborationMode(currentCollaborationMode);
             }
         });
     } catch (error) {

cli/src/codex/session.ts

@@ -17,6 +17,7 @@ export class CodexSession extends AgentSessionBase<EnhancedMode> {
     readonly startedBy: 'runner' | 'terminal';
     readonly startingMode: 'local' | 'remote';
     localLaunchFailure: LocalLaunchFailure | null = null;
+    private collaborationMode: EnhancedMode['collaborationMode'];
 
     constructor(opts: {
         api: ApiClient;
@@ -32,6 +33,7 @@ export class CodexSession extends AgentSessionBase<EnhancedMode> {
         codexArgs?: string[];
         codexCliOverrides?: CodexCliOverrides;
         permissionMode?: PermissionMode;
+        collaborationMode?: EnhancedMode['collaborationMode'];
     }) {
         super({
             api: opts.api,
@@ -56,12 +58,36 @@ export class CodexSession extends AgentSessionBase<EnhancedMode> {
         this.startedBy = opts.startedBy;
         this.startingMode = opts.startingMode;
         this.permissionMode = opts.permissionMode;
+        this.collaborationMode = opts.collaborationMode;
     }
 
     setPermissionMode = (mode: PermissionMode): void => {
         this.permissionMode = mode;
     };
 
+    setCollaborationMode = (
+        mode: EnhancedMode['collaborationMode'],
+        options?: { syncMetadata?: boolean }
+    ): void => {
+        this.collaborationMode = mode;
+
+        if (options?.syncMetadata) {
+            this.client.updateMetadata((metadata) => {
+                const next = { ...metadata };
+                if (mode) {
+                    next.collaborationMode = mode;
+                } else {
+                    delete next.collaborationMode;
+                }
+                return next;
+            });
+        }
+    };
+
+    getCollaborationMode = (): EnhancedMode['collaborationMode'] => {
+        return this.collaborationMode;
+    };
+
     recordLocalLaunchFailure = (message: string, exitReason: LocalLaunchExitReason): void => {
         this.localLaunchFailure = { message, exitReason };
     };