From c1761a52f2d3e00c1690310bb931a67776a85ea2 Mon Sep 17 00:00:00 2001 From: Mohamed Boudra Date: Wed, 24 Dec 2025 19:28:02 +0700 Subject: [PATCH] Fix codex mcp typecheck errors --- .../server/src/server/agent/providers/codex-mcp-agent.ts | 6 ++---- plan.md | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/server/src/server/agent/providers/codex-mcp-agent.ts b/packages/server/src/server/agent/providers/codex-mcp-agent.ts index 664691558..961918b26 100644 --- a/packages/server/src/server/agent/providers/codex-mcp-agent.ts +++ b/packages/server/src/server/agent/providers/codex-mcp-agent.ts @@ -304,7 +304,6 @@ class CodexMcpAgentSession implements AgentSession { private sessionId: string | null = null; private conversationId: string | null = null; private runtimeModel: string | null = null; - private modelRejected = false; private pendingLocalId: string | null = null; private persistence: AgentPersistenceHandle | null = null; private cachedRuntimeInfo: AgentRuntimeInfo | null = null; @@ -589,7 +588,8 @@ class CodexMcpAgentSession implements AgentSession { : response.interrupt ? "abort" : "denied"; - pending.resolve({ decision, reason: response.message }); + const reason = response.behavior === "deny" ? response.message : undefined; + pending.resolve({ decision, reason }); this.flushQueuedToolEvents(requestId, response.behavior === "allow"); } @@ -679,7 +679,6 @@ class CodexMcpAgentSession implements AgentSession { } catch (error) { if (config.model && isUnsupportedChatGptModelError(error)) { const { model: _ignoredModel, ...fallback } = config; - this.modelRejected = true; this.runtimeModel = null; this.config.model = undefined; response = await attempt(fallback); @@ -703,7 +702,6 @@ class CodexMcpAgentSession implements AgentSession { ); } } catch (error) { - const message = error instanceof Error ? error.message : String(error); if (signal.aborted) { this.emitEvent({ type: "turn_failed", diff --git a/plan.md b/plan.md index 47ec10873..ce757a62c 100644 --- a/plan.md +++ b/plan.md @@ -106,10 +106,11 @@ Build a new Codex MCP provider side‑by‑side with the existing Codex SDK prov - These hacks hide bugs. The provider should work correctly or fail clearly. - **Done (2025-12-24 19:25)**: Reviewed codex-mcp-agent.ts and cataloged all workaround/fallback logic with required real fixes. -- [ ] **Fix**: Resolve typecheck errors in `codex-mcp-agent.ts`. +- [x] **Fix**: Resolve typecheck errors in `codex-mcp-agent.ts`. - Run `npm run typecheck --workspace=@paseo/server`. - Fix `AgentPermissionResponse.message` and unused locals. + - **Done (2025-12-24 19:27)**: Removed unused locals, avoided invalid permission message access, and reran server typecheck. - [ ] **Test (E2E)**: Run tests and verify fixes work.