Skip to content

A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.

feat: add support for Codex agent (#6901)

Myles Scolnicke4773cb4b538
diff --git a/frontend/package.json b/frontend/package.json
index 9247b5169a..9752a47db4 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -166,7 +166,7 @@
"thememirror": "^2.0.1",
"timestring": "^7.0.0",
"typescript-memoize": "^1.1.1",
- "use-acp": "0.2.4",
+ "use-acp": "0.2.5",
"use-resize-observer": "^9.1.0",
"vega-lite": "^5.23.0",
"vega-loader": "^4.5.3",
diff --git a/frontend/src/components/ai/ai-provider-icon.tsx b/frontend/src/components/ai/ai-provider-icon.tsx
index 14b9d8d53b..3385506145 100644
--- a/frontend/src/components/ai/ai-provider-icon.tsx
+++ b/frontend/src/components/ai/ai-provider-icon.tsx
@@ -15,7 +15,7 @@ import type { ProviderId } from "@/core/ai/ids/ids";
import { cn } from "@/utils/cn";
import marimoIcon from "../../assets/icon-32x32.png?inline";
-type Aliases = "claude" | "gemini";
+type Aliases = "claude" | "gemini" | "codex";
const icons: Record<ProviderId | Aliases, string> = {
openai: OpenAIIcon,
@@ -23,6 +23,7 @@ const icons: Record<ProviderId | Aliases, string> = {
claude: AnthropicIcon,
gemini: GeminiIcon,
google: GeminiIcon,
+ codex: OpenAIIcon,
ollama: OllamaIcon,
azure: AzureIcon,
bedrock: BedrockIcon,
diff --git a/frontend/src/components/chat/acp/__tests__/state.test.ts b/frontend/src/components/chat/acp/__tests__/state.test.ts
index 1a664d447c..c94e4cd56d 100644
--- a/frontend/src/components/chat/acp/__tests__/state.test.ts
+++ b/frontend/src/components/chat/acp/__tests__/state.test.ts
@@ -9,7 +9,6 @@ import {
type ExternalAgentId,
getAgentConnectionCommand,
getAgentDisplayName,
- getAllAgentIds,
getSessionsByAgent,
removeSession,
type TabId,
@@ -632,18 +631,6 @@ describe("state utility functions", () => {
});
});
- describe("getAllAgentIds", () => {
- it("should return all available agent IDs", () => {
- const agentIds = getAllAgentIds();
- expect(agentIds).toMatchInlineSnapshot(`
- [
- "claude",
- "gemini",
- ]
- `);
- });
- });
-
describe("getAgentDisplayName", () => {
it("should capitalize agent names", () => {
expect({
diff --git a/frontend/src/components/chat/acp/agent-panel.tsx b/frontend/src/components/chat/acp/agent-panel.tsx
index 552b31808c..009afcf590 100644
--- a/frontend/src/components/chat/acp/agent-panel.tsx
+++ b/frontend/src/components/chat/acp/agent-panel.tsx
@@ -381,7 +381,12 @@ const PromptArea = memo<PromptAreaProps>(
</div>
<div className="flex flex-row">
<Tooltip content="Add context">
- <Button variant="text" size="icon" onClick={handleAddContext}>
+ <Button
+ variant="text"
+ size="icon"
+ onClick={handleAddContext}
+ disabled={isLoading}
+ >
<AtSignIcon className="h-3.5 w-3.5" />
</Button>
</Tooltip>
@@ -392,6 +397,7 @@ const PromptArea = memo<PromptAreaProps>(
className="cursor-pointer"
onClick={() => fileInputRef.current?.click()}
title="Attach a file"
+ disabled={isLoading}
>
<PaperclipIcon className="h-3.5 w-3.5" />
</Button>
diff --git a/frontend/src/components/chat/acp/agent-selector.tsx b/frontend/src/components/chat/acp/agent-selector.tsx
index 2f2330cdfa..c055d3876e 100644
--- a/frontend/src/components/chat/acp/agent-selector.tsx
+++ b/frontend/src/components/chat/acp/agent-selector.tsx
@@ -42,6 +42,11 @@ const AVAILABLE_AGENTS = [
displayName: "Gemini",
iconId: "google",
},
+ {
+ id: "codex",
+ displayName: "Codex",
+ iconId: "openai",
+ },
] as const;
interface AgentMenuItemProps {
diff --git a/frontend/src/components/chat/acp/blocks.tsx b/frontend/src/components/chat/acp/blocks.tsx
index 5c7b5d16e3..dc25573f79 100644
--- a/frontend/src/components/chat/acp/blocks.tsx
+++ b/frontend/src/components/chat/acp/blocks.tsx
@@ -22,7 +22,8 @@ import {
XIcon,
} from "lucide-react";
import React from "react";
-import { mergeToolCalls } from "use-acp";
+import { JsonRpcError, mergeToolCalls } from "use-acp";
+import { z } from "zod";
import { ReadonlyDiff } from "@/components/editor/code/readonly-diff";
import { JsonOutput } from "@/components/editor/output/JsonOutput";
import { Button } from "@/components/ui/button";
@@ -31,6 +32,7 @@ import {
PopoverContent,
PopoverTrigger,
} from "@/components/ui/popover";
+import { uniqueByTakeLast } from "@/utils/arrays";
import { logNever } from "@/utils/assertNever";
import { cn } from "@/utils/cn";
import { Strings } from "@/utils/strings";
@@ -102,13 +104,20 @@ export const ErrorBlock = (props: {
onRetry?: () => void;
onDismiss?: () => void;
}) => {
- const { message } = props.data;
+ const error = props.data;
+ let message = props.data.message;
// Don't show WebSocket connection errors
if (message.includes("WebSocket")) {
return null;
}
+ if (error instanceof JsonRpcError) {
+ const dataStr =
+ typeof error.data === "string" ? error.data : JSON.stringify(error.data);
+ message = `${dataStr} (code: ${error.code})`;
+ }
+
return (
<div
className="border border-[var(--red-6)] bg-[var(--red-2)] rounded-lg p-4 my-2"
@@ -307,7 +316,9 @@ export const AgentThoughtsBlock = (props: {
};
export const PlansBlock = (props: { data: PlanNotificationEvent[] }) => {
- const plans = props.data.flatMap((item) => item.entries);
+ // Dedupe plans by text, take the last one which may have a status update
+ let plans = props.data.flatMap((item) => item.entries);
+ plans = uniqueByTakeLast(plans, (item) => item.content);
return (
<div className="rounded-lg border bg-background p-2 text-xs">
@@ -529,6 +540,7 @@ export const SessionNotificationsBlock = <
data: T[];
startTimestamp: number;
endTimestamp: number;
+ isLastBlock: boolean;
}) => {
if (props.data.length === 0) {
return null;
@@ -537,7 +549,9 @@ export const SessionNotificationsBlock = <
const renderItems = (items: T[]) => {
if (isToolCalls(items)) {
- return <ToolNotificationsBlock data={items} />;
+ return (
+ <ToolNotificationsBlock data={items} isLastBlock={props.isLastBlock} />
+ );
}
if (isAgentThoughts(items)) {
return (
@@ -591,6 +605,7 @@ export const CurrentModeBlock = (props: {
export const ToolNotificationsBlock = (props: {
data: (ToolCallNotificationEvent | ToolCallUpdateNotificationEvent)[];
+ isLastBlock: boolean;
}) => {
const toolCalls = mergeToolCalls(props.data);
@@ -604,7 +619,9 @@ export const ToolNotificationsBlock = (props: {
? "success"
: item.status === "failed"
? "error"
- : item.status === "in_progress" || item.status === "pending"
+ : (item.status === "in_progress" ||
+ item.status === "pending") &&
+ !props.isLastBlock
? "loading"
: undefined
}
@@ -631,7 +648,7 @@ export const DiffBlocks = (props: {
return (
<div
key={item.path}
- className="border rounded-md overflow-hidden bg-[var(--gray-2)] overflow-y-auto scrollbar-thin"
+ className="border rounded-md overflow-hidden bg-[var(--gray-2)] overflow-y-auto scrollbar-thin max-h-64"
>
{/* File path header */}
<div className="px-2 py-1 bg-[var(--gray-2)] border-b text-xs font-medium text-[var(--gray-11)]">
@@ -651,8 +668,12 @@ export const DiffBlocks = (props: {
function toolTitle(
item: Pick<ToolCallUpdateNotificationEvent, "title" | "kind" | "locations">,
) {
- const prefix =
- item.title || Strings.startCase(item.kind || "") || "Tool call";
+ let title = item.title;
+ // Hack: sometimes title comes back: "undefined", so lets undo that
+ if (title === '"undefined"') {
+ title = undefined;
+ }
+ const prefix = title || Strings.startCase(item.kind || "") || "Tool call";
const firstLocation = item.locations?.[0];
// Add the first location if it is not in the title already
if (firstLocation && !prefix.includes(firstLocation.path)) {
@@ -699,6 +720,22 @@ export const ToolBodyBlock = (props: {
// Completely empty
if (!content && !hasLocations && rawInput) {
+ // HACK: if the raw input is `abs_path`, `old_string`, `new_string` then handle it as if it is a diff
+ const rawDiff = rawDiffSchema.safeParse(rawInput);
+ if (rawDiff.success) {
+ return (
+ <DiffBlocks
+ data={[
+ {
+ type: "diff",
+ oldText: rawDiff.data.old_string,
+ newText: rawDiff.data.new_string,
+ path: rawDiff.data.abs_path,
+ },
+ ]}
+ />
+ );
+ }
// Show rawInput
return (
<pre className="bg-[var(--slate-2)] p-1 text-muted-foreground border border-[var(--slate-4)] rounded text-xs overflow-auto scrollbar-thin max-h-64">
@@ -728,3 +765,9 @@ export const ToolBodyBlock = (props: {
</div>
);
};
+
+const rawDiffSchema = z.object({
+ abs_path: z.string(),
+ old_string: z.string(),
+ new_string: z.string(),
+});
diff --git a/frontend/src/components/chat/acp/state.ts b/frontend/src/components/chat/acp/state.ts
index 85b04f3aaf..fd441c9c01 100644
--- a/frontend/src/components/chat/acp/state.ts
+++ b/frontend/src/components/chat/acp/state.ts
@@ -11,7 +11,7 @@ import type { ExternalAgentSessionId, SessionSupportType } from "./types";
// Types
export type TabId = TypedString<"TabId">;
-export type ExternalAgentId = "claude" | "gemini";
+export type ExternalAgentId = "claude" | "gemini" | "codex";
// No agents support loading sessions, so we limit to 1, otherwise
// this is confusing to the user when switching between sessions
@@ -220,7 +220,7 @@ export function getSessionsByAgent(
}
export function getAllAgentIds(): ExternalAgentId[] {
- return ["claude", "gemini"];
+ return ["claude", "gemini", "codex"];
}
export function getAgentDisplayName(agentId: ExternalAgentId): string {
@@ -251,6 +251,12 @@ const AGENT_CONFIG: Record<ExternalAgentId, AgentConfig> = {
webSocketUrl: "ws://localhost:3019/message",
sessionSupport: "single",
},
+ codex: {
+ port: 3021,
+ command: "npx @zed-industries/codex-acp",
+ webSocketUrl: "ws://localhost:3021/message",
+ sessionSupport: "single",
+ },
};
export function getAgentSessionSupport(
diff --git a/frontend/src/components/chat/acp/thread.tsx b/frontend/src/components/chat/acp/thread.tsx
index eda5b4145a..1c2b634efb 100644
--- a/frontend/src/components/chat/acp/thread.tsx
+++ b/frontend/src/components/chat/acp/thread.tsx
@@ -50,7 +50,10 @@ export const AgentThread = ({
return true;
});
- const renderNotification = (group: NotificationEvent[]) => {
+ const renderNotification = (
+ group: NotificationEvent[],
+ isLastBlock: boolean,
+ ) => {
if (group.length === 0) {
return null;
}
@@ -90,6 +93,7 @@ export const AgentThread = ({
data={data}
startTimestamp={startTimestamp}
endTimestamp={endTimestamp}
+ isLastBlock={isLastBlock}
/>
);
}
@@ -98,9 +102,12 @@ export const AgentThread = ({
return (
<div className="flex flex-col gap-4 px-2 pb-10 flex-1">
- {combinedNotifications.map((notification) => (
+ {combinedNotifications.map((notification, idx) => (
<React.Fragment key={notification[0].id}>
- {renderNotification(notification)}
+ {renderNotification(
+ notification,
+ idx === combinedNotifications.length - 1,
+ )}
</React.Fragment>
))}
{combinedNotifications.length === 0 && <ReadyToChatBlock />}
diff --git a/frontend/src/components/chat/chat-panel.tsx b/frontend/src/components/chat/chat-panel.tsx
index bb6fc65fcd..d7c60e6011 100644
--- a/frontend/src/components/chat/chat-panel.tsx
+++ b/frontend/src/components/chat/chat-panel.tsx
@@ -372,7 +372,12 @@ const ChatInputFooter: React.FC<ChatInputFooterProps> = memo(
</div>
<div className="flex flex-row">
<Tooltip content="Add context">
- <Button variant="text" size="icon" onClick={onAddContext}>
+ <Button
+ variant="text"
+ size="icon"
+ onClick={onAddContext}
+ disabled={isLoading}
+ >
<AtSignIcon className="h-3.5 w-3.5" />
</Button>
</Tooltip>
@@ -385,6 +390,7 @@ const ChatInputFooter: React.FC<ChatInputFooterProps> = memo(
className="cursor-pointer"
onClick={() => fileInputRef.current?.click()}
title="Attach a file"
+ disabled={isLoading}
>
<PaperclipIcon className="h-3.5 w-3.5" />
</Button>
diff --git a/frontend/src/components/editor/code/readonly-diff.tsx b/frontend/src/components/editor/code/readonly-diff.tsx
index dbb1c2733f..cc56bb587a 100644
--- a/frontend/src/components/editor/code/readonly-diff.tsx
+++ b/frontend/src/components/editor/code/readonly-diff.tsx
@@ -15,6 +15,10 @@ export const ReadonlyDiff = memo(
unifiedMergeView({
original: props.original,
mergeControls: false,
+ collapseUnchanged: {
+ margin: 3,
+ minSize: 4,
+ },
}),
];
}, [props.original, props.modified, theme]);
diff --git a/frontend/src/utils/arrays.ts b/frontend/src/utils/arrays.ts
index f1fa201538..ecc1be1e26 100644
--- a/frontend/src/utils/arrays.ts
+++ b/frontend/src/utils/arrays.ts
@@ -74,6 +74,9 @@ export function arrayToggle<T>(arr: T[], item: T): T[] {
return result;
}
+/**
+ * Unique by a key function.
+ */
export function uniqueBy<T>(arr: T[], key: (item: T) => string): T[] {
const result = [];
const seen = new Set();
@@ -87,6 +90,19 @@ export function uniqueBy<T>(arr: T[], key: (item: T) => string): T[] {
return result;
}
+/**
+ * Unique by a key function, taking the last item for each key.
+ */
+export function uniqueByTakeLast<T>(arr: T[], key: (item: T) => string): T[] {
+ // Create a map of keys to items
+ const map = new Map<string, T>();
+ for (const item of arr) {
+ const k = key(item);
+ map.set(k, item);
+ }
+ return Array.from(map.values());
+}
+
/**
* Get the next index in the list, wrapping around to the start or end if necessary.
* @param currentIndex - The current index, or null if there is no current index.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8c7a14717c..d6da08212e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -485,8 +485,8 @@ importers:
specifier: ^1.1.1
version: 1.1.1
use-acp:
- specifier: 0.2.4
+ specifier: 0.2.5
use-resize-observer:
specifier: ^9.1.0
@@ -784,6 +784,9 @@ packages:
resolution: {integrity: sha512-VQKMkwriZbaOgVCby1UDY/LDk5fIjhQicCvVPFqfe+69fWaPWydbWJ3wRt59/YzIwda1I81loas3oCoHxnqvdA==}
+ '@agentclientprotocol/[email protected]':
+ resolution: {integrity: sha512-ExwH828LaTGoTTjxuw49l+fwOLA+Yx0+qkWn1TcHMOsY5mVI9CUfkj7ZDhv2klgZ7mJeT+lxX/Dn/KINv1AkNQ==}
+
'@ai-sdk/[email protected]':
resolution: {integrity: sha512-xySXoQ29+KbGuGfmDnABx+O6vc7Gj7qugmj1kGpn0rW0rQNn6UKUuvscKMzWyv1Uv05GyC1vqHq8ZhEOLfXscQ==}
engines: {node: '>=18'}
@@ -9650,8 +9653,8 @@ packages:
resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
- resolution: {integrity: sha512-PLXxQy5wRsDj1djnPX2lInGzld5FIWkpXblLBrkdmEYITg+hFSawwYLCM800kB9omgSjU1+iJSYb7wqN6VxzYg==}
+ resolution: {integrity: sha512-4TUEb4dlNzv1oOb0LboB5zYTNHBY6wSXS/3QCa1Fe9jLJ5x8xVY5rA+89FSzCnlDnd7XTwkLMJgaSXsQOOkoDA==}
peerDependencies:
react: ^19.1.0
react-dom: ^19.1.0
@@ -10295,6 +10298,10 @@ snapshots:
'@adobe/[email protected]': {}
+ '@agentclientprotocol/[email protected]':
+ dependencies:
+ zod: 3.25.76
+
dependencies:
'@ai-sdk/provider': 2.0.0
@@ -21207,9 +21214,9 @@ snapshots:
querystringify: 2.2.0
requires-port: 1.0.0
dependencies:
- '@zed-industries/agent-client-protocol': 0.3.1
+ '@agentclientprotocol/sdk': 0.4.9
react: 19.1.1
react-dom: 19.1.1([email protected])