Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions packages/dotagents/src/targets/definitions/codex.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { homedir } from "node:os";
import type { AgentDefinition } from "../types.js";
import { UnsupportedFeature } from "../errors.js";
import claude from "./claude.js";
import { envRecord, extractCodexHeaders } from "./helpers.js";
import { extractCodexHeaders } from "./helpers.js";
import { markManagedTomlSubagent, serializeCodexSubagent } from "../../subagents/format.js";

const codex: AgentDefinition = {
Expand Down Expand Up @@ -31,8 +31,12 @@ const codex: AgentDefinition = {
...(envHttpHeaders && { env_http_headers: envHttpHeaders }),
}];
}
const env = envRecord(s.env, (k) => `\${${k}}`, s.envValues);
return [s.name, { command: s.command, args: s.args ?? [], ...(env && { env }) }];
return [s.name, {
command: s.command,
args: s.args ?? [],
...(s.envValues && { env: s.envValues }),
...(s.env?.length && { env_vars: s.env }),
}];
},
hooks: undefined,
serializeHooks() {
Expand Down
19 changes: 14 additions & 5 deletions packages/dotagents/src/targets/mcp-writer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,21 @@ describe("writeMcpConfigs", () => {
});
});

it("writes codex .codex/config.toml", async () => {
await writeMcpConfigs(["codex"], [STDIO_SERVER], projectMcpResolver(dir));
it("writes codex stdio environment names and literal values in their native fields", async () => {
await writeMcpConfigs(["codex"], [{
...STDIO_SERVER,
envValues: { PLUGIN_ROOT: "/plugins/github" },
}], projectMcpResolver(dir));

const raw = await readFile(join(dir, ".codex", "config.toml"), "utf-8");
expect(raw).toContain("mcp_servers");
expect(raw).toContain("github");
const content = parseTomlObject(
await readFile(join(dir, ".codex", "config.toml"), "utf-8"),
);
expect(childObject(content, "mcp_servers")["github"]).toEqual({
command: "npx",
args: ["-y", "@mcp/server-github"],
env: { PLUGIN_ROOT: "/plugins/github" },
env_vars: ["GITHUB_TOKEN"],
});
});

it("writes .opencode/opencode.jsonc by default", async () => {
Expand Down
Loading