ShockVPN/shockbot
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add more codex logic

Browse Source
This commit is contained in:
Shawn Morreau
2025-11-12 19:22:48 -05:00
parent 71698d3e07
commit 7aaebe9584
9 changed files with 948 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agents/codex.ts
+15 -41
View File
@@ -1,31 +1,14 @@
import { spawnSync } from "node:child_process";
import { existsSync } from "node:fs";
import { log } from "../utils/cli.ts";
import { findCliPath, log } from "../utils/cli.ts";
import { type Agent, instructions } from "./shared.ts";
let cachedCliPath: string | undefined;
export const codex: Agent = {
install: async (): Promise<string> => {
if (cachedCliPath) {
log.info(`Using cached Codex CLI at ${cachedCliPath}`);
return cachedCliPath;
}
// Check if codex CLI is already installed globally
try {
const result = spawnSync("which", ["codex"], { encoding: "utf-8" });
if (result.status === 0 && result.stdout) {
const globalCodexPath = result.stdout.trim();
if (globalCodexPath && existsSync(globalCodexPath)) {
cachedCliPath = globalCodexPath;
log.info(`Using global Codex CLI at ${globalCodexPath}`);
return cachedCliPath;
}
}
} catch {
// Codex CLI not found globally, continue with installation
const globalCodexPath = findCliPath("codex");
if (globalCodexPath) {
log.info(`Using global Codex CLI at ${globalCodexPath}`);
return globalCodexPath;
}
// Install Codex CLI globally using npm
@@ -41,14 +24,10 @@ export const codex: Agent = {
}
// Verify installation
const verifyResult = spawnSync("which", ["codex"], { encoding: "utf-8" });
if (verifyResult.status === 0 && verifyResult.stdout) {
const installedPath = verifyResult.stdout.trim();
if (installedPath && existsSync(installedPath)) {
cachedCliPath = installedPath;
log.info(`✓ Codex CLI installed at ${installedPath}`);
return cachedCliPath;
}
const installedPath = findCliPath("codex");
if (installedPath) {
log.info(`✓ Codex CLI installed at ${installedPath}`);
return installedPath;
}
throw new Error("Codex CLI installation completed but executable not found");
@@ -58,13 +37,9 @@ export const codex: Agent = {
throw new Error(`Codex CLI installation failed: ${errorMessage}`);
}
},
run: async ({ prompt, mcpServers, apiKey }) => {
run: async ({ prompt, mcpServers, apiKey, cliPath }) => {
process.env.OPENAI_API_KEY = apiKey;
if (!cachedCliPath) {
throw new Error("Codex CLI not installed. Call install() before run().");
}
// Configure MCP servers for Codex (global config is fine - not part of repo)
if (mcpServers && Object.keys(mcpServers).length > 0) {
log.info("Configuring MCP servers for Codex...");
@@ -84,14 +59,14 @@ export const codex: Agent = {
// Build the codex mcp add command with proper argument handling
const addArgs = ["mcp", "add", serverName, "--", command, ...args];
// Add environment variables as --env flags
for (const [key, value] of Object.entries(envVars)) {
addArgs.push("--env", `${key}=${value}`);
}
log.info(`Adding MCP server '${serverName}'...`);
const addResult = spawnSync("codex", addArgs, {
const addResult = spawnSync(cliPath, addArgs, {
stdio: "inherit",
encoding: "utf-8",
env: {
@@ -99,7 +74,7 @@ export const codex: Agent = {
OPENAI_API_KEY: apiKey,
},
});
if (addResult.status !== 0) {
throw new Error(
`codex mcp add failed: ${addResult.stderr || addResult.stdout || "Unknown error"}`
@@ -117,9 +92,9 @@ export const codex: Agent = {
// Use codex exec command via CLI
const fullPrompt = `${instructions}\n\n****** USER PROMPT ******\n${prompt}`;
log.info("Running Codex via CLI...");
try {
// Execute codex via CLI using child_process
const result = spawnSync("codex", ["exec", fullPrompt], {
@@ -159,4 +134,3 @@ export const codex: Agent = {
}
},
};
agents/index.ts
+9
View File
@@ -0,0 +1,9 @@
import type { AgentName } from "../main.ts";
import { claude } from "./claude.ts";
import { codex } from "./codex.ts";
import type { Agent } from "./shared.ts";
export const agents = {
claude,
codex,
} as const satisfies Record<AgentName, Agent>;
agents/shared.ts
+4
View File
@@ -20,11 +20,15 @@ export interface AgentConfig {
githubInstallationToken: string;
prompt: string;
mcpServers: Record<string, McpServerConfig>;
cliPath: string;
}
type InputKey = "anthropic_api_key" | "openai_api_key";
export type Agent = {
install: () => Promise<string>;
run: (config: AgentConfig) => Promise<AgentResult>;
inputKey: InputKey;
};
export const instructions = `
entry.js
+837 -831
View File
File diff suppressed because it is too large Load Diff
main.ts
+21 -33
View File
@@ -1,9 +1,7 @@
import { type } from "arktype";
import { claude } from "./agents/claude.ts";
import { codex } from "./agents/codex.ts";
import { createMcpConfigs } from "./mcp/config.ts";
import packageJson from "./package.json" with { type: "json" };
import { DEFAULT_REPO_SETTINGS, getRepoSettings, type RepoSettings } from "./utils/api.ts";
import { fetchRepoSettings } from "./utils/api.ts";
import { log } from "./utils/cli.ts";
import {
parseRepoContext,
@@ -11,12 +9,16 @@ import {
setupGitHubInstallationToken,
} from "./utils/github.ts";
import { setupGitAuth, setupGitConfig } from "./utils/setup.ts";
import { agents } from "./agents/index.ts";
export const AgentName = type.enumerated("codex", "claude");
export type AgentName = typeof AgentName.infer;
export const Inputs = type({
prompt: "string",
"anthropic_api_key?": "string | undefined",
"openai_api_key?": "string | undefined",
"agent?": "string | undefined",
"agent?": AgentName,
});
export type Inputs = typeof Inputs.infer;
@@ -35,6 +37,7 @@ export async function main(inputs: Inputs): Promise<MainResult> {
try {
log.info(`🐸 Running pullfrog/action@${packageJson.version}...`);
Inputs.assert(inputs);
setupGitConfig();
const { githubInstallationToken, wasAcquired, isFallbackToken } =
@@ -44,31 +47,15 @@ export async function main(inputs: Inputs): Promise<MainResult> {
}
const repoContext = parseRepoContext();
// Fetch repo settings (agent, permissions, workflows) from API
// Skip API call if we're using GITHUB_TOKEN fallback (app not installed)
let repoSettings: RepoSettings;
if (isFallbackToken) {
log.info("Using default repository settings (app not installed)");
repoSettings = DEFAULT_REPO_SETTINGS;
} else {
log.info("Fetching repository settings...");
repoSettings = await getRepoSettings(githubInstallationToken, repoContext);
log.info("Repository settings fetched");
}
// Use agent from inputs if provided, otherwise use repo settings, default to claude
const agent = inputs.agent || repoSettings.defaultAgent || "claude";
// Agent registry
const agents = {
claude,
codex,
} as const;
const repoSettings = await fetchRepoSettings({
token: githubInstallationToken,
repoContext,
isFallbackToken,
});
if (!(agent in agents)) {
throw new Error(`Unsupported agent: ${agent}. Supported agents: ${Object.keys(agents).join(", ")}`);
}
const agentName: AgentName = inputs.agent || repoSettings.defaultAgent || "claude";
const agentImpl = agents[agent as keyof typeof agents];
const agent = agents[agentName];
setupGitAuth(githubInstallationToken, repoContext);
@@ -77,9 +64,9 @@ export async function main(inputs: Inputs): Promise<MainResult> {
log.debug(`📋 MCP Config: ${JSON.stringify(mcpServers, null, 2)}`);
// Install agent CLI before running
await agentImpl.install();
const cliPath = await agent.install();
log.info(`Running ${agent} Agent SDK...`);
log.info(`Running ${agentName} Agent SDK...`);
log.box(inputs.prompt, { title: "Prompt" });
// TODO: check if `inputs.prompts` is JSON
@@ -88,25 +75,26 @@ export async function main(inputs: Inputs): Promise<MainResult> {
// Get API key based on agent type
let apiKey: string;
if (agent === "claude") {
if (agentName === "claude") {
if (!inputs.anthropic_api_key) {
throw new Error("ANTHROPIC_API_KEY is required for Claude agent");
}
apiKey = inputs.anthropic_api_key;
} else if (agent === "codex") {
} else if (agentName === "codex") {
if (!inputs.openai_api_key) {
throw new Error("OPENAI_API_KEY is required for Codex agent");
}
apiKey = inputs.openai_api_key;
} else {
throw new Error(`API key configuration not implemented for agent: ${agent}`);
throw new Error(`API key configuration not implemented for agent: ${agentName}`);
}
const result = await agentImpl.run({
const result = await agent.run({
prompt: inputs.prompt,
mcpServers,
githubInstallationToken,
apiKey,
cliPath,
});
if (!result.success) {
package.json
+1 -1
View File
@@ -17,6 +17,7 @@
"typecheck": "tsc --noEmit",
"build": "node esbuild.config.js",
"play": "node play.ts",
"scratch": "node scratch.ts",
"upDeps": "pnpm up --latest",
"lock": "pnpm --ignore-workspace install",
"prepare": "husky"
@@ -30,7 +31,6 @@
"@octokit/webhooks-types": "^7.6.1",
"@standard-schema/spec": "1.0.0",
"arktype": "2.1.25",
"convex": "^1.29.0",
"dotenv": "^17.2.3",
"execa": "^9.6.0",
"fastmcp": "^3.20.0",
scratch.ts
+16
View File
@@ -0,0 +1,16 @@
import { spawnSync } from "child_process";
import { existsSync } from "fs";
function findCliPath(name: string): string | null {
const result = spawnSync("which", [name], { encoding: "utf-8" });
if (result.status === 0 && result.stdout) {
const cliPath = result.stdout.trim();
if (cliPath && existsSync(cliPath)) {
return cliPath;
}
}
return null;
}
console.log(findCliPath("codei"));
utils/api.ts
+27 -1
View File
@@ -1,7 +1,9 @@
import type { AgentName } from "../main.ts";
import { log } from "./cli.ts";
import type { RepoContext } from "./github.ts";
export interface RepoSettings {
defaultAgent: string | null;
defaultAgent: AgentName | null;
webAccessLevel: "full_access" | "limited";
webAccessAllowTrusted: boolean;
webAccessDomains: string;
@@ -21,6 +23,30 @@ export const DEFAULT_REPO_SETTINGS: RepoSettings = {
workflows: [],
};
/**
* Fetch repository settings with fallback handling
* Uses API if token is available, otherwise returns defaults
*/
export async function fetchRepoSettings({
token,
repoContext,
isFallbackToken,
}: {
token: string;
repoContext: RepoContext;
isFallbackToken: boolean;
}): Promise<RepoSettings> {
if (isFallbackToken) {
log.info("Using default repository settings (app not installed)");
return DEFAULT_REPO_SETTINGS;
}
log.info("Fetching repository settings...");
const settings = await getRepoSettings(token, repoContext);
log.info("Repository settings fetched");
return settings;
}
/**
* Fetch repository settings from the Pullfrog API with fallback to defaults
* Returns agent, permissions, and workflows (excludes triggers)
utils/cli.ts
+18
View File
@@ -3,6 +3,8 @@
*/
import * as core from "@actions/core";
import { spawnSync } from "child_process";
import { existsSync } from "fs";
const isGitHubActions = !!process.env.GITHUB_ACTIONS;
const isDebugEnabled = process.env.LOG_LEVEL === "debug";
@@ -262,3 +264,19 @@ export const log = {
*/
endGroup,
};
/**
* Finds a CLI executable path by checking if it's installed globally
* @param name The name of the CLI executable to find
* @returns The path to the CLI executable, or null if not found
*/
export function findCliPath(name: string): string | null {
const result = spawnSync("which", [name], { encoding: "utf-8" });
if (result.status === 0 && result.stdout) {
const cliPath = result.stdout.trim();
if (cliPath && existsSync(cliPath)) {
return cliPath;
}
}
return null;
}