improve agent api

improve logging
2025-10-31 03:15:51 -04:00 · 2025-10-31 01:58:43 -04:00
16 changed files with 165 additions and 194 deletions
@@ -1,56 +1,16 @@
-import * as core from "@actions/core";
 import { query, type SDKMessage } from "@anthropic-ai/claude-agent-sdk";
-import { createMcpConfig } from "../mcp/config.ts";
 import { log } from "../utils/cli.ts";
-import { debugLog, isDebug } from "../utils/logging.ts";
-import { instructions } from "./shared.ts";
-import type { Agent, AgentConfig, AgentResult } from "./types.ts";
+import { type Agent, instructions } from "./shared.ts";

-/**
- * Claude Code agent implementation
- */
-export class ClaudeAgent implements Agent {
-  private apiKey: string;
-  private githubInstallationToken: string;
+export const claude: Agent = {
+  run: async ({ prompt, mcpServers, apiKey }) => {
+    process.env.ANTHROPIC_API_KEY = apiKey;

-  constructor(config: AgentConfig) {
-    this.apiKey = config.apiKey;
-    this.githubInstallationToken = config.githubInstallationToken;
-  }
-
-  /**
-   * Install is a no-op since Claude CLI is bundled with the SDK
-   */
-  async install(): Promise<void> {
-    // No installation needed - CLI is bundled with @anthropic-ai/claude-agent-sdk
-  }
-
-  /**
-   * Execute Claude Code with the given prompt using the SDK
-   */
-  async execute(prompt: string): Promise<AgentResult> {
-    log.info("Running Claude Agent SDK...");
-
-    log.box(prompt, { title: "Prompt" });
-
-    const mcpConfig = JSON.parse(createMcpConfig(this.githubInstallationToken));
-
-    if (isDebug()) {
-      debugLog(`📋 MCP Config: ${JSON.stringify(mcpConfig, null, 2)}`);
-    }
-
-    // Initialize session
-    core.info(`🚀 Starting Claude Agent SDK session...`);
-
-    // Set API key environment variable for SDK
-    process.env.ANTHROPIC_API_KEY = this.apiKey;
-
-    // Create the query with SDK options
    const queryInstance = query({
      prompt: `${instructions}\n\n${prompt}`,
      options: {
        permissionMode: "bypassPermissions",
-        mcpServers: mcpConfig.mcpServers,
+        mcpServers,
      },
    });

@@ -60,14 +20,12 @@ export class ClaudeAgent implements Agent {
      await handler(message as never);
    }

-    log.success("Task complete.");
-
    return {
      success: true,
      output: "",
    };
-  }
-}
+  },
+};

 type SDKMessageType = SDKMessage["type"];

@@ -1,12 +1,37 @@
-import { mcpServerName } from "../mcp/config.ts";
+import type { McpServerConfig } from "@anthropic-ai/claude-agent-sdk";
+import { ghPullfrogMcpName } from "../mcp/config.ts";

-export const instructions = `- use the ${mcpServerName} MCP server to interact with github
- if ${mcpServerName} is not available or doesn't include the functionality you need, describe why and bail
+/**
+ * Result returned by agent execution
+ */
+export interface AgentResult {
+  success: boolean;
+  output?: string;
+  error?: string;
+  metadata?: Record<string, unknown>;
+}
+
+/**
+ * Configuration for agent creation
+ */
+export interface AgentConfig {
+  apiKey: string;
+  githubInstallationToken: string;
+  prompt: string;
+  mcpServers: Record<string, McpServerConfig>;
+}
+
+export type Agent = {
+  run: (config: AgentConfig) => Promise<AgentResult>;
+};
+
+export const instructions = `- use the ${ghPullfrogMcpName} MCP server to interact with github
+- if ${ghPullfrogMcpName} is not available or doesn't include the functionality you need, describe why and bail
 - do not under any circumstances use the gh cli
 - if prompted by a comment to respond to create a new issue, pr or anything else, after succeeding,
    also respond to the original comment with a very brief message containing a link to it
 - if prompted to review a PR:
-    (1) get PR info with mcp__${mcpServerName}__get_pull_request
+    (1) get PR info with mcp__${ghPullfrogMcpName}__get_pull_request
    (2) fetch both branches: git fetch origin <base> --depth=20 && git fetch origin <head>
    (3) checkout the PR branch: git checkout origin/<head> (you MUST do this before reading any files)
    (4) view diff: git diff origin/<base>...origin/<head> (this shows what changed)
@@ -1,34 +0,0 @@
-/**
- * Standard interface for all Pullfrog agents
- */
-export interface Agent {
-  /**
-   * Install the agent and any required dependencies
-   */
-  install(): Promise<void>;
-
-  /**
-   * Execute the agent with the given prompt
-   * @param prompt The prompt to send to the agent
-   * @param options Additional options specific to the agent
-   */
-  execute(prompt: string, options?: Record<string, any>): Promise<AgentResult>;
-}
-
-/**
- * Result returned by agent execution
- */
-export interface AgentResult {
-  success: boolean;
-  output?: string;
-  error?: string;
-  metadata?: Record<string, any>;
-}
-
-/**
- * Configuration for agent creation
- */
-export interface AgentConfig {
-  apiKey: string;
-  githubInstallationToken: string;
-}
@@ -1,6 +1,7 @@
-import * as core from "@actions/core";
 import { type } from "arktype";
-import { ClaudeAgent } from "./agents/claude.ts";
+import { claude } from "./agents/claude.ts";
+import { createMcpConfigs } from "./mcp/config.ts";
+import { log } from "./utils/cli.ts";
 import { parseRepoContext, setupGitHubInstallationToken } from "./utils/github.ts";
 import { setupGitAuth, setupGitConfig } from "./utils/setup.ts";

@@ -19,7 +20,7 @@ export interface MainResult {

 export async function main(inputs: Inputs): Promise<MainResult> {
  try {
-    core.info(`→ Starting agent run with Claude Code`);
+    log.info("Starting agent run...");

    setupGitConfig();

@@ -28,15 +29,20 @@ export async function main(inputs: Inputs): Promise<MainResult> {

    setupGitAuth(githubInstallationToken, repoContext);

-    const agent = new ClaudeAgent({
-      apiKey: inputs.anthropic_api_key!,
+    const mcpServers = createMcpConfigs(githubInstallationToken);
+
+    log.debug(`📋 MCP Config: ${JSON.stringify(mcpServers, null, 2)}`);
+
+    log.info("Running Claude Agent SDK...");
+    log.box(inputs.prompt, { title: "Prompt" });
+
+    const result = await claude.run({
+      prompt: inputs.prompt,
+      mcpServers,
      githubInstallationToken,
+      apiKey: inputs.anthropic_api_key!,
    });

-    await agent.install();
-
-    const result = await agent.execute(inputs.prompt);
-
    if (!result.success) {
      return {
        success: false,
@@ -45,12 +51,17 @@ export async function main(inputs: Inputs): Promise<MainResult> {
      };
    }

+    log.success("Task complete.");
+    await log.writeSummary();
+
    return {
      success: true,
      output: result.output || "",
    };
  } catch (error) {
    const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
+    log.error(errorMessage);
+    await log.writeSummary();
    return {
      success: false,
      error: errorMessage,
@@ -1,32 +1,31 @@
 /**
 * Simple MCP configuration helper for adding our minimal GitHub comment server
 */
+
+import type { McpServerConfig } from "@anthropic-ai/claude-agent-sdk";
 import { fromHere } from "@ark/fs";
 import { parseRepoContext } from "../utils/github.ts";

 const actionPath = fromHere("..");

-export const mcpServerName = "gh-pullfrog";
+export const ghPullfrogMcpName = "gh-pullfrog";

-export function createMcpConfig(githubInstallationToken: string) {
+export type McpName = typeof ghPullfrogMcpName;
+
+export type McpConfigs = Record<McpName, McpServerConfig>;
+
+export function createMcpConfigs(githubInstallationToken: string): McpConfigs {
  const repoContext = parseRepoContext();
  const githubRepository = `${repoContext.owner}/${repoContext.name}`;

-  return JSON.stringify(
-    {
-      mcpServers: {
-        [mcpServerName]: {
-          command: "node",
-          args: [`${actionPath}/mcp/server.ts`],
-          env: {
-            GITHUB_INSTALLATION_TOKEN: githubInstallationToken,
-            GITHUB_REPOSITORY: githubRepository,
-            LOG_LEVEL: process.env.LOG_LEVEL,
-          },
-        },
+  return {
+    [ghPullfrogMcpName]: {
+      command: "node",
+      args: [`${actionPath}/mcp/server.ts`],
+      env: {
+        GITHUB_INSTALLATION_TOKEN: githubInstallationToken,
+        GITHUB_REPOSITORY: githubRepository,
      },
    },
-    null,
-    2
-  );
+  };
 }
@@ -1,5 +1,6 @@
 import { execSync } from "node:child_process";
 import { type } from "arktype";
+import { log } from "../utils/cli.ts";
 import { contextualize, tool } from "./shared.ts";

 export const PullRequest = type({
@@ -18,7 +19,7 @@ export const PullRequestTool = tool({
      encoding: "utf8",
    }).trim();

-    console.log(`Current branch: ${currentBranch}`);
+    log.info(`Current branch: ${currentBranch}`);

    const result = await ctx.octokit.rest.pulls.create({
      owner: ctx.owner,
@@ -17,7 +17,7 @@ export const PullRequestInfoTool = tool({
    });

    const data = pr.data;
-    
+
    const baseBranch = data.base.ref;
    const headBranch = data.head.ref;

@@ -1,26 +1,32 @@
+import type { RestEndpointMethodTypes } from "@octokit/rest";
 import { type } from "arktype";
 import { contextualize, tool } from "./shared.ts";
-import type { RestEndpointMethodTypes } from "@octokit/rest";

 export const Review = type({
  pull_number: type.number.describe("The pull request number to review"),
-  event: type.enumerated("APPROVE", "REQUEST_CHANGES", "COMMENT").describe("'APPROVE', 'REQUEST_CHANGES', or 'COMMENT' (the review action)"),
-  body: type.string.describe("The body content for the review (required for REQUEST_CHANGES or COMMENT)").optional(),
-  commit_id: type.string.describe("Optional SHA of the commit being reviewed. Defaults to latest.").optional(),
-  comments: type
-({
-      path: type.string.describe("The file path to comment on"),
-      position: type.number.describe("The diff position in the file"),
-      body: type.string.describe("The comment text"),
-    })
-      .array()
-          .describe("Array of draft review comments for specific lines, optional.")
-    .optional()
+  event: type
+    .enumerated("APPROVE", "REQUEST_CHANGES", "COMMENT")
+    .describe("'APPROVE', 'REQUEST_CHANGES', or 'COMMENT' (the review action)"),
+  body: type.string
+    .describe("The body content for the review (required for REQUEST_CHANGES or COMMENT)")
+    .optional(),
+  commit_id: type.string
+    .describe("Optional SHA of the commit being reviewed. Defaults to latest.")
+    .optional(),
+  comments: type({
+    path: type.string.describe("The file path to comment on"),
+    position: type.number.describe("The diff position in the file"),
+    body: type.string.describe("The comment text"),
+  })
+    .array()
+    .describe("Array of draft review comments for specific lines, optional.")
+    .optional(),
 });

 export const ReviewTool = tool({
  name: "submit_pull_request_review",
-  description: "Submit a review (approve, request changes, or comment) for an existing pull request.",
+  description:
+    "Submit a review (approve, request changes, or comment) for an existing pull request.",
  parameters: Review,
  execute: contextualize(async ({ pull_number, event, body, commit_id, comments = [] }, ctx) => {
    // Compose the request
@@ -4,8 +4,8 @@ import { FastMCP } from "fastmcp";
 import { CommentTool } from "./comment.ts";
 import { IssueTool } from "./issue.ts";
 import { PullRequestTool } from "./pr.ts";
-import { ReviewTool } from "./review.ts";
 import { PullRequestInfoTool } from "./prInfo.ts";
+import { ReviewTool } from "./review.ts";
 import { addTools } from "./shared.ts";

 const server = new FastMCP({
@@ -1,6 +1,6 @@
 {
  "name": "@pullfrog/action",
-  "version": "0.0.65",
+  "version": "0.0.67",
  "type": "module",
  "files": [
    "index.js",
@@ -59,7 +59,7 @@ if (import.meta.url === `file://${process.argv[1]}`) {
  });

  if (args["--help"]) {
-    console.log(`
+    log.info(`
 Usage: tsx play.ts [file] [options]

 Test the Pullfrog action with various prompts.
@@ -5,6 +5,7 @@
 import * as core from "@actions/core";

 const isGitHubActions = !!process.env.GITHUB_ACTIONS;
+const isDebugEnabled = process.env.LOG_LEVEL === "debug";

 /**
 * Print a formatted box with text (for console output)
@@ -87,7 +88,12 @@ function box(
    maxWidth?: number;
  }
 ): void {
-  core.info(boxString(text, options));
+  const boxContent = boxString(text, options);
+  core.info(boxContent);
+  if (isGitHubActions) {
+    // Add as markdown code block for summary (no headers)
+    core.summary.addRaw(`\`\`\`\n${text}\n\`\`\`\n`);
+  }
 }

 /**
@@ -115,10 +121,10 @@ async function summaryTable(
  if (isGitHubActions) {
    const summary = core.summary;
    if (title) {
-      summary.addHeading(title);
+      summary.addRaw(`**${title}**\n\n`);
    }
    summary.addTable(formattedRows);
-    await summary.write();
+    // Note: Don't write immediately, let it accumulate with other summary content
  }

  // Also log to console for visibility
@@ -133,7 +139,11 @@ async function summaryTable(
 * Print a separator line
 */
 function separator(length: number = 50): void {
-  core.info("─".repeat(length));
+  const separatorText = "─".repeat(length);
+  core.info(separatorText);
+  if (isGitHubActions) {
+    core.summary.addRaw(`---\n`);
+  }
 }

 /**
@@ -145,6 +155,9 @@ export const log = {
   */
  info: (message: string): void => {
    core.info(message);
+    if (isGitHubActions) {
+      core.summary.addRaw(`${message}\n`);
+    }
  },

  /**
@@ -152,6 +165,9 @@ export const log = {
   */
  warning: (message: string): void => {
    core.warning(message);
+    if (isGitHubActions) {
+      core.summary.addRaw(`⚠️ ${message}\n`);
+    }
  },

  /**
@@ -159,13 +175,33 @@ export const log = {
   */
  error: (message: string): void => {
    core.error(message);
+    if (isGitHubActions) {
+      core.summary.addRaw(`❌ ${message}\n`);
+    }
  },

  /**
   * Print success message
   */
  success: (message: string): void => {
-    core.info(`✅ ${message}`);
+    const successMessage = `✅ ${message}`;
+    core.info(successMessage);
+    if (isGitHubActions) {
+      core.summary.addRaw(`${successMessage}\n`);
+    }
+  },
+
+  /**
+   * Print debug message (only if LOG_LEVEL=debug)
+   */
+  debug: (message: string): void => {
+    if (isDebugEnabled) {
+      if (isGitHubActions) {
+        core.debug(message);
+      } else {
+        core.info(`[DEBUG] ${message}`);
+      }
+    }
  },

  /**
@@ -183,4 +219,14 @@ export const log = {
   * Print a separator line
   */
  separator,
+
+  /**
+   * Write all accumulated summary content to the job summary
+   * Call this at the end of execution to finalize the summary
+   */
+  writeSummary: async (): Promise<void> => {
+    if (isGitHubActions) {
+      await core.summary.write();
+    }
+  },
 };
@@ -1,13 +0,0 @@
-import { mkdtempSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-/**
- * Create a temporary file with the given content
- */
-export function createTempFile(content: string, filename = "temp.txt"): string {
-  const tempDir = mkdtempSync(join(tmpdir(), "pullfrog-"));
-  const filePath = join(tempDir, filename);
-  writeFileSync(filePath, content);
-  return filePath;
-}
@@ -1,5 +1,6 @@
 import { createSign } from "node:crypto";
 import * as core from "@actions/core";
+import { log } from "./cli.ts";

 export interface InstallationToken {
  token: string;
@@ -53,14 +54,14 @@ function isGitHubActionsEnvironment(): boolean {
 }

 async function acquireTokenViaOIDC(): Promise<string> {
-  core.info("Generating OIDC token...");
+  log.info("Generating OIDC token...");

  const oidcToken = await core.getIDToken("pullfrog-api");
-  core.info("OIDC token generated successfully");
+  log.info("OIDC token generated successfully");

  const apiUrl = process.env.API_URL || "https://pullfrog.ai";

-  core.info("Exchanging OIDC token for installation token...");
+  log.info("Exchanging OIDC token for installation token...");
  const tokenResponse = await fetch(`${apiUrl}/api/github/installation-token`, {
    method: "POST",
    headers: {
@@ -77,7 +78,7 @@ async function acquireTokenViaOIDC(): Promise<string> {
  }

  const tokenData = (await tokenResponse.json()) as InstallationToken;
-  core.info(`Installation token obtained for ${tokenData.repository || "all repositories"}`);
+  log.info(`Installation token obtained for ${tokenData.repository || "all repositories"}`);

  return tokenData.token;
 }
@@ -238,7 +239,7 @@ export async function setupGitHubInstallationToken(): Promise<string> {
  const existingToken = checkExistingToken();
  if (existingToken) {
    core.setSecret(existingToken);
-    core.info("Using provided GitHub installation token");
+    log.info("Using provided GitHub installation token");
    return existingToken;
  }

@@ -1,30 +0,0 @@
-/**
- * Centralized debug logging utility
- * Controls debug behavior based on LOG_LEVEL environment variable
- */
-
-import * as core from "@actions/core";
-
-const isDebugEnabled = process.env.LOG_LEVEL === "debug";
-const isGitHubActions = !!process.env.GITHUB_ACTIONS;
-
-/**
- * Check if debug logging is enabled
- */
-export function isDebug(): boolean {
-  return isDebugEnabled;
-}
-
-/**
- * Log debug message if debug is enabled
- * Uses core.debug() in GitHub Actions, console.log() locally
- */
-export function debugLog(message: string): void {
-  if (isDebugEnabled) {
-    if (isGitHubActions) {
-      core.debug(message);
-    } else {
-      console.log(`[DEBUG] ${message}`);
-    }
-  }
-}
@@ -1,5 +1,6 @@
 import { execSync } from "node:child_process";
 import { existsSync, rmSync } from "node:fs";
+import { log } from "./cli.ts";
 import type { RepoContext } from "./github.ts";

 export interface SetupOptions {
@@ -20,20 +21,20 @@ export function setupTestRepo(options: SetupOptions): void {

  if (existsSync(tempDir)) {
    if (forceClean) {
-      console.log("🗑️  Removing existing .temp directory...");
+      log.info("🗑️  Removing existing .temp directory...");
      rmSync(tempDir, { recursive: true, force: true });

-      console.log("📦 Cloning pullfrogai/scratch into .temp...");
+      log.info("📦 Cloning pullfrogai/scratch into .temp...");
      execSync(`git clone ${repoUrl} ${tempDir}`, { stdio: "inherit" });
    } else {
-      console.log("📦 Resetting existing .temp repository...");
+      log.info("📦 Resetting existing .temp repository...");
      execSync("git reset --hard HEAD && git clean -fd", {
        cwd: tempDir,
        stdio: "inherit",
      });
    }
  } else {
-    console.log("📦 Cloning pullfrogai/scratch into .temp...");
+    log.info("📦 Cloning pullfrogai/scratch into .temp...");
    execSync(`git clone ${repoUrl} ${tempDir}`, { stdio: "inherit" });
  }
 }
@@ -42,7 +43,7 @@ export function setupTestRepo(options: SetupOptions): void {
 * Setup git configuration to avoid identity errors
 */
 export function setupGitConfig(): void {
-  console.log("🔧 Setting up git configuration...");
+  log.info("🔧 Setting up git configuration...");
  execSync('git config user.email "action@pullfrog.ai"', { stdio: "inherit" });
  execSync('git config user.name "Pullfrog Action"', { stdio: "inherit" });
 }
@@ -51,18 +52,18 @@ export function setupGitConfig(): void {
 * Setup git authentication using GitHub token
 */
 export function setupGitAuth(githubToken: string, repoContext: RepoContext): void {
-  console.log("🔐 Setting up git authentication...");
+  log.info("🔐 Setting up git authentication...");

  // Remove existing git auth headers that actions/checkout might have set
  try {
    execSync("git config --unset-all http.https://github.com/.extraheader", { stdio: "inherit" });
-    console.log("✓ Removed existing authentication headers");
+    log.info("✓ Removed existing authentication headers");
  } catch {
-    console.log("No existing authentication headers to remove");
+    log.info("No existing authentication headers to remove");
  }

  // Update remote URL to embed the token
  const remoteUrl = `https://x-access-token:${githubToken}@github.com/${repoContext.owner}/${repoContext.name}.git`;
  execSync(`git remote set-url origin "${remoteUrl}"`, { stdio: "inherit" });
-  console.log("✓ Updated remote URL with authentication token");
+  log.info("✓ Updated remote URL with authentication token");
 }
Author	SHA1	Message	Date
David Blass	681e08557c	improve agent api	2025-10-31 03:15:51 -04:00
David Blass	15a7154aea	improve logging	2025-10-31 01:58:43 -04:00