6d25adfd1a
* agent & model refactor with ASKPASS git auth, UI restructure, clerk v7 Made-with: Cursor * fix stale agent/effort refs, add tests for askpass + model resolution - reviewCleanup.ts: payload.agent -> payload.model, remove effort - selectMode.ts PlanEdit: remove delegation/subagent/effort references - pullfrog.yml.ts: update env vars (drop GOOGLE_API_KEY/CURSOR_API_KEY, add GOOGLE_GENERATIVE_AI_API_KEY/XAI_API_KEY/MOONSHOT_API_KEY/OPENCODE_API_KEY) - FlagsSettings/RepoInstructionsSection: remove stale effort/timeout copy - new: gitAuthServer.test.ts (10 tests — lifecycle, token delivery, tamper detection, script gen) - new: agent.test.ts (4 tests — default opentoad, AGENT_OVERRIDE, invalid override) - new: models.test.ts (19 tests — parseModel, resolution, registry invariants) - update models.dev snapshot Made-with: Cursor * fix changed-agents.sh to filter legacy agent files from CI matrix legacy agent files (claude.ts, codex.ts, etc.) are @ts-nocheck and not exported from index.ts. changed-agents.sh now reads index.ts imports to build the active agent set and treats changes to inactive files as non-agent changes (opentoad canary only). Made-with: Cursor * remove MCP file tools, old agent harnesses, and obsolete security tests ASKPASS-based git auth makes the old MCP file tool security layer unnecessary: - token never in subprocess env, so symlink/gitattributes/hook attacks can't exfiltrate it - agents now use native file tools (OpenCode builtin read/edit) deleted: - action/mcp/file.ts (file_read, file_write, file_edit, file_delete, list_directory) - action/mcp/index.ts (dead re-export) - agent harnesses: claude.ts, codex.ts, cursor.ts, gemini.ts, opencode.ts - opencode-runner.ts (inlined into opentoad.ts) - security tests that validated MCP file tool restrictions - commented-out three-step review flow (~300 lines) - sanitizeSchema/wrapSchema dead code from mcp/shared.ts - OPENCODE_MODEL_MINI/MAX env vars (effort-level model overrides removed) updated test prompts to use generic file ops instead of MCP tool names. restored pkg-json-scripts + requirements-txt-attack (test --ignore-scripts defense). Made-with: Cursor * bump actions/checkout v4 → v6 (node 24) node 20 actions deprecated june 2, 2026. Made-with: Cursor * temporarily disable fail-fast on agnostic tests to debug checkout@v6 Made-with: Cursor * re-enable fail-fast on agnostic tests Made-with: Cursor * fix test token mismatch: mint OIDC tokens scoped to target repo CI tests override GITHUB_REPOSITORY to pullfrog/test-repo but inherit the runner's GITHUB_TOKEN (scoped to pullfrog/app), causing 401s on every run-context fetch. Clear GITHUB_TOKEN in the test subprocess so ensureGitHubToken() mints a properly scoped token via OIDC. Also centralizes the default GITHUB_REPOSITORY in runAgentStreaming instead of repeating it in every test file, and fixes preview-cleanup to remove workers from all queues (not just name-matching ones). Made-with: Cursor * fix ensureGitHubToken to try OIDC when app credentials are absent ensureGitHubToken only attempted token minting when GITHUB_APP_ID and GITHUB_PRIVATE_KEY were set. In CI, OIDC is available but app creds aren't exposed — so the guard prevented minting entirely. Made-with: Cursor * dead code cleanup: remove remnants of deleted agents, file tools, effort system remove unused @anthropic-ai/claude-agent-sdk and @openai/codex-sdk deps, orphaned file-tool security tests, dead GEMINI_MODEL passthrough, stale opencode-runner wiki refs, deleted test file references, and MCP file tool docs. rename docs/effort → docs/models. fix vitest setup: move dotenv to globalSetup (runs once before forks instead of per-file, 19s → 200ms). Made-with: Cursor * address review feedback: remove dead code, update stale references - remove AGENT_OVERRIDE (only opentoad exists) - remove shellToolName plumbing (always restricted shell) - bump action version to 0.0.179 - remove CURSOR_API_KEY from all workflows/configs - remove OPENCODE_MODEL_MINI/MAX from workflows/docs - delete wiki/effort.md, rewrite docs/effort.mdx as "Models" - rewrite wiki/modes.md: orchestrator/subagent → single agent - simplify flag system: drop builtin flag extraction (debug, effort, timeout, agent), keep custom flag replacement only - reserve all legacy flag names to prevent custom flag conflicts Made-with: Cursor * regenerate lockfile after removing claude-agent-sdk and codex-sdk Made-with: Cursor * fix import ordering, add lockfile check to pre-push hook Made-with: Cursor * remove dead debug payload field, stale packageExtensions Made-with: Cursor * merge proc-sandbox and token-exfil into a single test proc-sandbox and token-exfil were duplicative — both tested that SANDBOX_TEST_TOKEN couldn't be exfiltrated. consolidated into token-exfil with shell:restricted (which actually exercises filterEnv) and the /proc attack vector hints from proc-sandbox. Made-with: Cursor * fix wiki adversarial.md to match actual tokenExfil validator Made-with: Cursor
86 lines
2.9 KiB
TypeScript
86 lines
2.9 KiB
TypeScript
import { createServer } from "node:net";
|
|
import { Client } from "@modelcontextprotocol/sdk/client/index.js";
|
|
import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
|
|
import { type } from "arktype";
|
|
import { FastMCP } from "fastmcp";
|
|
import { afterAll, beforeAll, describe, expect, it } from "vitest";
|
|
import { execute, tool } from "./shared.ts";
|
|
|
|
function getRandomPort(): Promise<number> {
|
|
return new Promise((resolve, reject) => {
|
|
const srv = createServer();
|
|
srv.listen(0, "127.0.0.1", () => {
|
|
const addr = srv.address();
|
|
if (!addr || typeof addr === "string") return reject(new Error("bad address"));
|
|
const port = addr.port;
|
|
srv.close(() => resolve(port));
|
|
});
|
|
});
|
|
}
|
|
|
|
async function connectMcpClient(url: string): Promise<Client> {
|
|
const transport = new StreamableHTTPClientTransport(new URL(url));
|
|
const client = new Client({ name: "test-client", version: "0.0.1" });
|
|
// @ts-expect-error — exactOptionalPropertyTypes mismatch: SDK Transport.sessionId?: string vs StreamableHTTPClientTransport getter returning string | undefined
|
|
await client.connect(transport);
|
|
return client;
|
|
}
|
|
|
|
function mockTool(name: string, description: string) {
|
|
return tool({
|
|
name,
|
|
description,
|
|
parameters: type({ value: "string" }),
|
|
execute: execute(async () => ({ ok: true })),
|
|
});
|
|
}
|
|
|
|
describe("MCP server tool registration - integration", () => {
|
|
let server: FastMCP;
|
|
let serverUrl: string;
|
|
const clients: Client[] = [];
|
|
|
|
beforeAll(async () => {
|
|
const port = await getRandomPort();
|
|
serverUrl = `http://127.0.0.1:${port}/mcp`;
|
|
|
|
server = new FastMCP({ name: "test-server", version: "0.0.1" });
|
|
server.addTool(mockTool("shell", "run shell commands"));
|
|
server.addTool(mockTool("git", "run git commands"));
|
|
server.addTool(mockTool("set_output", "set output"));
|
|
server.addTool(mockTool("select_mode", "select a mode"));
|
|
server.addTool(mockTool("push_branch", "push branch"));
|
|
server.addTool(mockTool("create_pull_request", "create PR"));
|
|
|
|
await server.start({
|
|
transportType: "httpStream",
|
|
httpStream: { port, host: "127.0.0.1", endpoint: "/mcp" },
|
|
});
|
|
});
|
|
|
|
afterAll(async () => {
|
|
for (const client of clients) {
|
|
try {
|
|
await client.close();
|
|
} catch {
|
|
// best-effort cleanup
|
|
}
|
|
}
|
|
await server.stop();
|
|
});
|
|
|
|
it("server exposes all registered tools", async () => {
|
|
const client = await connectMcpClient(serverUrl);
|
|
clients.push(client);
|
|
const result = await client.listTools();
|
|
const names = result.tools.map((t) => t.name);
|
|
expect(names).toContain("select_mode");
|
|
expect(names).toContain("push_branch");
|
|
expect(names).toContain("create_pull_request");
|
|
expect(names).toContain("shell");
|
|
expect(names).toContain("git");
|
|
expect(names).toContain("set_output");
|
|
expect(names.length).toBe(6);
|
|
});
|
|
});
|